Changeset 1208

Timestamp:

08/17/06 15:00:10 (18 years ago)

Author:

bittner

Message:

build updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

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

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

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. VIII 12:22:48 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. VIII 14:59:05 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\win32\thread.prf \
                 C:\Qt\4.1.2\mkspecs\features\warn_off.prf \
                 C:\Qt\4.1.2\mkspecs\features\win32\console.prf \
@@ -78 +77 @@
                 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\win32\thread_off.prf \
                 C:\Qt\4.1.2\mkspecs\features\resources.prf \
                 C:\Qt\4.1.2\mkspecs\features\uic.prf
@@ -92 +89 @@
 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\win32\thread.prf:
 C:\Qt\4.1.2\mkspecs\features\warn_off.prf:
 C:\Qt\4.1.2\mkspecs\features\win32\console.prf:
@@ -99 +95 @@
 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\win32\thread_off.prf:
 C:\Qt\4.1.2\mkspecs\features\resources.prf:
 C:\Qt\4.1.2\mkspecs\features\uic.prf:
@@ -116 +110 @@
 distclean: release-distclean debug-distclean FORCE
         -$(DEL_FILE) Makefile
-
-release-mocclean: $(MAKEFILE).Release
-        $(MAKE) -f $(MAKEFILE).Release mocclean
-debug-mocclean: $(MAKEFILE).Debug
-        $(MAKE) -f $(MAKEFILE).Debug mocclean
-mocclean: release-mocclean debug-mocclean
-
-release-mocables: $(MAKEFILE).Release
-        $(MAKE) -f $(MAKEFILE).Release mocables
-debug-mocables: $(MAKEFILE).Debug
-        $(MAKE) -f $(MAKEFILE).Debug mocables
-mocables: release-mocables debug-mocables
 FORCE:
 

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

@@ +1 @@
+CONFIG -= qt
+CONFIG += console warn_off release
+
 TEMPLATE = app
+
+# debuc config
+# CONFIG        += console warn_off thread release qt
 
 TARGET = preprocessor
@@ -6 +12 @@
 
 #win32:INCLUDEPATH += c:/STLport-4.6.2/stlport
+
+CONFIG(qt) {
 win32:INCLUDEPATH += "d:/Programs/NVIDIA Corporation/Cg/include"
+}
+
 unix:INCLUDEPATH += ../support/src/xerces-c-src_2_7_0/include
 
 INCLUDEPATH += ../src  $$NONGTP/Xerces/xerces/include  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include
-
-
 
 win32:LIBPATH += GL $$NONGTP/Xerces/xerces/lib $$NONGTP/Devil/lib \
@@ -18 +26 @@
 CONFIG(qt) {
 win32:LIBPATH += "d:/Programs/NVIDIA Corporation/Cg/lib"
-
 }
 
@@ -25 +32 @@
 #win32:LIBPATH += c:/STLport-4.6.2/lib
 
-# debuc config
-#CONFIG         += console warn_off thread release qt
-CONFIG          += console warn_off thread release
 
 # RELEASE CONFIG
@@ -33 +37 @@
 
 # DEPENDPATH    = ../../include
+CONFIG(qt) {
 QT += opengl
+}
 
 win32:LIBS += xerces-c_2.lib devil.lib ilu.lib ilut.lib boost_thread-vc71-mt-1_33_1.lib