Changeset 1017 for trunk/config/sys/Darwin-g++.gmk

Timestamp:

Apr 22, 2009, 3:57:29 PM (15 years ago)

Author:

garnier

Message:

amelioration pour Linux

File:

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

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

@@ -13 +13 @@
   CXX       := g++
   CXXFLAGS  := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
+# CXXFLAGS  += -Wunused-parameter -Winline -Wunreachable-code
   CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
   ifdef G4OPTIMISE
@@ -90 +91 @@
       QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers 
       QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers 
-      QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers 
+      QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
     else
       QTFLAGS   := -I $(QTHOME)/include/Qt -I$(QTHOME)/include
@@ -97 +98 @@
   ifndef QTLIBPATH
     ifeq ($(QT_VERSION),3)
-      QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "/lib/qt3/lib" || echo "/lib" )
+      QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" )
     else
       QTLIBPATH  := -F$(QTHOME)
@@ -104 +105 @@
   ifndef QTLIBS
     ifeq ($(QT_VERSION),3)
-      QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
-      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
+      QTLIBS   := -L$(QTLIBPATH)
+      QT3_MT  := $(shell ls  $(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
       ifneq ($(QT3_MT),0)
         QTLIBS  += -lqt-mt
@@ -113 +114 @@
       QTLIBS   += -lqui
     else
-      QTLIBS    :=  -framework QtCore -framework QtGui
+      QTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
     endif
   endif
@@ -121 +122 @@
         #      GLQTLIBS    := $(QTLIBS)
     else
-      GLQTLIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
+      GLQTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
       GLQTLIBS    += -framework QtOpenGL
     endif
@@ -128 +129 @@
 
   define build-granular-shared-lib
-    libdir=`(cd $(@D);/bin/pwd)`; \
+    @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
      $(CXX)  -dynamiclib -single_module  -lgcov -undefined dynamic_lookup \