Changeset 1207 for GTP/trunk

Timestamp:

08/17/06 14:37:03 (18 years ago)

Author:

bittner

Message:

build without qt updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (5 diffs)
• preprocessor.pro (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: pá 11. VIII 14:29:54 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. VIII 12:22:48 2006
 # Project:  preprocessor.pro
 # Template: app
@@ -71 +71 @@
                 C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf \
                 C:\Qt\4.1.2\mkspecs\features\default_post.prf \
-                C:\Qt\4.1.2\mkspecs\features\qt.prf \
-                C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf \
-                C:\Qt\4.1.2\mkspecs\features\moc.prf \
                 C:\Qt\4.1.2\mkspecs\features\win32\thread.prf \
                 C:\Qt\4.1.2\mkspecs\features\warn_off.prf \
@@ -81 +78 @@
                 C:\Qt\4.1.2\mkspecs\features\win32\stl.prf \
                 C:\Qt\4.1.2\mkspecs\features\shared.prf \
+                C:\Qt\4.1.2\mkspecs\features\qt.prf \
+                C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf \
+                C:\Qt\4.1.2\mkspecs\features\moc.prf \
                 C:\Qt\4.1.2\mkspecs\features\resources.prf \
                 C:\Qt\4.1.2\mkspecs\features\uic.prf
@@ -92 +92 @@
 C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf:
 C:\Qt\4.1.2\mkspecs\features\default_post.prf:
-C:\Qt\4.1.2\mkspecs\features\qt.prf:
-C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf:
-C:\Qt\4.1.2\mkspecs\features\moc.prf:
 C:\Qt\4.1.2\mkspecs\features\win32\thread.prf:
 C:\Qt\4.1.2\mkspecs\features\warn_off.prf:
@@ -102 +99 @@
 C:\Qt\4.1.2\mkspecs\features\win32\stl.prf:
 C:\Qt\4.1.2\mkspecs\features\shared.prf:
+C:\Qt\4.1.2\mkspecs\features\qt.prf:
+C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf:
+C:\Qt\4.1.2\mkspecs\features\moc.prf:
 C:\Qt\4.1.2\mkspecs\features\resources.prf:
 C:\Qt\4.1.2\mkspecs\features\uic.prf:

GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

@@ -7 +7 @@
 #win32:INCLUDEPATH += c:/STLport-4.6.2/stlport
 win32:INCLUDEPATH += "d:/Programs/NVIDIA Corporation/Cg/include"
-
 unix:INCLUDEPATH += ../support/src/xerces-c-src_2_7_0/include
 
@@ -13 +12 @@
 
 
-win32:LIBPATH += GL $$NONGTP/Xerces/xerces/lib $$NONGTP/Devil/lib $$NONGTP/Xe/xerces/lib \
-  "d:/Programs/NVIDIA Corporation/Cg/lib" $$NONGTP/glut $$NONGTP/Boost/lib
-  
+
+win32:LIBPATH += GL $$NONGTP/Xerces/xerces/lib $$NONGTP/Devil/lib \
+  $$NONGTP/glut $$NONGTP/Boost/lib
+
+CONFIG(qt) {
+win32:LIBPATH += "d:/Programs/NVIDIA Corporation/Cg/lib"
+
+}
+
 unix:LIBPATH += ../support/src/xerces-c-src_2_7_0/lib ../support/devil/lib /usr/lib/qt3/lib64
 
@@ -21 +26 @@
 
 # debuc config
-CONFIG          += console warn_off thread release qt
+#CONFIG         += console warn_off thread release qt
+CONFIG          += console warn_off thread release
 
 # RELEASE CONFIG
@@ -27 +33 @@
 
 # DEPENDPATH    = ../../include
-
 QT += opengl
 
-win32:LIBS += xerces-c_2.lib devil.lib ilu.lib ilut.lib cg.lib cgGL.lib glew32.lib boost_thread-vc71-mt-1_33_1.lib
+win32:LIBS += xerces-c_2.lib devil.lib ilu.lib ilut.lib boost_thread-vc71-mt-1_33_1.lib
+
+CONFIG(qt) {
+win32:LIBS += cg.lib cgGL.lib glew32.lib
+}
 
 unix:LIBS += -lxerces-c -lIL -lILU -lILUT