Fix up pathing in project
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@47 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
parent
3f0aa73180
commit
2c223782fe
|
@ -51,7 +51,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)src\win32\dependencies\zlib";"$(SolutionDir)src\win32\dependencies\libpng";"$(SolutionDir)src\win32\dependencies\cximage""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)..\dependencies\zlib";"$(SolutionDir)..\dependencies\libpng";"$(SolutionDir)..\dependencies\cximage""
|
||||
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;MMX;_CRT_SECURE_NO_WARNINGS"
|
||||
StringPooling="false"
|
||||
MinimalRebuild="true"
|
||||
|
@ -163,7 +163,7 @@
|
|||
InlineFunctionExpansion="2"
|
||||
FavorSizeOrSpeed="1"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories=".\src\win32\dependencies\zlib;.\src\win32\dependencies\libpng;.\src\win32\dependencies\cximage"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)..\dependencies\zlib";"$(SolutionDir)..\dependencies\libpng";"$(SolutionDir)..\dependencies\cximage""
|
||||
PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE"
|
||||
RuntimeLibrary="0"
|
||||
BufferSecurityCheck="false"
|
||||
|
@ -172,7 +172,7 @@
|
|||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
DebugInformationFormat="3"
|
||||
DebugInformationFormat="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
|
@ -283,7 +283,7 @@
|
|||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)src\win32\dependencies\zlib";"$(SolutionDir)src\win32\dependencies\libpng";"$(SolutionDir)src\win32\dependencies\cximage""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)..\dependencies\zlib";"$(SolutionDir)..\dependencies\libpng";"$(SolutionDir)..\dependencies\cximage""
|
||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;FINAL_VERSION;MMX;_CRT_SECURE_NO_WARNINGS"
|
||||
IgnoreStandardIncludePath="false"
|
||||
GeneratePreprocessedFile="0"
|
||||
|
|
|
@ -11,8 +11,6 @@
|
|||
|
||||
#if defined(HAVE_ZUTIL_H) || defined(_WIN32)
|
||||
# include <zutil.h>
|
||||
#else
|
||||
# include "../win32/dependencies/zlib/zutil.h"
|
||||
#endif
|
||||
|
||||
gzFile ZEXPORT memgzopen(char *memory, int, const char *);
|
||||
|
|
|
@ -65,7 +65,7 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
#ifndef _ZLIB_H
|
||||
#include "zlib.h"
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
||||
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
|
||||
|
|
Loading…
Reference in New Issue