From 2c223782feb7eae0627712d41f637280bb146ceb Mon Sep 17 00:00:00 2001
From: DJRobX <DJRobX@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Fri, 9 Nov 2007 02:01:19 +0000
Subject: [PATCH] Fix up pathing in project

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@47 a31d4220-a93d-0410-bf67-fe4944624d44
---
 VBA.vcproj    | 8 ++++----
 src/memgzio.h | 2 --
 src/unzip.h   | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/VBA.vcproj b/VBA.vcproj
index 75b42a91..e6ccfe03 100644
--- a/VBA.vcproj
+++ b/VBA.vcproj
@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)src\win32\dependencies\zlib&quot;;&quot;$(SolutionDir)src\win32\dependencies\libpng&quot;;&quot;$(SolutionDir)src\win32\dependencies\cximage&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\dependencies\zlib&quot;;&quot;$(SolutionDir)..\dependencies\libpng&quot;;&quot;$(SolutionDir)..\dependencies\cximage&quot;"
 				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="&quot;$(SolutionDir)..\dependencies\zlib&quot;;&quot;$(SolutionDir)..\dependencies\libpng&quot;;&quot;$(SolutionDir)..\dependencies\cximage&quot;"
 				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="&quot;$(SolutionDir)src\win32\dependencies\zlib&quot;;&quot;$(SolutionDir)src\win32\dependencies\libpng&quot;;&quot;$(SolutionDir)src\win32\dependencies\cximage&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\dependencies\zlib&quot;;&quot;$(SolutionDir)..\dependencies\libpng&quot;;&quot;$(SolutionDir)..\dependencies\cximage&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;FINAL_VERSION;MMX;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
 				GeneratePreprocessedFile="0"
diff --git a/src/memgzio.h b/src/memgzio.h
index d4b4ad77..75db5981 100644
--- a/src/memgzio.h
+++ b/src/memgzio.h
@@ -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 *);
diff --git a/src/unzip.h b/src/unzip.h
index 003e7381..dadabd93 100644
--- a/src/unzip.h
+++ b/src/unzip.h
@@ -65,7 +65,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "zlib.h"
+#include <zlib.h>
 #endif
 
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)