mirror of https://github.com/CGAL/cgal
upgrade to VC7.3 and fixes
This commit is contained in:
Andreas Fabri
parent
a2c3bb8a58
commit
e7dad4fa48
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="constrained_delaunay_triangulation_2"
|
||||
ProjectGUID="{45514DA4-D5CC-40C0-8C3B-514496A20721}"
|
||||
Keyword="Win32Proj">
|
||||
|
|
@ -20,11 +20,11 @@
|
|||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/Zm900"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(CGALROOT)/include/CGAL/config/msvc7";"$(CGALROOT)/include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
|
||||
AdditionalIncludeDirectories=""../../include/CGAL/config/msvc7";"../../include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="5"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
|
|
@ -35,14 +35,13 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="$(CGALROOT)\lib\msvc7\CGAL.lib $(CGALROOT)\lib\msvc7\CGALQt.lib $(QTDIR)\lib\qt.lib $(QTDIR)\lib\qtmain.lib $(CGALROOT)\lib\msvc7\gmp.lib wsock32.lib winmm.lib imm32.lib opengl32.lib glu32.lib"
|
||||
AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
|
||||
OutputFile="$(OutDir)/constrained_delaunay_triangulation_2.exe"
|
||||
LinkIncremental="2"
|
||||
IgnoreDefaultLibraryNames="LIBC"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(OutDir)/constrained_delaunay_triangulation_2.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"/>
|
||||
SubSystem="2"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
|
|
@ -56,8 +55,14 @@
|
|||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
|
@ -71,10 +76,10 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories=""$(CGALROOT)/include/CGAL/config/msvc7";"$(CGALROOT)/include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
|
||||
AdditionalIncludeDirectories=""../../include/CGAL/config/msvc7";"../../include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="4"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -85,15 +90,14 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="$(CGALROOT)\lib\msvc7\CGAL.lib $(CGALROOT)\lib\msvc7\CGALQt.lib $(QTDIR)\lib\qt.lib $(QTDIR)\lib\qtmain.lib $(CGALROOT)\lib\msvc7\gmp.lib wsock32.lib winmm.lib imm32.lib opengl32.lib glu32.lib"
|
||||
AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
|
||||
OutputFile="$(OutDir)/constrained_delaunay_triangulation_2.exe"
|
||||
LinkIncremental="1"
|
||||
IgnoreDefaultLibraryNames=""
|
||||
GenerateDebugInformation="TRUE"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"/>
|
||||
EnableCOMDATFolding="2"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
|
|
@ -107,10 +111,18 @@
|
|||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="delaunay_triangulation_2"
|
||||
ProjectGUID="{4158092B-E33F-4B53-A1A7-D82CB8C4B2A6}"
|
||||
Keyword="Win32Proj">
|
||||
|
|
@ -20,11 +20,11 @@
|
|||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/Zm900"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(CGALROOT)/include/CGAL/config/msvc7";"$(CGALROOT)/include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
AdditionalIncludeDirectories=""../../include/CGAL/config/msvc7";"../../include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="5"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
|
|
@ -35,10 +35,10 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="$(CGALROOT)\lib\msvc7\CGAL.lib $(CGALROOT)\lib\msvc7\CGALQt.lib $(QTDIR)\lib\qt.lib $(QTDIR)\lib\qtmain.lib $(CGALROOT)\lib\msvc7\gmp.lib wsock32.lib winmm.lib imm32.lib opengl32.lib glu32.lib"
|
||||
AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
|
||||
OutputFile="$(OutDir)/delaunay_triangulation_2.exe"
|
||||
LinkIncremental="2"
|
||||
IgnoreDefaultLibraryNames="LIBC"
|
||||
IgnoreDefaultLibraryNames=""
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(OutDir)/delaunay_triangulation_2.pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -56,8 +56,14 @@
|
|||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
|
@ -71,10 +77,10 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories=""$(CGALROOT)/include/CGAL/config/msvc7";"$(CGALROOT)/include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
AdditionalIncludeDirectories=""../../include/CGAL/config/msvc7";"../../include";"$(QTDIR)\include";"$(QTDIR)\mkspecs\win32-msvc""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="4"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -86,7 +92,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="$(CGALROOT)\lib\msvc7\CGAL.lib $(CGALROOT)\lib\msvc7\CGALQt.lib $(QTDIR)\lib\qt.lib $(QTDIR)\lib\qtmain.lib $(CGALROOT)\lib\msvc7\gmp.lib wsock32.lib winmm.lib imm32.lib opengl32.lib glu32.lib"
|
||||
AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
|
||||
OutputFile="$(OutDir)/delaunay_triangulation_2.exe"
|
||||
LinkIncremental="1"
|
||||
IgnoreDefaultLibraryNames=""
|
||||
|
|
@ -108,10 +114,18 @@
|
|||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="regular_triangulation_2"
|
||||
ProjectGUID="{4D5CDA61-852F-4E0F-8864-61C80A21B423}"
|
||||
Keyword="Win32Proj">
|
||||
|
|
@ -18,13 +18,14 @@
|
|||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/GR /Zm900"
|
||||
AdditionalOptions="/Zm900"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(CGALROOT)/include/CGAL/config/msvc7";"$(CGALROOT)/include";"$(QTDIR)/include""
|
||||
AdditionalIncludeDirectories=""../../include/CGAL/config/msvc7";"../../include";"$(QTDIR)/include""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;CGAL_USE_QT"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="5"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="FALSE"
|
||||
|
|
@ -33,10 +34,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="$(CGALROOT)/lib/msvc7/CGAL.lib
|
||||
$(QTDIR)/lib/qtmain.lib $(QTDIR)/lib/qt.lib
|
||||
$(CGALROOT)/lib/msvc7/CGALQt.lib
|
||||
imm32.lib wsock32.lib"
|
||||
AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib imm32.lib wsock32.lib"
|
||||
OutputFile="$(OutDir)/regular_triangulation_2.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="TRUE"
|
||||
|
|
@ -56,8 +54,14 @@ imm32.lib wsock32.lib"
|
|||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
|
@ -67,15 +71,16 @@ imm32.lib wsock32.lib"
|
|||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/GR /Zm900"
|
||||
AdditionalOptions="/Zm900"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories=""$(CGALROOT)/include/CGAL/config/msvc7";"$(CGALROOT)/include";"$(QTDIR)/include""
|
||||
AdditionalIncludeDirectories=""../../include/CGAL/config/msvc7";"../../include";"$(QTDIR)/include""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;CGAL_USE_QT"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="4"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="FALSE"
|
||||
|
|
@ -84,10 +89,7 @@ imm32.lib wsock32.lib"
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="$(CGALROOT)/lib/msvc7/CGAL.lib
|
||||
$(QTDIR)/lib/qtmain.lib $(QTDIR)/lib/qt.lib
|
||||
$(CGALROOT)/lib/msvc7/CGALQt.lib
|
||||
imm32.lib wsock32.lib"
|
||||
AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib imm32.lib wsock32.lib"
|
||||
OutputFile="$(OutDir)/regular_triangulation_2.exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="TRUE"
|
||||
|
|
@ -108,10 +110,18 @@ imm32.lib wsock32.lib"
|
|||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
|
|
@ -133,6 +143,12 @@ imm32.lib wsock32.lib"
|
|||
</File>
|
||||
<File
|
||||
RelativePath="regular_triangulation_2_toolbar.C">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
CompileAs="2"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
|
|
@ -142,6 +158,12 @@ imm32.lib wsock32.lib"
|
|||
</File>
|
||||
<File
|
||||
RelativePath="regular_triangulation_2_toolbar_layers.C">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
CompileAs="2"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
|
|
@ -151,6 +173,12 @@ imm32.lib wsock32.lib"
|
|||
</File>
|
||||
<File
|
||||
RelativePath="triangulation_2_edit_vertex.C">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
CompileAs="2"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
|
|
@ -170,6 +198,13 @@ imm32.lib wsock32.lib"
|
|||
</File>
|
||||
<File
|
||||
RelativePath="regular_triangulation_2_toolbar.h">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="$(QTDIR)/bin/moc.exe -o regular_triangulation_2_toolbar.moc regular_triangulation_2_toolbar.h"
|
||||
Outputs="regular_triangulation_2_toolbar.moc"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
|
|
@ -181,6 +216,13 @@ imm32.lib wsock32.lib"
|
|||
</File>
|
||||
<File
|
||||
RelativePath="regular_triangulation_2_toolbar_layers.h">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="$(QTDIR)/bin/moc.exe -o regular_triangulation_2_toolbar_layers.moc regular_triangulation_2_toolbar_layers.h"
|
||||
Outputs="regular_triangulation_2_toolbar_layers.moc"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
|
|
|
|||
Loading…
Reference in New Issue