Changeset 766 for trunk/geant4/config/sys

Timestamp:

Apr 15, 2008, 3:38:47 PM (18 years ago)

Author:

garnier

Message:

remise à jour de config

File:

• trunk/geant4/config/sys/Darwin-g++.gmk (modified) (2 diffs)

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

@@ -80 +80 @@
     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
     QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
+    QT4LIBS    += -framework -framework QtSql -framework QtXml
+    QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
+  endif
+
+  ifndef GLQTLIBS
+    QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
+    QT4LIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
     QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
-    QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
+    QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
   endif
 
@@ -87 +94 @@
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
+     echo $(INTYLIBS); \
      g++ -dynamiclib -single_module -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) *.o