Changeset 1030 for trunk/config

Timestamp:

May 6, 2009, 3:47:35 PM (15 years ago)

Author:

garnier

Message:

update

File:

• trunk/config/sys/Linux-g++.gmk (modified) (1 diff)

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

@@ -87 +87 @@
 
   ifndef QTFLAGS
-
-    QTINCPATH := $(QTHOME)/include
-
     ifeq ($(QT_VERSION),4)
+      QTFLAGS   += -I$(QTHOME)/include
+      QTFLAGS   += -I $(QTHOME)/include/QtCore 
+      QTFLAGS   += -I $(QTHOME)/include/QtGui 
+      QTFLAGS   += -I $(QTHOME)/include/QtOpenGL 
+    else
+      QTFLAGS := -I$(QTHOME)/include/Qt -I$(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)/Qt/*.h 2>/dev/null | wc -l )
+      QT_ALT1 := $(shell ls  $(QTHOME)/include/qt$(QT_VERSION)/*.h 2>/dev/null | wc -l )
+      QT_ALT2 := $(shell ls  $(QTHOME)/include/qt$(QT_VERSION)/Qt/*.h 2>/dev/null | wc -l )
       ifneq ($(QT_ALT1),0)
-        QTINCPATH := $(QTINCPATH)/qt$(QT_VERSION)
+        QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)
       endif
-
-      QTFLAGS   := -I$(QTINCPATH)
-      QTFLAGS   += -I$(QTINCPATH)/Qt
-      QTFLAGS   += -I$(QTINCPATH)/QtCore 
-      QTFLAGS   += -I$(QTINCPATH)/QtGui 
-      QTFLAGS   += -I$(QTINCPATH)/QtOpenGL 
-
-    else
-
-      # 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)/Qt/*.h 2>/dev/null | wc -l )
-      ifneq ($(QT_ALT1),0)
-        QTINCPATH := $(QTINCPATH)/qt$(QT_VERSION)
+      ifneq ($(QT_ALT2),0)
+        QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)/Qt
       endif
-
-      QTFLAGS := -I$(QTINCPATH)/Qt -I$(QTINCPATH)
-
     endif
   endif