Changeset 875 for trunk/config
- Timestamp:
- Oct 30, 2008, 5:49:28 PM (16 years ago)
- Location:
- trunk/config/sys
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/config/sys/Darwin-g++.gmk
r868 r875 3 3 # MacOS 10.3 gcc-3.3 4 4 # MacOS 10.4 gcc-4.0 5 # MacOS 10.5 gcc-4.0 5 6 # 6 7 # Original author: Helmut Burkhardt - CERN 7 8 # Revisions: Guy Barrand - LAL 8 9 # Gabriele Cosmo - CERN 10 # Laurent Garnier - LAL 9 11 # 10 12 ifeq ($(G4SYSTEM),Darwin-g++) … … 64 66 OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL 65 67 ifeq ($(G4SYSTEM),Darwin-g++) 66 # It may be required to uncomment the following linesfor building on MacOSX 10.5 "Leopard"68 # the following lines are for building on MacOSX 10.5 "Leopard" 67 69 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 70 endif … … 72 74 endif 73 75 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/') 76 ifndef QTMOC 77 ifeq ($(QTHOME),/Library/Frameworks) 78 QTMOC := /usr/bin/moc 79 else 80 QTMOC := $(QTHOME)/bin/moc 81 endif 78 82 endif 83 84 QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' ) 79 85 80 86 ifndef QTFLAGS … … 85 91 else 86 92 QTFLAGS := -I $(QTHOME)/include/Qt -I$(QTHOME)/include 87 endif88 endif89 ifndef QTMOC90 ifeq ($(QT_VERSION),4)91 QTMOC := /usr/bin/moc92 else93 QTMOC := $(QTHOME)/bin/moc94 93 endif 95 94 endif -
trunk/config/sys/Linux-g++.gmk
r868 r875 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 QTFLAGS68 ifeq ($(QT_VERSION),QT4)69 QTFLAGS := -I$(QTHOME)/include/qt4/Qt70 QTFLAGS += -I$(QTHOME)/include/qt471 else72 QTFLAGS := -I$(QTHOME)/include/qt73 endif74 endif75 66 ifndef QTMOC 76 67 QTMOC := $(QTHOME)/bin/moc 77 68 endif 78 69 70 QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' ) 71 72 ifndef QTFLAGS 73 ifeq ($(QT_VERSION),4) 74 QTFLAGS := -I $(QTHOME)/include/qt$(QT_VERSION)/QtCore 75 QTFLAGS += -I $(QTHOME)/include/qt$(QT_VERSION)/QtGui 76 QTFLAGS += -I $(QTHOME)/include/qt$(QT_VERSION)/QtOpenGL 77 else 78 QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)/Qt 79 QTFLAGS += -I$(QTHOME)/include/qt$(QT_VERSION) 80 endif 81 endif 82 83 84 ifndef QTLIBPATH 85 QT_SEARCH_LIB1 := $(shell ls $(QTHOME)/lib/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l ) 86 QT_SEARCH_LIB2 := $(shell ls $(QTHOME)/lib/libq* 2>/dev/null | wc -l ) 87 ifneq ($(QT_SEARCH_LIB1),0) 88 QTLIBPATH := /lib/qt$(QT_VERSION) 89 endif 90 ifneq ($(QT_SEARCH_LIB2),0) 91 QTLIBPATH := /lib 92 endif 93 endif 94 95 ifndef QTLIBS 96 QTLIBS := -L$(QTHOME)$(QTLIBPATH) 97 ifeq ($(QT_VERSION),3) 98 QT3_MT := $(shell ls $(QTHOME)$(QTLIBPATH)/libqt-mt.* | wc -l ) 99 ifneq ($(QT3_MT),0) 100 QTLIBS += -lqt-mt 101 else 102 QTLIBS += -lqt 103 endif 104 QTLIBS += -lqui 105 else 106 QTLIBS += -lQtCore -lQtGui 107 endif 108 endif 79 109 80 110 ifndef GLQTLIBS 81 ifeq ($(QT_VERSION),QT3) 82 GLQTLIBS := -L$(QTHOME)/lib -lqt-mt 111 ifeq ($(QT_VERSION),3) 112 # already done in QTLIBS 113 # GLQTLIBS := $(QTLIBS) 83 114 else 84 GLQTLIBS := -L$(QTHOME) /lib/qt4-lQtCore -lQtGui -lQtOpenGL115 GLQTLIBS := -L$(QTHOME)$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL 85 116 endif 86 117 endif 87 ifndef QTLIBS 88 ifeq ($(QT_VERSION),QT3) 89 QTLIBS := -L$(QTHOME)/lib -lqt-mt 90 else 91 QTLIBS := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui 92 endif 93 endif 118 94 119 ifndef XAWFLAGS 95 120 XAWFLAGS := -I/usr/X11R6/include
Note: See TracChangeset
for help on using the changeset viewer.