Changeset 886 for trunk/config/sys

Timestamp:

Nov 19, 2008, 2:41:24 PM (16 years ago)

Author:

garnier

Message:

change and better Leopard check on Mac OSX

Location:

trunk/config/sys

Files:

• Darwin-g++.gmk (modified) (2 diffs)
• Linux-g++.gmk (modified) (1 diff)

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

@@ -64 +64 @@
   endif
   ifndef OGLLIBS
-    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
-    ifeq ($(G4SYSTEM),Darwin-g++)
-          # the following lines are for building on MacOSX 10.5 "Leopard"
+    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")
-      endif
+    else
+      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+    endif
   endif
   ifndef QTHOME
@@ -93 +94 @@
     endif
   endif
-
   ifndef QTLIBPATH
     ifeq ($(QT_VERSION),3)

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

@@ -72 +72 @@
   ifndef QTFLAGS
     ifeq ($(QT_VERSION),4)
-      QTFLAGS   := -I $(QTHOME)/include/qt$(QT_VERSION)/QtCore 
+      QTFLAGS   += -I$(QTHOME)/include/qt$(QT_VERSION)
+      QTFLAGS   += -I $(QTHOME)/include/qt$(QT_VERSION)/QtCore 
       QTFLAGS   += -I $(QTHOME)/include/qt$(QT_VERSION)/QtGui 
       QTFLAGS   += -I $(QTHOME)/include/qt$(QT_VERSION)/QtOpenGL