Changeset 868
- Timestamp:
- Oct 15, 2008, 2:49:49 PM (16 years ago)
- Location:
- trunk/config
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/config/History
r865 r868 1 $Id: History,v 1.3 25 2008/07/11 15:42:35 gcosmoExp $1 $Id: History,v 1.330 2008/10/15 10:10:51 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 16 16 * Reverse chronological order (last date on top), please * 17 17 ---------------------------------------------------------- 18 19 15th October 2008 Laurent Garnier 20 - Darwin.gmk : 21 - Try to improve Qt config for Darwin : 22 - No more QTHOME or QTLIBS flags to be set 23 - Qt3 multithread or not auto select libraries 24 - Suppress some unuseful link and compil options 25 26 10th October 2008 Laurent Garnier 27 - Darwin.gmk : 28 - Remove Xml and Sql library for Qt config 29 - Try to better find if GL conflicts on Darwin 18 30 19 31 8th October 2008 Laurent Garnier -
trunk/config/sys/Darwin-g++.gmk
r865 r868 63 63 ifndef OGLLIBS 64 64 OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL 65 # It may be required to uncomment the following lines for building on MacOSX 10.5 "Leopard" 66 # OGLLIBS += -dylib_file \ 67 # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\ 68 # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib 65 ifeq ($(G4SYSTEM),Darwin-g++) 66 # It may be required to uncomment the following lines for building on MacOSX 10.5 "Leopard" 67 OGLLIBS := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo " -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib") 68 endif 69 69 endif 70 70 ifndef QTHOME 71 QTHOME := /sw71 QTHOME := $(shell test -f /Library/Frameworks/Qt3Support.framework/Qt3Support && echo "/Library/Frameworks" || echo "/sw") 72 72 endif 73 73 74 QT_VERSION := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo QT3 || echo QT4) 74 ifeq ($(QTHOME),/Library/Frameworks) 75 QT_VERSION := $(shell grep "QT_VERSION_STR" $(QTHOME)/QtCore.framework/Headers/qglobal.h | sed 's/.* \"\([0-9]\)\..*\"/\1/') 76 else 77 QT_VERSION := $(shell grep "QT_VERSION_STR" $(QTHOME)/include/qt/qglobal.h | sed 's/.* \"\([0-9]\)\..*\"/\1/') 78 endif 75 79 76 80 ifndef QTFLAGS 77 ifeq ($(QT_VERSION),QT4) 78 QTFLAFG := "-I ${QTHOME}/QtCore.framework/Headers " 79 QTFLAFG += "-I ${QTHOME}/QtGui.framework/Headers " 80 QTFLAFG += "-I ${QTHOME}/QtOpenGL.framework/Headers " 81 QTFLAFG += "-I ${QTHOME}/QtSql.framework/Headers " 82 QTFLAFG += "-I ${QTHOME}/QtXml.framework/Headers " 81 ifeq ($(QT_VERSION),4) 82 QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers 83 QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers 84 QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers 83 85 else 84 QTFLAGS := -I $(QTHOME)/include/Qt -I$(QTHOME)/include86 QTFLAGS := -I $(QTHOME)/include/Qt -I$(QTHOME)/include 85 87 endif 86 88 endif 87 89 ifndef QTMOC 88 ifeq ($(QT_VERSION), QT4)90 ifeq ($(QT_VERSION),4) 89 91 QTMOC := /usr/bin/moc 90 92 else … … 92 94 endif 93 95 endif 96 97 ifndef QTLIBPATH 98 ifeq ($(QT_VERSION),3) 99 QTLIBPATH := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "/lib/qt3/lib" || echo "/lib" ) 100 else 101 QTLIBPATH := -F$(QTHOME) 102 endif 103 endif 94 104 ifndef QTLIBS 95 ifeq ($(QT_VERSION),QT3) 96 QTLIBS := -L$(QTHOME)/lib -lqt -lqui 105 ifeq ($(QT_VERSION),3) 106 QTLIBS := -L$(QTHOME)$(QTLIBPATH) 107 QT3_MT := $(shell ls $(QTHOME)$(QTLIBPATH)/libqt-mt.* | wc -l ) 108 ifneq ($(QT3_MT),0) 109 QTLIBS += -lqt-mt 110 else 111 QTLIBS += -lqt 112 endif 113 QTLIBS += -lqui 97 114 else 98 QTLIBS := -F$(QTHOME) -framework QtCore -framework QtGui 99 QTLIBS += -framework QtSql -framework QtXml 115 QTLIBS := -framework QtCore -framework QtGui 100 116 endif 101 117 endif 102 118 103 119 ifndef GLQTLIBS 104 ifeq ($(QT_VERSION),QT3) 105 GLQTLIBS := -L$(QTHOME)/lib -lqt -lqui 120 ifeq ($(QT_VERSION),3) 121 # already done in QTLIBS 122 # GLQTLIBS := $(QTLIBS) 106 123 else 107 124 GLQTLIBS := -F$(QTHOME) -framework QtCore -framework QtGui 108 GLQTLIBS += -framework QtOpenGL -framework QtSql -framework QtXml125 GLQTLIBS += -framework QtOpenGL 109 126 endif 110 127 endif -
trunk/config/sys/Linux-g++.gmk
r865 r868 63 63 QTHOME := /usr 64 64 endif 65 QT_VERSION := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3) 66 65 67 ifndef QTFLAGS 66 QTFLAGS := -I$(QTHOME)/include/qt4/Qt 67 QTFLAGS += -I$(QTHOME)/include/qt4 68 ifeq ($(QT_VERSION),QT4) 69 QTFLAGS := -I$(QTHOME)/include/qt4/Qt 70 QTFLAGS += -I$(QTHOME)/include/qt4 71 else 72 QTFLAGS := -I$(QTHOME)/include/qt 73 endif 68 74 endif 69 75 ifndef QTMOC … … 71 77 endif 72 78 73 QT_VERSION := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3)74 79 75 80 ifndef GLQTLIBS … … 77 82 GLQTLIBS := -L$(QTHOME)/lib -lqt-mt 78 83 else 79 GLQTLIBS := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml84 GLQTLIBS := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL 80 85 endif 81 86 endif … … 84 89 QTLIBS := -L$(QTHOME)/lib -lqt-mt 85 90 else 86 QTLIBS := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtSql -lQtXml91 QTLIBS := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui 87 92 endif 88 93 endif -
trunk/config/sys/WIN32-VC.gmk
r865 r868 51 51 QTLIBS := -L$(QTHOME)/lib -lqt-mt 52 52 else 53 QTLIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtSql4.lib QtXml4.lib53 QTLIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib 54 54 endif 55 55 endif … … 58 58 QTLIBS := -L$(QTHOME)/lib -lqt-mt 59 59 else 60 QTLIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib60 QTLIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib 61 61 endif 62 62 endif
Note: See TracChangeset
for help on using the changeset viewer.