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

Timestamp:

Oct 8, 2008, 3:36:01 AM (16 years ago)

Author:

garnier

Message:

GLQT best integration

File:

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

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

@@ -63 +63 @@
   ifndef OGLLIBS
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
-# Uncomment the following lines for building on MacOSX 10.5 "Leopard"
+# It may be required to uncomment the following lines for building on MacOSX 10.5 "Leopard"
 #    OGLLIBS   += -dylib_file \
 #                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\
@@ -71 +71 @@
     QTHOME     := /sw
   endif
+
+  QT_VERSION   := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo QT3 || echo QT4)
+
   ifndef QTFLAGS
-    QTFLAGS    := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
+    ifeq ($(QT_VERSION),QT4)
+      QTFLAFG   := "-I ${QTHOME}/QtCore.framework/Headers "
+      QTFLAFG   += "-I ${QTHOME}/QtGui.framework/Headers "
+      QTFLAFG   += "-I ${QTHOME}/QtOpenGL.framework/Headers "
+      QTFLAFG   += "-I ${QTHOME}/QtSql.framework/Headers "
+      QTFLAFG   += "-I ${QTHOME}/QtXml.framework/Headers "
+    else
+      QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
+    endif
   endif
   ifndef QTMOC
-    QTMOC      := $(QTHOME)/bin/moc
+    ifeq ($(QT_VERSION),QT4)
+      QTMOC      := /usr/bin/moc
+    else
+      QTMOC      := $(QTHOME)/bin/moc
+    endif
   endif
   ifndef QTLIBS
-    QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
-    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
-    QT4LIBS    += -framework QtSql -framework QtXml
-    QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
+    ifeq ($(QT_VERSION),QT3)
+      QTLIBS    := -L$(QTHOME)/lib -lqt -lqui
+    else
+      QTLIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
+      QTLIBS    += -framework QtSql -framework QtXml
+    endif
   endif
 
   ifndef GLQTLIBS
-    QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
-    QT4LIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
-    QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
-    GLQTLIBS   := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
+    ifeq ($(QT_VERSION),QT3)
+      GLQTLIBS    := -L$(QTHOME)/lib -lqt -lqui
+    else
+      GLQTLIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
+      GLQTLIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
+    endif
   endif