Changeset 790 for trunk/geant4/config/sys

Timestamp:

Apr 30, 2008, 6:30:42 PM (18 years ago)

Author:

garnier

Message:

r818@wl-72126: garnier | 2008-04-30 12:42:00 +0200
modif mise a jour sur le cvs

Location:

trunk/geant4/config/sys

Files:

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

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

@@ -79 +79 @@
   ifndef QTLIBS
     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
-    QT4LIBS    := -D111 -F$(QTHOME)/lib -framework QtCore -framework QtGui -D111_END
+    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
     QT4LIBS    += -framework QtSql -framework QtXml
     QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))

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

@@ -65 +65 @@
     QTMOC      := $(QTHOME)/bin/moc
   endif
+  ifndef QTGLLIBS
+    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 QTLIBS
     QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
-    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
+    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtSql -lQtXml
     QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
   endif

trunk/geant4/config/sys/WIN32-VC.gmk

@@ -45 +45 @@
   endif
   ifndef QTLIBS
+    QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
+    QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtSql4.lib QtXml4.lib
+    QTLIBS    := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS))
+  endif
+  ifndef QTGLLIBS
     QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
     QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib