Changeset 1209

Timestamp:

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

Author:

bittner

Message:

build 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: ?t 17. VIII 14:59:05 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. VIII 15:16:21 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 \
@@ -77 +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\win32\thread_off.prf \
                 C:\Qt\4.1.2\mkspecs\features\resources.prf \
                 C:\Qt\4.1.2\mkspecs\features\uic.prf
@@ -89 +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:
@@ -95 +96 @@
 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\win32\thread_off.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

@@ -1 +1 @@
 CONFIG -= qt
-CONFIG += console warn_off release
+CONFIG += console warn_off thread release
 
 TEMPLATE = app
@@ -22 +22 @@
 
 win32:LIBPATH += GL $$NONGTP/Xerces/xerces/lib $$NONGTP/Devil/lib \
-  $$NONGTP/glut $$NONGTP/Boost/lib
+  $$NONGTP/glut $$NONGTP/Boost/lib $$NONGTP/Zlib/lib
 
 CONFIG(qt) {
@@ -41 +41 @@
 }
 
-win32:LIBS += xerces-c_2.lib devil.lib ilu.lib ilut.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 \
+/NODEFAULTLIB:"libboost_thread-vc71-mt-1_33_1.lib" \
+glew32.lib zlib.lib
 
 CONFIG(qt) {
-win32:LIBS += cg.lib cgGL.lib glew32.lib
+win32:LIBS += cg.lib cgGL.lib 
 }
 
@@ -67 +70 @@
 VrmlExporter.cpp PlyParser.cpp plyfile.c RenderSampler.cpp \
 GzBinFileInputStream.cpp  GzFileInputSource.cpp \
-OcclusionQuery.cpp VspOspTree.cpp LogManager.cpp \
+VspOspTree.cpp LogManager.cpp \
 SamplingStrategy.cpp KdIntersectable.cpp BoostPreprocessorThread.cpp
 
+CONFIG(qt) {
+OcclusionQuery.cpp
+}
+
 #VspKdTree.cpp ResourceManager.cpp