Fixed incorrect ZLib paths

This commit is contained in:
Nik Henson 2011-11-05 21:08:49 +00:00
parent 8f0e0edbb2
commit a6b31b72c1
2 changed files with 29 additions and 29 deletions

View file

@ -50,7 +50,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;..\Libraries\zlib-1.2.4\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;" AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\zlib-1.2.4&quot;;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)" PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -130,7 +130,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;..\Libraries\zlib-1.2.4\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;" AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\zlib-1.2.4&quot;;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)" PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -211,7 +211,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="3" Optimization="3"
EnableIntrinsicFunctions="false" EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;..\Libraries\zlib-1.2.4\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;" AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\zlib-1.2.4&quot;;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)" PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -295,7 +295,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="3" Optimization="3"
EnableIntrinsicFunctions="false" EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;..\Libraries\zlib-1.2.4\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;" AdditionalIncludeDirectories="..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;&quot;..\Libraries\zlib-1.2.4&quot;;&quot;..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)" PreprocessorDefinitions="SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;$(NOINHERIT)"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"

View file

@ -323,7 +323,7 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
> >
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\adler32.c" RelativePath="..\..\Libraries\zlib-1.2.4\adler32.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -359,7 +359,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\compress.c" RelativePath="..\..\Libraries\zlib-1.2.4\compress.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -395,7 +395,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\crc32.c" RelativePath="..\..\Libraries\zlib-1.2.4\crc32.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -431,7 +431,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\deflate.c" RelativePath="..\..\Libraries\zlib-1.2.4\deflate.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -467,7 +467,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\gzclose.c" RelativePath="..\..\Libraries\zlib-1.2.4\gzclose.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -503,7 +503,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\gzlib.c" RelativePath="..\..\Libraries\zlib-1.2.4\gzlib.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -539,7 +539,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\gzread.c" RelativePath="..\..\Libraries\zlib-1.2.4\gzread.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -575,7 +575,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\gzwrite.c" RelativePath="..\..\Libraries\zlib-1.2.4\gzwrite.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -611,7 +611,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\infback.c" RelativePath="..\..\Libraries\zlib-1.2.4\infback.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -647,7 +647,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\inffast.c" RelativePath="..\..\Libraries\zlib-1.2.4\inffast.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -683,7 +683,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\inflate.c" RelativePath="..\..\Libraries\zlib-1.2.4\inflate.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -719,7 +719,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\inftrees.c" RelativePath="..\..\Libraries\zlib-1.2.4\inftrees.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -755,7 +755,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\trees.c" RelativePath="..\..\Libraries\zlib-1.2.4\trees.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -791,7 +791,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\uncompr.c" RelativePath="..\..\Libraries\zlib-1.2.4\uncompr.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -827,7 +827,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\zutil.c" RelativePath="..\..\Libraries\zlib-1.2.4\zutil.c"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@ -868,43 +868,43 @@
Filter="h;hpp;hxx;hm;inl" Filter="h;hpp;hxx;hm;inl"
> >
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\crc32.h" RelativePath="..\..\Libraries\zlib-1.2.4\crc32.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\deflate.h" RelativePath="..\..\Libraries\zlib-1.2.4\deflate.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\inffast.h" RelativePath="..\..\Libraries\zlib-1.2.4\inffast.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\inffixed.h" RelativePath="..\..\Libraries\zlib-1.2.4\inffixed.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\inflate.h" RelativePath="..\..\Libraries\zlib-1.2.4\inflate.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\inftrees.h" RelativePath="..\..\Libraries\zlib-1.2.4\inftrees.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\trees.h" RelativePath="..\..\Libraries\zlib-1.2.4\trees.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\zconf.h" RelativePath="..\..\Libraries\zlib-1.2.4\zconf.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\zlib.h" RelativePath="..\..\Libraries\zlib-1.2.4\zlib.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Libraries\ZLib-1.2.4\zutil.h" RelativePath="..\..\Libraries\zlib-1.2.4\zutil.h"
> >
</File> </File>
</Filter> </Filter>