ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move libpng and zlib dependencies into submodules for the Windows build

This commit is contained in:
qwertymodo 2018-01-05 11:33:03 -08:00
parent aad3f375db
commit ea39685ccd
9 changed files with 118 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored Normal file
View File

@ -0,0 +1,6 @@
[submodule "win32/libpng/src"]
path = win32/libpng/src
url = https://git.code.sf.net/p/libpng/code
[submodule "win32/zlib/src"]
path = win32/zlib/src
url = https://github.com/madler/zlib.git

6
win32/docs/how2compile.txt
View File

@ -13,11 +13,13 @@ NOTE: Unicode support requires a special zlib build - see the end of the zlib en
- zlib (optional, ZLIB define, enabled by default) - the default solution includes a zlib
project that builds appropriately (force includes _tfwopen.h for unicode support in s9x).
(the zlib directory should reside at win32/../../zlib, i.e. 2 directories up)
The zlib directory should reside at win32/zlib/src, or you can download it automatically
with git submodule init && git submodule update.
- libpng (optional, HAVE_LIBPNG define, enabled by default) - the default solution includes
a libpng project that builds appropriately.
(the libpng directory should reside at win32/../../libpng, i.e. 2 directories up)
The libpng directory should reside at win32/libpng/src, or you can download it automatically
with git submodule init && git submodule update.
- To compile Snes9x:
Start up VS2017.

54
win32/libpng/libpng.vcxproj
View File

@ -19,86 +19,86 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\libpng\png.c" />
<ClCompile Include="..\..\..\libpng\pngerror.c">
<ClCompile Include="src\png.c" />
<ClCompile Include="src\pngerror.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngget.c">
<ClCompile Include="src\pngget.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngmem.c">
<ClCompile Include="src\pngmem.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngpread.c">
<ClCompile Include="src\pngpread.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngread.c">
<ClCompile Include="src\pngread.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngrio.c">
<ClCompile Include="src\pngrio.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngrtran.c">
<ClCompile Include="src\pngrtran.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngrutil.c">
<ClCompile Include="src\pngrutil.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngset.c">
<ClCompile Include="src\pngset.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngtrans.c">
<ClCompile Include="src\pngtrans.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwio.c">
<ClCompile Include="src\pngwio.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwrite.c">
<ClCompile Include="src\pngwrite.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwtran.c">
<ClCompile Include="src\pngwtran.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwutil.c">
<ClCompile Include="src\pngwutil.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Use</PrecompiledHeader>
@ -183,7 +183,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;$(ProjectDir)..\zlib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
<CompileAs>Default</CompileAs>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -202,8 +202,8 @@
</AdditionalDependencies>
</Lib>
<PreBuildEvent>
<Command>IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" (
COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h"
<Command>IF NOT EXIST "$(ProjectDir)src\scripts\pnglibconf.h" (
COPY "$(ProjectDir)src\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)src\pnglibconf.h"
)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
@ -213,7 +213,7 @@ COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;$(ProjectDir)..\zlib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
<CompileAs>Default</CompileAs>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -232,8 +232,8 @@ COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)
</AdditionalDependencies>
</Lib>
<PreBuildEvent>
<Command>IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" (
COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h"
<Command>IF NOT EXIST "$(ProjectDir)src\scripts\pnglibconf.h" (
COPY "$(ProjectDir)src\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)src\pnglibconf.h"
)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
@ -245,7 +245,7 @@ COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;$(ProjectDir)..\zlib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
<CompileAs>Default</CompileAs>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -266,8 +266,8 @@ COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)
</AdditionalDependencies>
</Lib>
<PreBuildEvent>
<Command>IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" (
COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h"
<Command>IF NOT EXIST "$(ProjectDir)src\scripts\pnglibconf.h" (
COPY "$(ProjectDir)src\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)src\pnglibconf.h"
)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
@ -279,7 +279,7 @@ COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libpng;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;$(ProjectDir)..\zlib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
<CompileAs>Default</CompileAs>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -300,8 +300,8 @@ COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)
</AdditionalDependencies>
</Lib>
<PreBuildEvent>
<Command>IF NOT EXIST "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h" (
COPY "$(ProjectDir)..\..\..\libpng\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)..\..\..\libpng\pnglibconf.h"
<Command>IF NOT EXIST "$(ProjectDir)src\scripts\pnglibconf.h" (
COPY "$(ProjectDir)src\scripts\pnglibconf.h.prebuilt" "$(ProjectDir)src\pnglibconf.h"
)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>

30
win32/libpng/libpng.vcxproj.filters
View File

@ -15,49 +15,49 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\libpng\png.c">
<ClCompile Include="src\png.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngerror.c">
<ClCompile Include="src\pngerror.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngget.c">
<ClCompile Include="src\pngget.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngmem.c">
<ClCompile Include="src\pngmem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngpread.c">
<ClCompile Include="src\pngpread.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngread.c">
<ClCompile Include="src\pngread.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngrio.c">
<ClCompile Include="src\pngrio.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngrtran.c">
<ClCompile Include="src\pngrtran.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngrutil.c">
<ClCompile Include="src\pngrutil.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngset.c">
<ClCompile Include="src\pngset.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngtrans.c">
<ClCompile Include="src\pngtrans.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwio.c">
<ClCompile Include="src\pngwio.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwrite.c">
<ClCompile Include="src\pngwrite.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwtran.c">
<ClCompile Include="src\pngwtran.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libpng\pngwutil.c">
<ClCompile Include="src\pngwutil.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>

1
win32/libpng/src Submodule

@ -0,0 +1 @@
Subproject commit b78804f9a2568b270ebd30eca954ef7447ba92f7

8
win32/snes9xw.vcxproj
View File

@ -113,7 +113,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<StructMemberAlignment>Default</StructMemberAlignment>
@ -158,7 +158,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<StructMemberAlignment>Default</StructMemberAlignment>
@ -208,7 +208,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -257,7 +257,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)..\..\zLib;$(ProjectDir)..\unzip;$(ProjectDir)..\..\libpng\;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

1
win32/zlib/src Submodule

@ -0,0 +1 @@
Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f

64
win32/zlib/zlib.vcxproj
View File

@ -89,7 +89,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -121,7 +121,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -147,7 +147,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -176,7 +176,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -195,28 +195,28 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\zlib\adler32.c" />
<ClCompile Include="..\..\..\zlib\compress.c" />
<ClCompile Include="..\..\..\zlib\contrib\masmx64\inffas8664.c">
<ClCompile Include="src\adler32.c" />
<ClCompile Include="src\compress.c" />
<ClCompile Include="src\contrib\masmx64\inffas8664.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\zlib\crc32.c" />
<ClCompile Include="..\..\..\zlib\deflate.c" />
<ClCompile Include="..\..\..\zlib\gzclose.c" />
<ClCompile Include="..\..\..\zlib\gzlib.c" />
<ClCompile Include="..\..\..\zlib\gzread.c" />
<ClCompile Include="..\..\..\zlib\gzwrite.c" />
<ClCompile Include="..\..\..\zlib\infback.c" />
<ClCompile Include="..\..\..\zlib\inffast.c" />
<ClCompile Include="..\..\..\zlib\inflate.c" />
<ClCompile Include="..\..\..\zlib\inftrees.c" />
<ClCompile Include="..\..\..\zlib\trees.c" />
<ClCompile Include="..\..\..\zlib\uncompr.c" />
<ClCompile Include="..\..\..\zlib\zutil.c" />
<ClCompile Include="src\crc32.c" />
<ClCompile Include="src\deflate.c" />
<ClCompile Include="src\gzclose.c" />
<ClCompile Include="src\gzlib.c" />
<ClCompile Include="src\gzread.c" />
<ClCompile Include="src\gzwrite.c" />
<ClCompile Include="src\infback.c" />
<ClCompile Include="src\inffast.c" />
<ClCompile Include="src\inflate.c" />
<ClCompile Include="src\inftrees.c" />
<ClCompile Include="src\trees.c" />
<ClCompile Include="src\uncompr.c" />
<ClCompile Include="src\zutil.c" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\zlib\win32\zlib.def">
<CustomBuild Include="src\win32\zlib.def">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>
@ -224,19 +224,19 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\zlib\crc32.h" />
<ClInclude Include="..\..\..\zlib\deflate.h" />
<ClInclude Include="..\..\..\zlib\inffast.h" />
<ClInclude Include="..\..\..\zlib\inffixed.h" />
<ClInclude Include="..\..\..\zlib\inflate.h" />
<ClInclude Include="..\..\..\zlib\inftrees.h" />
<ClInclude Include="..\..\..\zlib\trees.h" />
<ClInclude Include="..\..\..\zlib\zconf.h" />
<ClInclude Include="..\..\..\zlib\zlib.h" />
<ClInclude Include="..\..\..\zlib\zutil.h" />
<ClInclude Include="src\crc32.h" />
<ClInclude Include="src\deflate.h" />
<ClInclude Include="src\inffast.h" />
<ClInclude Include="src\inffixed.h" />
<ClInclude Include="src\inflate.h" />
<ClInclude Include="src\inftrees.h" />
<ClInclude Include="src\trees.h" />
<ClInclude Include="src\zconf.h" />
<ClInclude Include="src\zlib.h" />
<ClInclude Include="src\zutil.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\zlib\win32\zlib1.rc" />
<ResourceCompile Include="src\win32\zlib1.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

56
win32/zlib/zlib.vcxproj.filters
View File

@ -15,94 +15,94 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\zlib\adler32.c">
<ClCompile Include="src\adler32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\compress.c">
<ClCompile Include="src\compress.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\crc32.c">
<ClCompile Include="src\crc32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\deflate.c">
<ClCompile Include="src\deflate.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\gzclose.c">
<ClCompile Include="src\gzclose.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\gzlib.c">
<ClCompile Include="src\gzlib.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\gzread.c">
<ClCompile Include="src\gzread.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\gzwrite.c">
<ClCompile Include="src\gzwrite.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\infback.c">
<ClCompile Include="src\infback.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\contrib\masmx64\inffas8664.c">
<ClCompile Include="src\contrib\masmx64\inffas8664.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\inffast.c">
<ClCompile Include="src\inffast.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\inflate.c">
<ClCompile Include="src\inflate.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\inftrees.c">
<ClCompile Include="src\inftrees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\trees.c">
<ClCompile Include="src\trees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\uncompr.c">
<ClCompile Include="src\uncompr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zlib\zutil.c">
<ClCompile Include="src\zutil.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\zlib\crc32.h">
<ClInclude Include="src\crc32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\deflate.h">
<ClInclude Include="src\deflate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\inffast.h">
<ClInclude Include="src\inffast.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\inffixed.h">
<ClInclude Include="src\inffixed.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\inflate.h">
<ClInclude Include="src\inflate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\inftrees.h">
<ClInclude Include="src\inftrees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\trees.h">
<ClInclude Include="src\trees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\zconf.h">
<ClInclude Include="src\zconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\zlib.h">
<ClInclude Include="src\zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\zlib\zutil.h">
<ClInclude Include="src\zutil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\zlib\win32\zlib1.rc">
<ResourceCompile Include="src\win32\zlib1.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\zlib\win32\zlib.def">
<CustomBuild Include="src\win32\zlib.def">
<Filter>Source Files</Filter>
</CustomBuild>
</ItemGroup>