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

Timestamp:

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

Author:

garnier

Message:

amelioration pour Linux

File:

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

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