Changeset 1018 for trunk/config

Timestamp:

Apr 22, 2009, 4:08:05 PM (15 years ago)

Author:

garnier

Message:

amelioration pour Linux

File:

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

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

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