Changeset 868 for trunk/config/sys/Linux-g++.gmk

Timestamp:

Oct 15, 2008, 2:49:49 PM (16 years ago)

Author:

garnier

Message:

see history

File:

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

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

@@ -63 +63 @@
     QTHOME     := /usr
   endif
+  QT_VERSION   := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3)
+
   ifndef QTFLAGS
-    QTFLAGS    := -I$(QTHOME)/include/qt4/Qt
-    QTFLAGS    += -I$(QTHOME)/include/qt4
+    ifeq ($(QT_VERSION),QT4)
+      QTFLAGS    := -I$(QTHOME)/include/qt4/Qt
+      QTFLAGS    += -I$(QTHOME)/include/qt4
+    else
+      QTFLAGS    := -I$(QTHOME)/include/qt
+    endif
   endif
   ifndef QTMOC
@@ -71 +77 @@
   endif
 
-  QT_VERSION   := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3)
 
   ifndef GLQTLIBS
@@ -77 +82 @@
       GLQTLIBS    := -L$(QTHOME)/lib -lqt-mt
     else
-      GLQTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
+      GLQTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL
     endif
   endif
@@ -84 +89 @@
       QTLIBS    := -L$(QTHOME)/lib -lqt-mt
     else
-      QTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtSql -lQtXml
+      QTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui
     endif
   endif