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

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

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

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

@@ -66 +66 @@
     ifeq ($(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/'),9)
       # the following lines are for building on MacOSX 10.5 "Leopard"
-      OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo " -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
+      OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo "-L/usr/X11R6/lib -lGLU -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     else
       OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
@@ -105 +105 @@
     ifeq ($(QT_VERSION),3)
       QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
-      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* | wc -l )
+      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
       ifneq ($(QT3_MT),0)
         QTLIBS  += -lqt-mt
@@ -128 +128 @@
 
   define build-granular-shared-lib
-    @libdir=`(cd $(@D);/bin/pwd)`; \
+    libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
-     $(CXX)  -dynamiclib -single_module -undefined dynamic_lookup \
+     $(CXX)  -dynamiclib -single_module  -lgcov -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) *.o
   endef
@@ -136 +136 @@
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMP)/$(G4SYSTEM); \
-     $(CXX)  -dynamiclib -single_module -undefined dynamic_lookup \
+     $(CXX)  -dynamiclib -single_module  -lgcov -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
   endef