Changeset 1017 for trunk/config

Timestamp:

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

Author:

garnier

Message:

amelioration pour Linux

Location:

trunk/config/sys

Files:

• Darwin-g++.gmk (modified) (7 diffs)
• Linux-g++.gmk (modified) (1 diff)
• Linux-icc.gmk (modified) (2 diffs)
• WIN32-VC.gmk (modified) (1 diff)
• WIN32-g++.gmk (modified) (1 diff)

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 \

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

@@ -88 +88 @@
   ifndef QTFLAGS
     ifeq ($(QT_VERSION),4)
-      QTFLAGS   += -I$(QTHOME)/include
-      QTFLAGS   += -I $(QTHOME)/include/QtCore 
-      QTFLAGS   += -I $(QTHOME)/include/QtGui 
-      QTFLAGS   += -I $(QTHOME)/include/QtOpenGL 
+      QTINCPATH = $(QTHOME)/include
+
+      # If Qt is not located in the STANDARD path, try to find it in some
+      # other places.(Ex: for ubuntu 8.10)
+      QT_ALT1 := $(shell ls  $(QTINCPATH)/qt$(QT_VERSION)/*.h 2>/dev/null | wc -l )
+      QT_ALT2 := $(shell ls  $(QTINCPATH)/qt$(QT_VERSION)/Qt/*.h 2>/dev/null | wc -l )
+      ifneq ($(QT_ALT1),0)
+        QTINCPATH := $(QTINCPATH)/qt$(QT_VERSION)
+      endif
+      ifneq ($(QT_ALT2),0)
+        QTINCPATH := $(QTINCPATH)/qt$(QT_VERSION)/Qt
+      endif
+
+      QTFLAGS   += -I$(QTINCPATH)/include
+      QTFLAGS   += -I$(QTINCPATH)/QtCore 
+      QTFLAGS   += -I$(QTINCPATH)/QtGui 
+      QTFLAGS   += -I$(QTINCPATH)/QtOpenGL 
+
     else
       QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include

trunk/config/sys/Linux-icc.gmk

@@ -1 +1 @@
 #
-# ------ GNU/LINUX ------         Intel icc 10.1
+# ------ GNU/LINUX ------         Intel icc 11.0
 #
 ifeq ($(G4SYSTEM),Linux-icc)
@@ -38 +38 @@
   endif
   ifndef X11LIBS
-    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
   endif
   ifndef XMFLAGS

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 /VERBOSE:lib
+  LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll
 
   SHEXT := dll

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

@@ -42 +42 @@
   endif
   ifndef X11LIBS
-    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
   endif
   ifndef XMFLAGS