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

Timestamp:

Jan 5, 2011, 12:20:17 PM (14 years ago)

Author:

garnier

Message:

update

File:

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

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

@@ -77 +77 @@
 
 # ---- QT Setup block -------------------------------------------------------
+
   ifndef QTHOME
     QTHOME     := /usr
@@ -87 +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 
-    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 )
-      ifneq ($(QT_ALT1),0)
-        QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)
-      endif
-      ifneq ($(QT_ALT2),0)
-        QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)/Qt
-      endif
-    endif
+    QTFLAGS   := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
+    QTFLAGS   += -I$(QTHOME)/include/QtCore 
+    QTFLAGS   += -I$(QTHOME)/include/QtGui 
+    QTFLAGS   += -I$(QTHOME)/include/QtOpenGL 
   endif
   ifndef QTLIBPATH
-    QT_SEARCH_LIB1 := $(shell ls  $(QTHOME)/lib/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
-    QT_SEARCH_LIB2 := $(shell ls  $(QTHOME)/lib/libq*  2>/dev/null | wc -l )
-    ifneq ($(QT_SEARCH_LIB1),0)
-      QTLIBPATH   := $(QTHOME)/lib/qt$(QT_VERSION)
-    endif
-    ifneq ($(QT_SEARCH_LIB2),0)
-      QTLIBPATH   := $(QTHOME)/lib
+    QTLIBPATH := $(QTHOME)/lib
+    QT_SEARCH_LIB := $(shell ls  $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
+    ifneq ($(QT_SEARCH_LIB),0)
+      QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
     endif
   endif
   ifndef QTLIBS
-    QTLIBS   := -L$(QTLIBPATH)
-    ifeq ($(QT_VERSION),3)
-      QT3_MT  := $(shell ls  $(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
-      ifneq ($(QT3_MT),0)
-        QTLIBS  += -lqt-mt
-      else
-        QTLIBS  += -lqt
-      endif
-      QTLIBS   += -lqui
-    else
-      QTLIBS    += -lQtCore -lQtGui
-    endif
+    QTLIBS   := -L$(QTLIBPATH) -lQtCore -lQtGui
   endif
   ifndef GLQTLIBS
-    ifeq ($(QT_VERSION),3)
-        # already done in QTLIBS
-        #      GLQTLIBS    := $(QTLIBS)
-    else
-      GLQTLIBS    := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
-    endif
+    GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
   endif
+
 #----------------------------------------------------------------------------