From aece30f6bc2cec109ca6c5c91604ac548a2e30e5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 6 Mar 2015 01:47:09 +0100 Subject: [PATCH] Rename deps/rzlib to deps/zlib --- Makefile.common | 34 ++++++++++----------- Makefile.emscripten | 2 +- Makefile.griffin | 4 +-- Makefile.ps3 | 2 +- Makefile.psl1ght | 2 +- Makefile.psp1 | 2 +- decompress/zip_support.c | 2 +- deps/{rzlib => zlib}/adler32.c | 0 deps/{rzlib => zlib}/compress.c | 0 deps/{rzlib => zlib}/crc32.c | 0 deps/{rzlib => zlib}/deflate.c | 0 deps/{rzlib => zlib}/deflate.h | 0 deps/{rzlib => zlib}/gzclose.c | 0 deps/{rzlib => zlib}/gzguts.h | 0 deps/{rzlib => zlib}/gzlib.c | 0 deps/{rzlib => zlib}/gzread.c | 0 deps/{rzlib => zlib}/gzwrite.c | 0 deps/{rzlib => zlib}/infback.c | 0 deps/{rzlib => zlib}/inffast.c | 0 deps/{rzlib => zlib}/inffast.h | 0 deps/{rzlib => zlib}/inffixed.h | 0 deps/{rzlib => zlib}/inflate.c | 0 deps/{rzlib => zlib}/inflate.h | 0 deps/{rzlib => zlib}/inftrees.c | 0 deps/{rzlib => zlib}/inftrees.h | 0 deps/{rzlib => zlib}/ioapi.c | 0 deps/{rzlib => zlib}/ioapi.h | 0 deps/{rzlib => zlib}/trees.c | 0 deps/{rzlib => zlib}/trees.h | 0 deps/{rzlib => zlib}/uncompr.c | 0 deps/{rzlib => zlib}/unzip.c | 0 deps/{rzlib => zlib}/unzip.h | 0 deps/{rzlib => zlib}/zconf.h | 0 deps/{rzlib => zlib}/zconf.h.in | 0 deps/{rzlib => zlib}/zlib.h | 0 deps/{rzlib => zlib}/zutil.c | 0 deps/{rzlib => zlib}/zutil.h | 0 griffin/griffin.c | 32 +++++++++---------- msvc/RetroArch-360/RetroArch-360.vcxproj | 12 ++++---- msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj | 14 ++++----- msvc/msvc-2010/RetroArch-msvc2010.vcxproj | 8 ++--- 41 files changed, 57 insertions(+), 57 deletions(-) rename deps/{rzlib => zlib}/adler32.c (100%) rename deps/{rzlib => zlib}/compress.c (100%) rename deps/{rzlib => zlib}/crc32.c (100%) rename deps/{rzlib => zlib}/deflate.c (100%) rename deps/{rzlib => zlib}/deflate.h (100%) rename deps/{rzlib => zlib}/gzclose.c (100%) rename deps/{rzlib => zlib}/gzguts.h (100%) rename deps/{rzlib => zlib}/gzlib.c (100%) rename deps/{rzlib => zlib}/gzread.c (100%) rename deps/{rzlib => zlib}/gzwrite.c (100%) rename deps/{rzlib => zlib}/infback.c (100%) rename deps/{rzlib => zlib}/inffast.c (100%) rename deps/{rzlib => zlib}/inffast.h (100%) rename deps/{rzlib => zlib}/inffixed.h (100%) rename deps/{rzlib => zlib}/inflate.c (100%) rename deps/{rzlib => zlib}/inflate.h (100%) rename deps/{rzlib => zlib}/inftrees.c (100%) rename deps/{rzlib => zlib}/inftrees.h (100%) rename deps/{rzlib => zlib}/ioapi.c (100%) rename deps/{rzlib => zlib}/ioapi.h (100%) rename deps/{rzlib => zlib}/trees.c (100%) rename deps/{rzlib => zlib}/trees.h (100%) rename deps/{rzlib => zlib}/uncompr.c (100%) rename deps/{rzlib => zlib}/unzip.c (100%) rename deps/{rzlib => zlib}/unzip.h (100%) rename deps/{rzlib => zlib}/zconf.h (100%) rename deps/{rzlib => zlib}/zconf.h.in (100%) rename deps/{rzlib => zlib}/zlib.h (100%) rename deps/{rzlib => zlib}/zutil.c (100%) rename deps/{rzlib => zlib}/zutil.h (100%) diff --git a/Makefile.common b/Makefile.common index f5e4dca56ea..72670554453 100644 --- a/Makefile.common +++ b/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 diff --git a/Makefile.emscripten b/Makefile.emscripten index 67638611e6d..a45822eb541 100644 --- a/Makefile.emscripten +++ b/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 diff --git a/Makefile.griffin b/Makefile.griffin index 792bd15eb00..d85858e3d0b 100644 --- a/Makefile.griffin +++ b/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 diff --git a/Makefile.ps3 b/Makefile.ps3 index fa0df13cf6b..74c96bac306 100644 --- a/Makefile.ps3 +++ b/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 diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 6ce8154ed67..682ddb1bd42 100644 --- a/Makefile.psl1ght +++ b/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__ diff --git a/Makefile.psp1 b/Makefile.psp1 index df1d86e3f3a..7518fabcc42 100644 --- a/Makefile.psp1 +++ b/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) diff --git a/decompress/zip_support.c b/decompress/zip_support.c index 532f3e32661..6b61b928227 100644 --- a/decompress/zip_support.c +++ b/decompress/zip_support.c @@ -25,7 +25,7 @@ #include #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 diff --git a/deps/rzlib/adler32.c b/deps/zlib/adler32.c similarity index 100% rename from deps/rzlib/adler32.c rename to deps/zlib/adler32.c diff --git a/deps/rzlib/compress.c b/deps/zlib/compress.c similarity index 100% rename from deps/rzlib/compress.c rename to deps/zlib/compress.c diff --git a/deps/rzlib/crc32.c b/deps/zlib/crc32.c similarity index 100% rename from deps/rzlib/crc32.c rename to deps/zlib/crc32.c diff --git a/deps/rzlib/deflate.c b/deps/zlib/deflate.c similarity index 100% rename from deps/rzlib/deflate.c rename to deps/zlib/deflate.c diff --git a/deps/rzlib/deflate.h b/deps/zlib/deflate.h similarity index 100% rename from deps/rzlib/deflate.h rename to deps/zlib/deflate.h diff --git a/deps/rzlib/gzclose.c b/deps/zlib/gzclose.c similarity index 100% rename from deps/rzlib/gzclose.c rename to deps/zlib/gzclose.c diff --git a/deps/rzlib/gzguts.h b/deps/zlib/gzguts.h similarity index 100% rename from deps/rzlib/gzguts.h rename to deps/zlib/gzguts.h diff --git a/deps/rzlib/gzlib.c b/deps/zlib/gzlib.c similarity index 100% rename from deps/rzlib/gzlib.c rename to deps/zlib/gzlib.c diff --git a/deps/rzlib/gzread.c b/deps/zlib/gzread.c similarity index 100% rename from deps/rzlib/gzread.c rename to deps/zlib/gzread.c diff --git a/deps/rzlib/gzwrite.c b/deps/zlib/gzwrite.c similarity index 100% rename from deps/rzlib/gzwrite.c rename to deps/zlib/gzwrite.c diff --git a/deps/rzlib/infback.c b/deps/zlib/infback.c similarity index 100% rename from deps/rzlib/infback.c rename to deps/zlib/infback.c diff --git a/deps/rzlib/inffast.c b/deps/zlib/inffast.c similarity index 100% rename from deps/rzlib/inffast.c rename to deps/zlib/inffast.c diff --git a/deps/rzlib/inffast.h b/deps/zlib/inffast.h similarity index 100% rename from deps/rzlib/inffast.h rename to deps/zlib/inffast.h diff --git a/deps/rzlib/inffixed.h b/deps/zlib/inffixed.h similarity index 100% rename from deps/rzlib/inffixed.h rename to deps/zlib/inffixed.h diff --git a/deps/rzlib/inflate.c b/deps/zlib/inflate.c similarity index 100% rename from deps/rzlib/inflate.c rename to deps/zlib/inflate.c diff --git a/deps/rzlib/inflate.h b/deps/zlib/inflate.h similarity index 100% rename from deps/rzlib/inflate.h rename to deps/zlib/inflate.h diff --git a/deps/rzlib/inftrees.c b/deps/zlib/inftrees.c similarity index 100% rename from deps/rzlib/inftrees.c rename to deps/zlib/inftrees.c diff --git a/deps/rzlib/inftrees.h b/deps/zlib/inftrees.h similarity index 100% rename from deps/rzlib/inftrees.h rename to deps/zlib/inftrees.h diff --git a/deps/rzlib/ioapi.c b/deps/zlib/ioapi.c similarity index 100% rename from deps/rzlib/ioapi.c rename to deps/zlib/ioapi.c diff --git a/deps/rzlib/ioapi.h b/deps/zlib/ioapi.h similarity index 100% rename from deps/rzlib/ioapi.h rename to deps/zlib/ioapi.h diff --git a/deps/rzlib/trees.c b/deps/zlib/trees.c similarity index 100% rename from deps/rzlib/trees.c rename to deps/zlib/trees.c diff --git a/deps/rzlib/trees.h b/deps/zlib/trees.h similarity index 100% rename from deps/rzlib/trees.h rename to deps/zlib/trees.h diff --git a/deps/rzlib/uncompr.c b/deps/zlib/uncompr.c similarity index 100% rename from deps/rzlib/uncompr.c rename to deps/zlib/uncompr.c diff --git a/deps/rzlib/unzip.c b/deps/zlib/unzip.c similarity index 100% rename from deps/rzlib/unzip.c rename to deps/zlib/unzip.c diff --git a/deps/rzlib/unzip.h b/deps/zlib/unzip.h similarity index 100% rename from deps/rzlib/unzip.h rename to deps/zlib/unzip.h diff --git a/deps/rzlib/zconf.h b/deps/zlib/zconf.h similarity index 100% rename from deps/rzlib/zconf.h rename to deps/zlib/zconf.h diff --git a/deps/rzlib/zconf.h.in b/deps/zlib/zconf.h.in similarity index 100% rename from deps/rzlib/zconf.h.in rename to deps/zlib/zconf.h.in diff --git a/deps/rzlib/zlib.h b/deps/zlib/zlib.h similarity index 100% rename from deps/rzlib/zlib.h rename to deps/zlib/zlib.h diff --git a/deps/rzlib/zutil.c b/deps/zlib/zutil.c similarity index 100% rename from deps/rzlib/zutil.c rename to deps/zlib/zutil.c diff --git a/deps/rzlib/zutil.h b/deps/zlib/zutil.h similarity index 100% rename from deps/rzlib/zutil.h rename to deps/zlib/zutil.h diff --git a/griffin/griffin.c b/griffin/griffin.c index 4c096c94620..a4e576064ef 100644 --- a/griffin/griffin.c +++ b/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 diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj index 0ce9b6904d4..deb03934602 100644 --- a/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -115,7 +115,7 @@ MultiThreadedDebug _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 Callcap - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -154,7 +154,7 @@ MultiThreadedDebug _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 Callcap - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -194,7 +194,7 @@ MultiThreaded 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 Callcap - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -238,7 +238,7 @@ false MultiThreaded 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 - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -280,7 +280,7 @@ false MultiThreaded 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 - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -322,7 +322,7 @@ false MultiThreaded 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 - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index bb50183e285..1f1ec8c4455 100644 --- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/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" diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index dd3a070d46c..1ffe897f4d1 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -101,7 +101,7 @@ Level3 Disabled WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp Fast @@ -121,7 +121,7 @@ Level3 Disabled WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp Fast @@ -143,7 +143,7 @@ true true WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp Fast @@ -168,7 +168,7 @@ true true WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_ZLIB;WANT_MINIZ;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp Fast