v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-08-31 02:39:00 +00:00
parent 76bdf7d0cb
commit 631f3a2ff9
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
workspaces/vc9/assimp_cmd.vcproj
View File

@ -46,7 +46,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\include" AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG,DEBUG,_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -66,7 +66,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -146,7 +146,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -221,7 +221,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp.exe" OutputFile="$(OutDir)\assimp.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -301,7 +301,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp.exe" OutputFile="$(OutDir)\assimp.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -458,7 +458,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib " AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp.exe" OutputFile="$(OutDir)\assimp.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -535,7 +535,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp.exe" OutputFile="$(OutDir)\assimp.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -615,7 +615,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp.exe" OutputFile="$(OutDir)\assimp.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -694,7 +694,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -774,7 +774,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -851,7 +851,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -931,7 +931,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -1008,7 +1008,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -1088,7 +1088,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp_debug.exe" OutputFile="$(OutDir)\assimp_debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -1163,7 +1163,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp.exe" OutputFile="$(OutDir)\assimp.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -1243,7 +1243,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="assimp.lib zlib1.lib" AdditionalDependencies="assimp.lib"
OutputFile="$(OutDir)\assimp.exe" OutputFile="$(OutDir)\assimp.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;" AdditionalLibraryDirectories="&quot;..\..\lib\assimp_$(ConfigurationName)_$(PlatformName)&quot;"
@ -1472,6 +1472,14 @@
<File <File
RelativePath="..\..\contrib\zlib\zutil.c" RelativePath="..\..\contrib\zlib\zutil.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="1"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
</Filter> </Filter>