assimp_cmd: make sure we define both DEBUG and _DEBUG in debug builds. This fixes build trouble with vc9-debug.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@809 67173fc5-114c-0410-ac8e-9d2fd5bffc1fpull/1/head
parent
76bdf7d0cb
commit
631f3a2ff9
|
@ -46,7 +46,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG,DEBUG,_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
@ -66,7 +66,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -146,7 +146,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -221,7 +221,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -301,7 +301,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -458,7 +458,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib "
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -535,7 +535,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -615,7 +615,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -694,7 +694,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -774,7 +774,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -851,7 +851,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -931,7 +931,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -1008,7 +1008,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -1088,7 +1088,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp_debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -1163,7 +1163,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -1243,7 +1243,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="assimp.lib zlib1.lib"
|
||||
AdditionalDependencies="assimp.lib"
|
||||
OutputFile="$(OutDir)\assimp.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)""
|
||||
|
@ -1472,6 +1472,14 @@
|
|||
<File
|
||||
RelativePath="..\..\contrib\zlib\zutil.c"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
CompileAs="1"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
|
|
Loading…
Reference in New Issue