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

Attempted Windows fixes for libpng.

Browse Source 
I was NOT on Windows while doing this.
Any mistakes here, blame on me.
This commit is contained in:
Jason Felds
2011-05-08 17:35:36 -04:00
parent 008ac8a1cf
commit c5156ccaa7
3 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/StepMania-net2003.vcproj
+27 -3
View File
@@ -25,7 +25,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHa" AdditionalOptions="/EHa"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="FALSE" ExceptionHandling="FALSE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -110,7 +110,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OptimizeForProcessor="2" OptimizeForProcessor="2"
OptimizeForWindowsApplication="TRUE" OptimizeForWindowsApplication="TRUE"
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="TRUE" StringPooling="TRUE"
MinimalRebuild="FALSE" MinimalRebuild="FALSE"
@@ -192,7 +192,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHa" AdditionalOptions="/EHa"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="FALSE" ExceptionHandling="FALSE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@@ -2162,6 +2162,30 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
<File <File
RelativePath="glext.h"> RelativePath="glext.h">
</File> </File>
<Filter Name="libpng" Filter="">
<File RelativePath="..\extern\libpng\include\png.c"></File>
<File RelativePath="..\extern\libpng\include\png.h"></File>
<File RelativePath="..\extern\libpng\include\pngconf.h"></File>
<File RelativePath="..\extern\libpng\include\pngdebug.h"></File>
<File RelativePath="..\extern\libpng\include\pngerror.c"></File>
<File RelativePath="..\extern\libpng\include\pngget.c"></File>
<File RelativePath="..\extern\libpng\include\pnginfo.h"></File>
<File RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"></File>
<File RelativePath="..\extern\libpng\include\pngmem.c"></File>
<File RelativePath="..\extern\libpng\include\pngpread.c"></File>
<File RelativePath="..\extern\libpng\include\pngpriv.h"></File>
<File RelativePath="..\extern\libpng\include\pngread.c"></File>
<File RelativePath="..\extern\libpng\include\pngrio.c"></File>
<File RelativePath="..\extern\libpng\include\pngrtran.c"></File>
<File RelativePath="..\extern\libpng\include\pngrutil.c"></File>
<File RelativePath="..\extern\libpng\include\pngset.c"></File>
<File RelativePath="..\extern\libpng\include\pngstruct.h"></File>
<File RelativePath="..\extern\libpng\include\pngtrans.c"></File>
<File RelativePath="..\extern\libpng\include\pngwio.c"></File>
<File RelativePath="..\extern\libpng\include\pngwrite.c"></File>
<File RelativePath="..\extern\libpng\include\pngwtran.c"></File>
<File RelativePath="..\extern\libpng\include\pngwutil.c"></File>
</Filter>
<Filter <Filter
Name="pcre" Name="pcre"
Filter=""> Filter="">
src/StepMania-net2005.vcproj
+27 -3
View File
@@ -49,7 +49,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -157,7 +157,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
@@ -263,7 +263,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@@ -3580,6 +3580,30 @@
RelativePath="glext.h" RelativePath="glext.h"
> >
</File> </File>
<Filter Name="libpng">
<File RelativePath="..\extern\libpng\include\png.c"></File>
<File RelativePath="..\extern\libpng\include\png.h"></File>
<File RelativePath="..\extern\libpng\include\pngconf.h"></File>
<File RelativePath="..\extern\libpng\include\pngdebug.h"></File>
<File RelativePath="..\extern\libpng\include\pngerror.c"></File>
<File RelativePath="..\extern\libpng\include\pngget.c"></File>
<File RelativePath="..\extern\libpng\include\pnginfo.h"></File>
<File RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"></File>
<File RelativePath="..\extern\libpng\include\pngmem.c"></File>
<File RelativePath="..\extern\libpng\include\pngpread.c"></File>
<File RelativePath="..\extern\libpng\include\pngpriv.h"></File>
<File RelativePath="..\extern\libpng\include\pngread.c"></File>
<File RelativePath="..\extern\libpng\include\pngrio.c"></File>
<File RelativePath="..\extern\libpng\include\pngrtran.c"></File>
<File RelativePath="..\extern\libpng\include\pngrutil.c"></File>
<File RelativePath="..\extern\libpng\include\pngset.c"></File>
<File RelativePath="..\extern\libpng\include\pngstruct.h"></File>
<File RelativePath="..\extern\libpng\include\pngtrans.c"></File>
<File RelativePath="..\extern\libpng\include\pngwio.c"></File>
<File RelativePath="..\extern\libpng\include\pngwrite.c"></File>
<File RelativePath="..\extern\libpng\include\pngwtran.c"></File>
<File RelativePath="..\extern\libpng\include\pngwutil.c"></File>
</Filter>
<Filter <Filter
Name="pcre" Name="pcre"
> >
src/StepMania-net2008.vcproj
+28 -4
View File
@@ -50,7 +50,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -158,7 +158,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
@@ -263,7 +263,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@@ -371,7 +371,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
@@ -6564,6 +6564,30 @@
RelativePath="glext.h" RelativePath="glext.h"
> >
</File> </File>
<Filter Name="libpng">
<File RelativePath="..\extern\libpng\include\png.c"></File>
<File RelativePath="..\extern\libpng\include\png.h"></File>
<File RelativePath="..\extern\libpng\include\pngconf.h"></File>
<File RelativePath="..\extern\libpng\include\pngdebug.h"></File>
<File RelativePath="..\extern\libpng\include\pngerror.c"></File>
<File RelativePath="..\extern\libpng\include\pngget.c"></File>
<File RelativePath="..\extern\libpng\include\pnginfo.h"></File>
<File RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"></File>
<File RelativePath="..\extern\libpng\include\pngmem.c"></File>
<File RelativePath="..\extern\libpng\include\pngpread.c"></File>
<File RelativePath="..\extern\libpng\include\pngpriv.h"></File>
<File RelativePath="..\extern\libpng\include\pngread.c"></File>
<File RelativePath="..\extern\libpng\include\pngrio.c"></File>
<File RelativePath="..\extern\libpng\include\pngrtran.c"></File>
<File RelativePath="..\extern\libpng\include\pngrutil.c"></File>
<File RelativePath="..\extern\libpng\include\pngset.c"></File>
<File RelativePath="..\extern\libpng\include\pngstruct.h"></File>
<File RelativePath="..\extern\libpng\include\pngtrans.c"></File>
<File RelativePath="..\extern\libpng\include\pngwio.c"></File>
<File RelativePath="..\extern\libpng\include\pngwrite.c"></File>
<File RelativePath="..\extern\libpng\include\pngwtran.c"></File>
<File RelativePath="..\extern\libpng\include\pngwutil.c"></File>
</Filter>
<Filter <Filter
Name="pcre" Name="pcre"
> >