Updated Windows build environment to use built-in zlib support. That means you no longer have to track down and install the zlibwapi files! The only external requirement for Stella is now SDL.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1927 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

src/win32/Create_Builds.bat

@@ -88,14 +88,12 @@ if %BUILD_32% == 1 (
 	echo Copying 32-bit files ...
 	copy %RELEASE_32%\Stella.exe   %STELLA_DIR%\32-bit
 	copy %RELEASE_32%\SDL.dll      %STELLA_DIR%\32-bit
-	copy %RELEASE_32%\zlibwapi.dll %STELLA_DIR%\32-bit
 )
 
 if %BUILD_64% == 1 (
 	echo Copying 64-bit files ...
 	copy %RELEASE_64%\Stella.exe   %STELLA_DIR%\64-bit
 	copy %RELEASE_64%\SDL.dll      %STELLA_DIR%\64-bit
-	copy %RELEASE_64%\zlibwapi.dll %STELLA_DIR%\64-bit
 )
 
 echo Copying DOC files ...

src/win32/Stella.vcproj

@@ -46,8 +46,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
+				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat;..\zlib"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;ZLIB_WINAPI;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="0"
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="SDL.lib&#x0D;&#x0A;SDLmain.lib&#x0D;&#x0A;"
-				AdditionalDependencies="sdl.lib sdlmain.lib zlibwapi.lib"
+				AdditionalDependencies="sdl.lib sdlmain.lib"
 				OutputFile="$(OutDir)/Stella.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -127,8 +127,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
+				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat;..\zlib"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;ZLIB_WINAPI;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="0"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="SDL.lib&#x0D;&#x0A;SDLmain.lib&#x0D;&#x0A;"
-				AdditionalDependencies="sdl.lib sdlmain.lib zlibwapi.lib"
+				AdditionalDependencies="sdl.lib sdlmain.lib"
 				OutputFile="$(OutDir)/Stella.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -209,8 +209,8 @@
 				AdditionalOptions="/MP"
 				OmitFramePointers="true"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
+				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;ZLIB_WINAPI;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
@@ -230,7 +230,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="SDL.lib&#x0D;&#x0A;SDLmain.lib&#x0D;&#x0A;"
-				AdditionalDependencies="sdl.lib sdlmain.lib zlibwapi.lib"
+				AdditionalDependencies="sdl.lib sdlmain.lib"
 				OutputFile="$(OutDir)/Stella.exe"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -292,8 +292,8 @@
 				Optimization="4"
 				InlineFunctionExpansion="0"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
+				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;ZLIB_WINAPI;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
@@ -313,7 +313,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="SDL.lib&#x0D;&#x0A;SDLmain.lib&#x0D;&#x0A;"
-				AdditionalDependencies="sdl.lib sdlmain.lib zlibwapi.lib"
+				AdditionalDependencies="sdl.lib sdlmain.lib"
 				OutputFile="$(OutDir)/Stella.exe"
 				GenerateDebugInformation="false"
 				SubSystem="2"
@@ -946,6 +946,58 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<File
+					RelativePath="..\zlib\adler32.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\compress.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\crc32.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\deflate.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\gzio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\infback.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\inffast.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\inflate.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\inftrees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\trees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\uncompr.c"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\zutil.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1620,6 +1672,50 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<File
+					RelativePath="..\zlib\crc32.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\deflate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\inffast.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\inffixed.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\inflate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\inftrees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\zconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\zlib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\zlib\zutil.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"

src/win32/stella.iss

@@ -27,7 +27,6 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "{#STELLA_PATH}\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#STELLA_PATH}\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#STELLA_PATH}\zlibwapi.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#STELLA_DOCPATH}\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files