From 3c49e1a94d0210414f9bb2965a4a81bf6b4d0155 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sat, 28 May 2011 18:05:00 -0400
Subject: [PATCH] Trying to restore Texture Font Generator.

---
 .../Texture Font Generator-net2008.vcproj                 | 8 ++++----
 src/Texture Font Generator/Utils.cpp                      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Texture Font Generator/Texture Font Generator-net2008.vcproj b/src/Texture Font Generator/Texture Font Generator-net2008.vcproj
index dee8b0dace..d02befc9fe 100644
--- a/src/Texture Font Generator/Texture Font Generator-net2008.vcproj	
+++ b/src/Texture Font Generator/Texture Font Generator-net2008.vcproj	
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\libpng\include;..\zlib"
+				AdditionalIncludeDirectories="..\..\extern\libpng\include;..\..\extern\zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib;zdll.lib"
+				AdditionalDependencies="..\..\extern\libpng\lib\libpng.lib;..\..\extern\zlib\zdll.lib"
 				OutputFile="..\..\Program\$(ProjectName)-debug.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\libpng\lib;..\zlib"
@@ -135,7 +135,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\libpng\include;..\zlib"
+				AdditionalIncludeDirectories="..\..\extern\libpng\include;..\..\extern\zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -161,7 +161,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib zdll.lib"
+				AdditionalDependencies="..\..\extern\libpng\lib\libpng.lib;..\..\extern\zlib\zdll.lib"
 				OutputFile="..\..\Program\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\libpng\lib;..\zlib"
diff --git a/src/Texture Font Generator/Utils.cpp b/src/Texture Font Generator/Utils.cpp
index c8199984e0..d208f65abe 100644
--- a/src/Texture Font Generator/Utils.cpp	
+++ b/src/Texture Font Generator/Utils.cpp	
@@ -101,9 +101,9 @@ void GetBounds( const Surface *pSurf, RECT *out )
 
 
 #pragma include_alias( "zlib/zlib.h", "../zlib/zlib.h" )
-#include "../libpng/include/png.h"
+#include "../../extern/libpng/include/png.h"
 #if defined(_MSC_VER)
-#  pragma comment(lib, "../libpng/lib/libpng.lib")
+#  pragma comment(lib, "../../extern/libpng/lib/libpng.lib")
 #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
 #endif