commit 6533fc3bf5258252fd93ccda6aa8db56b008a5c1
author Lucas Eckels <eckels@google.com> Fri Aug 10 16:41:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 10 16:41:42 2012 -0700
tree 624e237bdfe8637d9496c9941b3bd60a4afbe265
parent 414c9ef5ea732c9dc11e6265b2cd8db879f15977
parent 89763aeb529cddb7486ab2b63e5baf48860bca2b

Merge "Update freeimage Windows projects for renamed dep paths." into jumper

Source/FreeImageLib/FreeImageLib.2008.vcproj

diff --git a/Source/FreeImageLib/FreeImageLib.2008.vcproj b/Source/FreeImageLib/FreeImageLib.2008.vcproj
index 5952a24..b943f4f 100644
--- a/Source/FreeImageLib/FreeImageLib.2008.vcproj
+++ b/Source/FreeImageLib/FreeImageLib.2008.vcproj
@@ -42,7 +42,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\;&quot;$(ProjectDir)\..\..\..\zlib-1.2.3&quot;;..\DeprecationManager;..\OpenEXR\Half;..\OpenEXR\Iex;..\OpenEXR\IlmImf;..\OpenEXR\Imath;..\OpenEXR\IlmThread"

+				AdditionalIncludeDirectories="..\;&quot;$(ProjectDir)\..\..\..\zlib&quot;;..\DeprecationManager;..\OpenEXR\Half;..\OpenEXR\Iex;..\OpenEXR\IlmImf;..\OpenEXR\Imath;..\OpenEXR\IlmThread"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OPJ_STATIC;FREEIMAGE_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="false"

 				RuntimeLibrary="3"

@@ -111,7 +111,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="0"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\;&quot;$(ProjectDir)\..\..\..\zlib-1.2.3&quot;;..\DeprecationManager;..\OpenEXR\Half;..\OpenEXR\Iex;..\OpenEXR\IlmImf;..\OpenEXR\Imath;..\OpenEXR\IlmThread"

+				AdditionalIncludeDirectories="..\;&quot;$(ProjectDir)\..\..\..\zlib&quot;;..\DeprecationManager;..\OpenEXR\Half;..\OpenEXR\Iex;..\OpenEXR\IlmImf;..\OpenEXR\Imath;..\OpenEXR\IlmThread"

 				PreprocessorDefinitions="WIN32;NDEBUG;OPJ_STATIC;FREEIMAGE_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

Source/LibMNG/LibMNG.2008.vcproj

diff --git a/Source/LibMNG/LibMNG.2008.vcproj b/Source/LibMNG/LibMNG.2008.vcproj
index 9c1d407..2b827c2 100644
--- a/Source/LibMNG/LibMNG.2008.vcproj
+++ b/Source/LibMNG/LibMNG.2008.vcproj
@@ -45,7 +45,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="0"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\zlib-1.2.3";..\LibJPEG"

+				AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\zlib";..\LibJPEG"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -114,7 +114,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\zlib-1.2.3&quot;;..\LibJPEG"

+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\zlib&quot;;..\LibJPEG"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="false"

 				RuntimeLibrary="3"

Source/LibPNG/LibPNG.2008.vcproj

diff --git a/Source/LibPNG/LibPNG.2008.vcproj b/Source/LibPNG/LibPNG.2008.vcproj
index d347421..68cfa62 100644
--- a/Source/LibPNG/LibPNG.2008.vcproj
+++ b/Source/LibPNG/LibPNG.2008.vcproj
@@ -45,7 +45,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="0"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\zlib-1.2.3""

+				AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\zlib""

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -114,7 +114,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\zlib-1.2.3&quot;"

+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\zlib&quot;"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="false"

 				RuntimeLibrary="3"

Source/LibTIFF/LibTIFF.2008.vcproj

diff --git a/Source/LibTIFF/LibTIFF.2008.vcproj b/Source/LibTIFF/LibTIFF.2008.vcproj
index a5f377a..8ba8a5a 100644
--- a/Source/LibTIFF/LibTIFF.2008.vcproj
+++ b/Source/LibTIFF/LibTIFF.2008.vcproj
@@ -45,7 +45,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="0"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\libtiff\libtiff;"$(ProjectDir)\..\..\..\zlib-1.2.3""

+				AdditionalIncludeDirectories="..\libtiff\libtiff;"$(ProjectDir)\..\..\..\zlib""

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -113,7 +113,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\libtiff\libtiff;&quot;$(ProjectDir)\..\..\..\zlib-1.2.3&quot;"

+				AdditionalIncludeDirectories="..\libtiff\libtiff;&quot;$(ProjectDir)\..\..\..\zlib&quot;"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ZLIB_WINAPI;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="false"

 				RuntimeLibrary="3"