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

Timestamp:

Nov 18, 2009, 4:07:45 PM (15 years ago)

Author:

garnier

Message:

update par rapport a CVS

File:

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

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

@@ -13 +13 @@
   CXX       := g++
   CXXFLAGS  := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
-  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe -Wextra 
-#  CXXFLAGS  := -Wall -Wextra -ansi -pedantic -Wuninitialized -Winline -Wunreachable-code
+# CXXFLAGS  += -Wunused-parameter -Winline -Wunreachable-code
+  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
   ifdef G4OPTIMISE
-#    CXXFLAGS  += -O2
-#    FCFLAGS   := -O2
-#    CCFLAGS   := -O2
+    CXXFLAGS  += -O2
+    FCFLAGS   := -O2
+    CCFLAGS   := -O2
   else
     ifdef G4DEBUG
@@ -31 +31 @@
     CCFLAGS   += -pg
   endif
+  ifdef G4OPTDEBUG
+    CXXFLAGS  += -O2 -g
+    FCFLAGS   += -O2 -g
+    CCFLAGS   += -O2 -g
+  endif
   FC := gfortran
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
-  LDFLAGS += -bind_at_load
+  LDFLAGS += -bind_at_load -arch_multiple
   FCLIBS := -lg2c -lnsl
   SHEXT   := dylib
@@ -92 +97 @@
       QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers 
       QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
+      QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     else
       QTFLAGS   := -I $(QTHOME)/include/Qt -I$(QTHOME)/include
@@ -100 +106 @@
       QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" )
     else
-      QTLIBPATH  := -F$(QTHOME)
+      QTLIBPATH  := -F$(QTHOME)/lib -F$(QTHOME)
     endif
   endif