actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Trying to restore Texture Font Generator.

Browse Source
This commit is contained in:
Jason Felds
2011-05-28 18:05:00 -04:00
parent bf6cac9e71
commit 3c49e1a94d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Texture Font Generator/Texture Font Generator-net2008.vcproj
+4 -4
View File
@@ -46,7 +46,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\libpng\include;..\zlib" AdditionalIncludeDirectories="..\..\extern\libpng\include;..\..\extern\zlib"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libpng.lib;zdll.lib" AdditionalDependencies="..\..\extern\libpng\lib\libpng.lib;..\..\extern\zlib\zdll.lib"
OutputFile="..\..\Program\$(ProjectName)-debug.exe" OutputFile="..\..\Program\$(ProjectName)-debug.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\libpng\lib;..\zlib" AdditionalLibraryDirectories="..\libpng\lib;..\zlib"
@@ -135,7 +135,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\libpng\include;..\zlib" AdditionalIncludeDirectories="..\..\extern\libpng\include;..\..\extern\zlib"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
@@ -161,7 +161,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libpng.lib zdll.lib" AdditionalDependencies="..\..\extern\libpng\lib\libpng.lib;..\..\extern\zlib\zdll.lib"
OutputFile="..\..\Program\$(ProjectName).exe" OutputFile="..\..\Program\$(ProjectName).exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\libpng\lib;..\zlib" AdditionalLibraryDirectories="..\libpng\lib;..\zlib"
src/Texture Font Generator/Utils.cpp
+2 -2
View File
@@ -101,9 +101,9 @@ void GetBounds( const Surface *pSurf, RECT *out )
#pragma include_alias( "zlib/zlib.h", "../zlib/zlib.h" ) #pragma include_alias( "zlib/zlib.h", "../zlib/zlib.h" )
#include "../libpng/include/png.h" #include "../../extern/libpng/include/png.h"
#if defined(_MSC_VER) #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 */ #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
#endif #endif