Changeset 592 for trunk

Timestamp:

Nov 8, 2007, 2:55:26 PM (17 years ago)

Author:

garnier

Message:

r625@mac-90108: laurentgarnier | 2007-11-08 14:59:08 +0100
maj par rapport au repository Geant4

Location:

trunk/geant4

Files:

• config/sys/Darwin-g++.gmk (modified) (1 diff)
• specific-geant4-dev.sh (modified) (1 diff)

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

@@ -45 +45 @@
   ifndef QTFLAGS
     QTHOME    := /usr/local/Qt/4.2.2
-    QTFLAGS   := -I$(QTHOME)/lib/QtCore.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtGui.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtOpenGL.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtSql.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtXml.framework/Versions/Current/Headers -F$(QTHOME)/lib
+#    QTFLAGS   := -I$(QTHOME)/lib/QtCore.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtGui.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtOpenGL.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtSql.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtXml.framework/Versions/Current/Headers -F$(QTHOME)/lib
+    QTFLAGS   := -I$(QTHOME)/include/Qt -F$(QTHOME)/lib
     MOC       := $(QTHOME)/bin/moc
   endif

trunk/geant4/specific-geant4-dev.sh

@@ -5 +5 @@
   export MACOSX_DEPLOYMENT_TARGET=10.4
   export MAKECMD=make
-  export G4INSTALL=/usr/local/geant-dev/src/geant4
+  export G4INSTALL=/Users/laurentgarnier/Work/Geant4-Dev
   export G4SYSTEM=Darwin-g++
   export G4WORKDIR=$G4INSTALL
   export G4STTDIR=$G4WORKDIR/stt
-  export G4LIB=$G4INSTALL/../../lib/geant4/
+  export G4LIB=$G4INSTALL/lib/geant4/
   export G4DEBUG=1
+  export G4INCLUDE=$G4INSTALL/include/geant4
   export CPPVERBOSE=1
   export G4LIB_USE_GRANULAR=1