Changeset 606 for trunk/geant4/config/sys

Timestamp:

Nov 15, 2007, 11:56:03 AM (18 years ago)

Author:

garnier

Message:

r647@mac-90108: laurentgarnier | 2007-11-15 11:32:46 +0100
Ok en Qt 4.3.0

Location:

trunk/geant4/config/sys

Files:

• Darwin-g++.gmk (modified) (1 diff)
• Linux-g++.gmk (modified) (1 diff)

trunk/geant4/config/sys/Darwin-g++.gmk

@@ -51 +51 @@
   endif
   ifndef QTFLAGS
-    QTFLAGS   := -I$(QTHOME)/include
-    QTFLAGS   += -I$(QTHOME)/lib/QtCore.framework/Versions/Current/Headers
-    QTFLAFS   += -I$(QTHOME)/lib/QtGui.framework/Versions/Current/Headers
-    QTFLAGS   += -I$(QTHOME)/lib/QtOpenGL.framework/Versions/Current/Headers
-    QTFLAGS   += -I$(QTHOME)/lib/QtSql.framework/Versions/Current/Headers
-    QTFLAGS   += -I$(QTHOME)/lib/QtXml.framework/Versions/Current/Headers
+    QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
     MOC       := $(QTHOME)/bin/moc
   endif
   ifndef QTLIBS
-    QTLIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
-    QTLIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
+    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt -lqui
+    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
+    QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
+    QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
   endif
   ifndef XAWFLAGS

trunk/geant4/config/sys/Linux-g++.gmk

@@ -55 +55 @@
     XMLIBS    := -lXm -lXpm
   endif
+  ifndef QTHOME
+    QTHOME  := /usr/local/Qt
+  endif
+  ifndef QTFLAGS
+    QTFLAGS   := -I$(QTHOME)/include/Qt
+    QTFLAGS   += -I$(QTHOME)/include
+    MOC       := $(QTHOME)/bin/moc
+  endif
+  ifndef QTLIBS
+    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
+    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
+    QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
+  endif
   ifndef XAWFLAGS
     XAWFLAGS   := -I/usr/X11R6/include