From b50d6a04c770a65499c0225415665fb5b0d5660c Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 27 Mar 2011 20:17:09 -0500
Subject: [PATCH] Texture Font Generator changes to make it compile in VS2008

---
 .../Texture Font Generator-net2008.vcproj                   | 6 ++++++
 src/Texture Font Generator/Utils.cpp                        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Texture Font Generator/Texture Font Generator-net2008.vcproj b/src/Texture Font Generator/Texture Font Generator-net2008.vcproj
index 2c3e2f450e..dee8b0dace 100644
--- a/src/Texture Font Generator/Texture Font Generator-net2008.vcproj	
+++ b/src/Texture Font Generator/Texture Font Generator-net2008.vcproj	
@@ -46,6 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\libpng\include;..\zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -70,8 +71,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libpng.lib;zdll.lib"
 				OutputFile="..\..\Program\$(ProjectName)-debug.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\libpng\lib;..\zlib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -132,6 +135,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\libpng\include;..\zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -157,8 +161,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libpng.lib zdll.lib"
 				OutputFile="..\..\Program\$(ProjectName).exe"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\libpng\lib;..\zlib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
 				SubSystem="2"
diff --git a/src/Texture Font Generator/Utils.cpp b/src/Texture Font Generator/Utils.cpp
index 338badef2d..c8199984e0 100644
--- a/src/Texture Font Generator/Utils.cpp	
+++ b/src/Texture Font Generator/Utils.cpp	
@@ -170,7 +170,7 @@ bool SavePNG( FILE *f, char szErrorbuf[1024], const Surface *pSurf )
 
 	if( setjmp(pPng->jmpbuf) )
 	{
-		png_destroy_read_struct( &pPng, &pInfo, png_infopp_NULL );
+		png_destroy_read_struct( &pPng, &pInfo, NULL );
 		return false;
 	}