Changeset 1936 for GTP/trunk/Lib/Vis/Preprocessing
- Timestamp:
- 01/04/07 13:14:07 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis/Preprocessing/src
- Files:
-
- 2 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r1926 r1936 217 217 OptimizeForProcessor="3" 218 218 OptimizeForWindowsApplication="TRUE" 219 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include" "220 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL "219 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl"" 220 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT" 221 221 ExceptionHandling="TRUE" 222 222 RuntimeLibrary="2" … … 283 283 Name="VCLibrarianTool" 284 284 OutputFile="../lib/Release/$(ProjectName).lib"/> 285 <Tool286 Name="VCMIDLTool"/>287 <Tool288 Name="VCPostBuildEventTool"/>289 <Tool290 Name="VCPreBuildEventTool"/>291 <Tool292 Name="VCPreLinkEventTool"/>293 <Tool294 Name="VCResourceCompilerTool"/>295 <Tool296 Name="VCWebServiceProxyGeneratorTool"/>297 <Tool298 Name="VCXMLDataGeneratorTool"/>299 <Tool300 Name="VCManagedWrapperGeneratorTool"/>301 <Tool302 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>303 </Configuration>304 <Configuration305 Name="Release_qt|Win32"306 OutputDirectory="$(ConfigurationName)"307 IntermediateDirectory="$(ConfigurationName)"308 ConfigurationType="4"309 CharacterSet="2">310 <Tool311 Name="VCCLCompilerTool"312 Optimization="3"313 GlobalOptimizations="TRUE"314 InlineFunctionExpansion="2"315 EnableIntrinsicFunctions="TRUE"316 FavorSizeOrSpeed="1"317 OmitFramePointers="TRUE"318 EnableFiberSafeOptimizations="TRUE"319 OptimizeForProcessor="0"320 OptimizeForWindowsApplication="TRUE"321 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include""322 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_QT"323 ExceptionHandling="TRUE"324 RuntimeLibrary="2"325 DisableLanguageExtensions="FALSE"326 ForceConformanceInForLoopScope="FALSE"327 RuntimeTypeInfo="TRUE"328 UsePrecompiledHeader="0"329 BrowseInformation="1"330 WarningLevel="2"331 Detect64BitPortabilityProblems="TRUE"332 DebugInformationFormat="3"/>333 <Tool334 Name="VCCustomBuildTool"/>335 <Tool336 Name="VCLibrarianTool"337 OutputFile="..\lib\Release\$(ProjectName).lib"/>338 285 <Tool 339 286 Name="VCMIDLTool"/> … … 639 586 Outputs=""/> 640 587 </FileConfiguration> 641 <FileConfiguration642 Name="Release_qt|Win32">643 <Tool644 Name="VCCustomBuildTool"645 Description=""646 CommandLine=""647 Outputs=""/>648 </FileConfiguration>649 588 </File> 650 589 <File … … 699 638 Outputs=""/> 700 639 </FileConfiguration> 701 <FileConfiguration702 Name="Release_qt|Win32">703 <Tool704 Name="VCCustomBuildTool"705 Description=""706 CommandLine=""707 Outputs=""/>708 </FileConfiguration>709 640 </File> 710 641 <File … … 713 644 <File 714 645 RelativePath="..\src\Pvs.h"> 646 </File> 647 <File 648 RelativePath=".\QtGlViewer.cpp"> 649 </File> 650 <File 651 RelativePath=".\QtGlViewer.h"> 715 652 </File> 716 653 <File -
GTP/trunk/Lib/Vis/Preprocessing/src/QtGlRenderer/QtGlRenderer.sln
r1926 r1936 8 8 Debug = Debug 9 9 Release = Release 10 Release Internal = Release Internal 10 11 release_internal = release_internal 11 12 EndGlobalSection … … 15 16 {B85DC7B1-58B6-4912-BD64-8B452630A368}.Release.ActiveCfg = Release|Win32 16 17 {B85DC7B1-58B6-4912-BD64-8B452630A368}.Release.Build.0 = Release|Win32 18 {B85DC7B1-58B6-4912-BD64-8B452630A368}.Release Internal.ActiveCfg = Release Internal|Win32 19 {B85DC7B1-58B6-4912-BD64-8B452630A368}.Release Internal.Build.0 = Release Internal|Win32 17 20 {B85DC7B1-58B6-4912-BD64-8B452630A368}.release_internal.ActiveCfg = release_internal|Win32 18 21 {B85DC7B1-58B6-4912-BD64-8B452630A368}.release_internal.Build.0 = release_internal|Win32 -
GTP/trunk/Lib/Vis/Preprocessing/src/QtGlRenderer/QtGlRenderer.vcproj
r1926 r1936 40 40 OutputFile="$(OutDir)/QtGlRenderer.dll" 41 41 LinkIncremental="2" 42 AdditionalLibraryDirectories=" "$(QTDIR)\lib";..\..\..\..\..\..\NonGTP\Zlib\lib;"$(CG_LIB_PATH)";..\src\GL;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"..\lib\$(ConfigurationName)""42 AdditionalLibraryDirectories="..\..\lib\Debug;"$(CG_LIB_PATH)";..\GL;"..\lib\$(ConfigurationName)";"$(QTDIR)\lib";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\..\NonGTP\Zlib\lib" 43 43 GenerateDebugInformation="TRUE" 44 44 ProgramDatabaseFile="$(OutDir)/QtGlRenderer.pdb" … … 149 149 OutputFile="Release/QtGlRenderer.dll" 150 150 LinkIncremental="1" 151 AdditionalLibraryDirectories=""$(QTDIR)\lib";..\..\..\..\..\..\..\NonGTP\Zlib\lib;"$(CG_LIB_PATH)";..\..\src\GL;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib; "..\..\lib\$(ConfigurationName)";..\..\MultiLevelRayTracing\RTScene\Release;..\..\MultiLevelRayTracing\RTWorld\Release"151 AdditionalLibraryDirectories=""$(QTDIR)\lib";..\..\..\..\..\..\..\NonGTP\Zlib\lib;"$(CG_LIB_PATH)";..\..\src\GL;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\lib\Release;..\..\MultiLevelRayTracing\RTScene\Release;..\..\MultiLevelRayTracing\RTWorld\Release" 152 152 GenerateDebugInformation="FALSE" 153 153 SubSystem="2" … … 162 162 Description=""copy dll to preprocessor dir"" 163 163 CommandLine="copy $(OutDir)\*.dll ..\..\bin\"/> 164 <Tool 165 Name="VCPreBuildEventTool"/> 166 <Tool 167 Name="VCPreLinkEventTool"/> 168 <Tool 169 Name="VCResourceCompilerTool"/> 170 <Tool 171 Name="VCWebServiceProxyGeneratorTool"/> 172 <Tool 173 Name="VCXMLDataGeneratorTool"/> 174 <Tool 175 Name="VCWebDeploymentTool"/> 176 <Tool 177 Name="VCManagedWrapperGeneratorTool"/> 178 <Tool 179 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 180 </Configuration> 181 <Configuration 182 Name="Release Internal|Win32" 183 OutputDirectory="$(ConfigurationName)" 184 IntermediateDirectory="$(ConfigurationName)" 185 ConfigurationType="2" 186 CharacterSet="2"> 187 <Tool 188 Name="VCCLCompilerTool" 189 AdditionalIncludeDirectories="..\..\src;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\..\..\..\..\..\..\NonGTP\Zlib\include;"$(CG_INC_PATH)"" 190 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QTGLRENDERER_EXPORTS" 191 RuntimeLibrary="2" 192 UsePrecompiledHeader="0" 193 WarningLevel="3" 194 Detect64BitPortabilityProblems="TRUE" 195 DebugInformationFormat="3"/> 196 <Tool 197 Name="VCCustomBuildTool" 198 Description="Performing moc on $(InputName).h" 199 CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp 200 " 201 Outputs="$(InputDir) moc_$(InputName).cpp"/> 202 <Tool 203 Name="VCLinkerTool" 204 AdditionalDependencies="Preprocessor.lib qtmain.lib QtGui4.lib Qt3Support4.lib QAxContainer.lib QtCore4.lib QtOpenGL4.lib xerces-c_2.lib glew32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib RTScene.lib RTWorld.lib" 205 OutputFile="Release/QtGlRenderer.dll" 206 LinkIncremental="1" 207 AdditionalLibraryDirectories=""$(QTDIR)\lib";..\..\..\..\..\..\..\NonGTP\Zlib\lib;"$(CG_LIB_PATH)";..\..\src\GL;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\lib\Release;..\..\MultiLevelRayTracing\RTScene\Release;..\..\MultiLevelRayTracing\RTWorld\Release" 208 GenerateDebugInformation="FALSE" 209 SubSystem="2" 210 OptimizeReferences="2" 211 EnableCOMDATFolding="2" 212 ImportLibrary="$(OutDir)/QtGlRenderer.lib" 213 TargetMachine="1"/> 214 <Tool 215 Name="VCMIDLTool"/> 216 <Tool 217 Name="VCPostBuildEventTool" 218 Description=""copy dll to preprocessor dir"" 219 CommandLine="copy Release\*.dll ..\..\bin\"/> 164 220 <Tool 165 221 Name="VCPreBuildEventTool"/> … … 191 247 </File> 192 248 <File 193 RelativePath=".\moc_QtGlViewer.cpp">194 </File>195 <File196 249 RelativePath=".\QtGlRenderer.cpp"> 197 250 </File> 198 251 <File 199 252 RelativePath=".\QtGlRendererDll.cpp"> 200 </File>201 <File202 RelativePath=".\QtGlViewer.cpp">203 253 </File> 204 254 </Filter> … … 227 277 Outputs="$(InputDir) moc_$(InputName).cpp"/> 228 278 </FileConfiguration> 229 </File>230 <File231 RelativePath=".\QtGlViewer.h">232 279 <FileConfiguration 233 Name="Release |Win32">280 Name="Release Internal|Win32"> 234 281 <Tool 235 282 Name="VCCustomBuildTool" 236 283 Description="Performing moc on $(InputName).h" 237 CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp" 284 CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp 285 " 238 286 Outputs="$(InputDir) moc_$(InputName).cpp"/> 239 287 </FileConfiguration> -
GTP/trunk/Lib/Vis/Preprocessing/src/QtGlViewer.cpp
r1931 r1936 1 1 // =================================================================== 2 2 // $Id$ 3 #ifdef USE_QT 3 4 4 5 // Qt headers … … 160 161 { 161 162 scale = scale*(1.0f - dy/(float)height()); 162 if (scale < 0.01 )163 scale = 0.01 ;163 if (scale < 0.01f) 164 scale = 0.01f; 164 165 updateGL(); 165 166 } … … 186 187 } 187 188 } 189 190 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/QtGlViewer.h
r1931 r1936 2 2 #define __QTGLVIEWER_H 3 3 4 #ifdef USE_QT 4 5 #include <QtOpenGL> 5 6 … … 12 13 { 13 14 14 Q_OBJECT15 //Q_OBJECT 15 16 16 17 friend class QtGlRendererWidget; … … 53 54 54 55 #endif 56 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj
r1926 r1936 79 79 OptimizeForWindowsApplication="TRUE" 80 80 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\MultiLevelRayTracing" 81 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE "81 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT" 82 82 RuntimeLibrary="2" 83 83 RuntimeTypeInfo="TRUE" … … 193 193 OptimizeForProcessor="3" 194 194 OptimizeForWindowsApplication="TRUE" 195 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include" ;"$(QTDIR)\include\QtGui""195 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include"" 196 196 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT" 197 197 RuntimeLibrary="2" … … 252 252 OptimizeForWindowsApplication="TRUE" 253 253 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include"" 254 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL "254 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;NO_QT" 255 255 RuntimeLibrary="2" 256 256 RuntimeTypeInfo="TRUE" … … 266 266 OutputFile="../bin/release/Preprocessor.exe" 267 267 LinkIncremental="1" 268 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;.\QtGlRenderer\Release" 269 GenerateDebugInformation="FALSE" 270 SubSystem="1" 271 OptimizeReferences="2" 272 EnableCOMDATFolding="2" 273 TargetMachine="1" 274 FixedBaseAddress="1"/> 275 <Tool 276 Name="VCMIDLTool"/> 277 <Tool 278 Name="VCPostBuildEventTool"/> 279 <Tool 280 Name="VCPreBuildEventTool"/> 281 <Tool 282 Name="VCPreLinkEventTool"/> 283 <Tool 284 Name="VCResourceCompilerTool"/> 285 <Tool 286 Name="VCWebServiceProxyGeneratorTool"/> 287 <Tool 288 Name="VCXMLDataGeneratorTool"/> 289 <Tool 290 Name="VCWebDeploymentTool"/> 291 <Tool 292 Name="VCManagedWrapperGeneratorTool"/> 293 <Tool 294 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 295 </Configuration> 296 <Configuration 297 Name="Release_qt|Win32" 298 OutputDirectory="$(ConfigurationName)" 299 IntermediateDirectory="$(ConfigurationName)" 300 ConfigurationType="1" 301 CharacterSet="2"> 302 <Tool 303 Name="VCCLCompilerTool" 304 Optimization="3" 305 GlobalOptimizations="TRUE" 306 InlineFunctionExpansion="2" 307 EnableIntrinsicFunctions="TRUE" 308 FavorSizeOrSpeed="1" 309 OptimizeForProcessor="0" 310 OptimizeForWindowsApplication="TRUE" 311 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\MultiLevelRayTracing;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";"$(QTDIR)\include\QtGui";.\QtGlRenderer" 312 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_QT" 313 RuntimeLibrary="2" 314 RuntimeTypeInfo="TRUE" 315 UsePrecompiledHeader="0" 316 BrowseInformation="1" 317 WarningLevel="3" 318 Detect64BitPortabilityProblems="TRUE" 319 DebugInformationFormat="3"/> 320 <Tool 321 Name="VCCustomBuildTool"/> 322 <Tool 323 Name="VCLinkerTool" 324 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib" 325 OutputFile="../bin/release/Preprocessor.exe" 326 LinkIncremental="1" 327 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;"$(QTDIR)\lib";.\QtGlRenderer\Release" 268 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;"$(QTDIR)\lib";.\QtGlRenderer\Release" 328 269 GenerateDebugInformation="FALSE" 329 270 SubSystem="1"
Note: See TracChangeset
for help on using the changeset viewer.