Rename deps/rzlib to deps/zlib

Makefile.common

@@ -601,25 +601,25 @@ ifdef HAVE_COMPRESSION
 endif
 
 ifeq ($(WANT_MINIZ),1)
-	OBJ += deps/rzlib/adler32.o \
-			 deps/rzlib/compress.o \
-			 deps/rzlib/crc32.o \
-			 deps/rzlib/deflate.o \
-			 deps/rzlib/gzclose.o \
-			 deps/rzlib/gzlib.o \
-			 deps/rzlib/gzread.o \
-			 deps/rzlib/gzwrite.o \
-			 deps/rzlib/inffast.o \
-			 deps/rzlib/inflate.o \
-			 deps/rzlib/inftrees.o \
-			 deps/rzlib/trees.o \
-			 deps/rzlib/uncompr.o \
-			 deps/rzlib/zutil.o \
-			 deps/rzlib/ioapi.o \
-			 deps/rzlib/unzip.o
+	OBJ += deps/zlib/adler32.o \
+			 deps/zlib/compress.o \
+			 deps/zlib/crc32.o \
+			 deps/zlib/deflate.o \
+			 deps/zlib/gzclose.o \
+			 deps/zlib/gzlib.o \
+			 deps/zlib/gzread.o \
+			 deps/zlib/gzwrite.o \
+			 deps/zlib/inffast.o \
+			 deps/zlib/inflate.o \
+			 deps/zlib/inftrees.o \
+			 deps/zlib/trees.o \
+			 deps/zlib/uncompr.o \
+			 deps/zlib/zutil.o \
+			 deps/zlib/ioapi.o \
+			 deps/zlib/unzip.o
 else
 ifeq ($(HAVE_ZLIB),1)
-ZLIB_OBJS = deps/rzlib/unzip.o deps/rzlib/ioapi.o
+ZLIB_OBJS = deps/zlib/unzip.o deps/zlib/ioapi.o
 OBJ += $(ZLIB_OBJS)
 HAVE_ZLIB_DEFLATE = 1
 endif

Makefile.emscripten

@@ -64,7 +64,7 @@ $(TARGET): $(OBJ)
 
 clean:
 	rm -f *.o
-	rm -f deps/rzlib/*.o
+	rm -f deps/zlib/*.o
 	rm -f frontend/*.o
 	rm -f menu/*.o
 	rm -f menu/disp/*.o

Makefile.griffin

@@ -60,7 +60,7 @@ ifeq ($(platform), ngc)
   ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
   EXT_TARGET := $(TARGET_NAME)_ngc.dol
   EXT_INTER_TARGET := $(TARGET_NAME)_ngc.elf
-  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/rzlib
+  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/zlib
   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube -L.
   MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float -DMSB_FIRST
   LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
@@ -93,7 +93,7 @@ else ifeq ($(platform), wii)
   ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
   EXT_TARGET := $(TARGET_NAME)_wii.dol
   EXT_INTER_TARGET := $(TARGET_NAME)_wii.elf
-  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/rzlib
+  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/zlib
   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii -L.
   MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST
   LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size

Makefile.ps3

@@ -34,7 +34,7 @@ EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
 CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib -Ilibretro-common/include
+INCDIRS = -I. -Ips3 -Icommon -Ideps/zlib -Ilibretro-common/include
 
 # system platform
 system_platform = unix

Makefile.psl1ght

@@ -17,7 +17,7 @@ ELF_TARGET := retroarch_psl1ght.elf
 EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
 CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
 
-INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/rzlib -Ips3/gcmgl/include/export -Ips3/include
+INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/zlib -Ips3/gcmgl/include/export -Ips3/include
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
 
 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__

Makefile.psp1

@@ -19,7 +19,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END := -Wl,--no-whole-archive
 endif
 
-INCDIR = deps/rzlib deps/7zip libretro-common/include
+INCDIR = deps/zlib deps/7zip libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)
 

decompress/zip_support.c

@@ -25,7 +25,7 @@
 #include <file/file_path.h>
 #include "zip_support.h"
 
-#include "../deps/rzlib/unzip.h"
+#include "../deps/zlib/unzip.h"
 
 /* Undefined at the end of the file
  * Don't use outside of this file

griffin/griffin.c

@@ -738,26 +738,26 @@ extern "C" {
 DEPENDENCIES
 ============================================================ */
 #ifdef WANT_MINIZ
-#include "../deps/rzlib/adler32.c"
-#include "../deps/rzlib/compress.c"
-#include "../deps/rzlib/crc32.c"
-#include "../deps/rzlib/deflate.c"
-#include "../deps/rzlib/gzclose.c"
-#include "../deps/rzlib/gzlib.c"
-#include "../deps/rzlib/gzread.c"
-#include "../deps/rzlib/gzwrite.c"
-#include "../deps/rzlib/inffast.c"
-#include "../deps/rzlib/inflate.c"
-#include "../deps/rzlib/inftrees.c"
-#include "../deps/rzlib/trees.c"
-#include "../deps/rzlib/uncompr.c"
-#include "../deps/rzlib/zutil.c"
+#include "../deps/zlib/adler32.c"
+#include "../deps/zlib/compress.c"
+#include "../deps/zlib/crc32.c"
+#include "../deps/zlib/deflate.c"
+#include "../deps/zlib/gzclose.c"
+#include "../deps/zlib/gzlib.c"
+#include "../deps/zlib/gzread.c"
+#include "../deps/zlib/gzwrite.c"
+#include "../deps/zlib/inffast.c"
+#include "../deps/zlib/inflate.c"
+#include "../deps/zlib/inftrees.c"
+#include "../deps/zlib/trees.c"
+#include "../deps/zlib/uncompr.c"
+#include "../deps/zlib/zutil.c"
 #endif
 
 /* Decompression support always requires the next two files */
 #if defined(WANT_MINIZ) || defined(HAVE_ZLIB)
-#include "../deps/rzlib/ioapi.c"
-#include "../deps/rzlib/unzip.c"
+#include "../deps/zlib/ioapi.c"
+#include "../deps/zlib/unzip.c"
 #endif
 
 #ifdef HAVE_7ZIP

msvc/RetroArch-360/RetroArch-360.vcxproj

@@ -115,7 +115,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -154,7 +154,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -194,7 +194,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -238,7 +238,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -280,7 +280,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -322,7 +322,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj

@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\rzlib""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib""
 				PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="0"
@@ -71,7 +71,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\rzlib""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -126,7 +126,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\rzlib""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;FASTCAP;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -187,7 +187,7 @@
 				OmitFramePointers="TRUE"
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\rzlib""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -240,7 +240,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\rzlib""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -299,7 +299,7 @@
 				OmitFramePointers="TRUE"
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\rzlib""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -352,7 +352,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\rzlib""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"