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

Timestamp:

Oct 8, 2008, 3:36:01 AM (16 years ago)

Author:

garnier

Message:

GLQT best integration

File:

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

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

@@ -31 +31 @@
     CCFLAGS   += -pg
   endif
+  ifdef G4OPTDEBUG
+    CXXFLAGS  += -O2 -g
+    FCFLAGS   += -O2 -g
+    CCFLAGS   += -O2 -g
+  endif
   ifdef G4LIB_BUILD_SHARED
     CXXFLAGS  += -fPIC
@@ -56 +61 @@
   endif
   ifndef QTHOME
-    QTHOME     := /usr/local/Qt
+    QTHOME     := /usr
   endif
   ifndef QTFLAGS
-    QTFLAGS    := -I$(QTHOME)/include/Qt
-    QTFLAGS    += -I$(QTHOME)/include
+    QTFLAGS    := -I$(QTHOME)/include/qt4/Qt
+    QTFLAGS    += -I$(QTHOME)/include/qt4
   endif
   ifndef QTMOC
     QTMOC      := $(QTHOME)/bin/moc
   endif
-  ifndef QTGLLIBS
-    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
-    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
-    QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
+
+  QT_VERSION   := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3)
+
+  ifndef GLQTLIBS
+    ifeq ($(QT_VERSION),QT3)
+      GLQTLIBS    := -L$(QTHOME)/lib -lqt-mt
+    else
+      GLQTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
+    endif
   endif
   ifndef QTLIBS
-    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
-    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtSql -lQtXml
-    QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
+    ifeq ($(QT_VERSION),QT3)
+      QTLIBS    := -L$(QTHOME)/lib -lqt-mt
+    else
+      QTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtSql -lQtXml
+    endif
   endif
   ifndef XAWFLAGS