Changeset 1166 for GTP/trunk/Lib/Vis/QtRenderer

Timestamp:

07/27/06 20:34:55 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/QtRenderer

Files:

• QtGlRenderer.cpp (modified) (1 diff)
• QtRenderer.vcproj (modified) (2 diffs)

GTP/trunk/Lib/Vis/QtRenderer/QtGlRenderer.cpp

@@ -1359 +1359 @@
 
         
-        int currentPos = mViewCellsManager->GetViewCells().size();
-        float currentCost=-1;
+        int currentPos = (int)mViewCellsManager->GetViewCells().size();
+        float currentCost= -1;
 
         if (currentPos < costFunction.size())

GTP/trunk/Lib/Vis/QtRenderer/QtRenderer.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\Preprocessing\src;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\..\..\..\..\NonGTP\Zlib\include;"$(CG_INC_PATH)""
+                                AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\Preprocessing\src;..\..\..\..\..\NonGTP\Zlib\include;"$(CG_INC_PATH)""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QTRENDERER_EXPORTS"
                                 MinimalRebuild="TRUE"
@@ -28 +28 @@
                                 WarningLevel="3"
                                 Detect64BitPortabilityProblems="TRUE"
-                                DebugInformationFormat="3"/>
+                                DebugInformationFormat="4"/>
                         <Tool
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLinkerTool"
-                                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"
-                                OutputFile="$(OutDir)/QtGlRenderer.dll"
-                                LinkIncremental="1"
+                                AdditionalDependencies="Preprocessor.lib qtmain.lib QtGui4d.lib Qt3Support4d.lib QAxContainerd.lib QtCore4d.lib QtOpenGL4.lib xerces-c_2.lib glew32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib"
+                                OutputFile="$(OutDir)/QtRenderer.dll"
+                                LinkIncremental="2"
                                 AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;..\..\..\..\..\NonGTP\Zlib\lib;&quot;$(CG_LIB_PATH)&quot;;&quot;..\Preprocessing\lib\$(ConfigurationName)&quot;;..\Preprocessing\src\GL;..\..\..\..\..\NonGTP\Xerces\xercesc\lib"
                                 GenerateDebugInformation="TRUE"
-                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+                                ProgramDatabaseFile="$(OutDir)/QtRenderer.pdb"
                                 SubSystem="2"
                                 ImportLibrary="$(OutDir)/QtRenderer.lib"