Changeset 921 for trunk/config/sys

Timestamp:

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

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

Location:

trunk/config/sys

Files:

• Darwin-g++.gmk (modified) (4 diffs)
• Linux-g++.gmk (modified) (4 diffs)
• WIN32-VC.gmk (modified) (2 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

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

@@ -46 +46 @@
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
-  ECHO    := /bin/echo -e
-  SHEXT   := so
+  ECHO   := /bin/echo -e
+  SHEXT  := so
+  ARCH   := $(shell uname -m | cut -s -d "_" -f 2)
+
   ifndef X11FLAGS
     X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
   endif
   ifndef X11LIBS
-    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+    X11LIBS   := -L/usr/X11R6/lib$(ARCH)  -lXmu -lXt -lXext -lX11 -lSM -lICE
   endif
   ifndef XMFLAGS
@@ -59 +61 @@
   ifndef XMLIBS
     XMLIBS    := -lXm -lXpm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  DLDLIBS   := -ldl
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
   endif
 
@@ -95 +110 @@
     QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
     ifeq ($(QT_VERSION),3)
-      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
@@ -116 +131 @@
 #----------------------------------------------------------------------------
 
-  ifndef XAWFLAGS
-    XAWFLAGS   := -I/usr/X11R6/include
-  endif
-  ifndef XAWLIBS
-    XAWLIBS    := -lXaw
-  endif
-  DLDLIBS   := -ldl
-  ifndef OGLFLAGS
-    OGLFLAGS  := -I$(OGLHOME)/include 
-  endif
-  ifndef OGLLIBS
-    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
-  endif
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \

trunk/config/sys/WIN32-VC.gmk

@@ -14 +14 @@
   CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
   CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
-  LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll
+  LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll /VERBOSE:lib
 
   SHEXT := dll
   AR := LIB
   ECHO := /usr/bin/echo -e
+  FIND := /usr/bin/find
+  SORT := /usr/bin/sort
   GREP := /usr/bin/grep
   SED  := /usr/bin/sed
   CAT  := /usr/bin/cat
   CUT  := /usr/bin/cut
+  TOUCH := /usr/bin/touch
 
   FC := g77
@@ -56 +59 @@
   ifndef GLQTLIBS
     ifeq ($(QT_VERSION),QT3)
-      QTLIBS   := -L$(QTHOME)/lib -lqt-mt
+      GLQTLIBS   := -L$(QTHOME)/lib -lqt-mt
     else
-      QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
+      GLQTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
     endif
   endif