diff --git a/Makefile b/Makefile index c8a8fda2d3..ab3f8f1792 100644 --- a/Makefile +++ b/Makefile @@ -479,7 +479,6 @@ endif ifeq ($(HAVE_7ZIP),1) HAVE_COMPRESSION = 1 - DEFINES += -D_7ZIP_ST DEFINES += -DHAVE_7ZIP 7ZOBJ = deps/7zip/7zIn.o \ deps/7zip/7zAlloc.o \ diff --git a/Makefile.griffin b/Makefile.griffin index 5866b96d1f..da5d165582 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -76,6 +76,7 @@ endif HAVE_FILTERS_BUILTIN := 1 HAVE_THREADS := 1 HAVE_ZLIB := 1 + HAVE_7ZIP := 1 HAVE_RPNG := 1 HAVE_OVERLAY := 1 HAVE_BUILTIN_AUTOCONFIG := 1 @@ -108,6 +109,7 @@ endif HAVE_RARCH_EXEC := 1 HAVE_THREADS := 1 HAVE_RSOUND := 1 +HAVE_7ZIP := 1 HAVE_LIBRETRO_MANAGEMENT := 1 HAVE_ZLIB := 1 HAVE_RPNG := 1 @@ -162,6 +164,10 @@ ifeq ($(HAVE_ZLIB), 1) CFLAGS += -DHAVE_ZLIB -DWANT_MINIZ endif +ifeq ($(HAVE_7ZIP), 1) +CFLAGS += -DHAVE_7ZIP +endif + ifeq ($(HAVE_OVERLAY), 1) CFLAGS += -DHAVE_OVERLAY endif diff --git a/Makefile.ps3 b/Makefile.ps3 index f134e87a7e..b57cf75ee4 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -106,7 +106,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe -DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_7Z -D_7Z_ST -DWANT_MINIZ -DSINC_LOWER_QUALITY -DHAVE_CC_RESAMPLER -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG +DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_7Z -DWANT_MINIZ -DSINC_LOWER_QUALITY -DHAVE_CC_RESAMPLER -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/Makefile.win b/Makefile.win index ebffd37a72..c790343d1f 100644 --- a/Makefile.win +++ b/Makefile.win @@ -304,7 +304,6 @@ endif ifeq ($(HAVE_7ZIP),1) CFLAGS += -I./deps/7zip - DEFINES += -D_7ZIP_ST DEFINES += -DHAVE_7ZIP HAVE_COMPRESSION = 1 compression = yes diff --git a/android/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk index c0b665b59b..e195c78392 100644 --- a/android/phoenix/jni/Android.mk +++ b/android/phoenix/jni/Android.mk @@ -55,7 +55,7 @@ else endif LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_FILTERS_BUILTIN -LOCAL_CFLAGS += -DHAVE_7ZIP -D_7ZIP_ST +LOCAL_CFLAGS += -DHAVE_7ZIP LOCAL_CFLAGS += -O2 diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj index bd714bd303..647e2f8995 100644 --- a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj @@ -349,7 +349,6 @@ "-DHAVE_THREADS", "-DHAVE_DYLIB", "-DHAVE_CG", - "-D_7ZIP_ST", "-DHAVE_7ZIP", "-DHAVE_LAKKA", ); @@ -418,7 +417,6 @@ "-DHAVE_THREADS", "-DHAVE_DYLIB", "-DHAVE_CG", - "-D_7ZIP_ST", "-DHAVE_7ZIP", "-DHAVE_LAKKA", ); diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index f0b2aec546..7ad77e0196 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -557,7 +557,6 @@ "-DRARCH_INTERNAL", "-DHAVE_THREADS", "-DHAVE_FILTERS_BUILTIN", - "-D_7ZIP_ST", "-DHAVE_7ZIP", ); "OTHER_CFLAGS[arch=*]" = ( @@ -588,7 +587,6 @@ "-DRARCH_INTERNAL", "-DHAVE_THREADS", "-DHAVE_FILTERS_BUILTIN", - "-D_7ZIP_ST", "-DHAVE_7ZIP", ); PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/deps/7zip/Ppmd7.c b/deps/7zip/Ppmd7.c index d4ad117192..3009cf6cde 100755 --- a/deps/7zip/Ppmd7.c +++ b/deps/7zip/Ppmd7.c @@ -2,8 +2,7 @@ 2010-03-12 : Igor Pavlov : Public domain This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */ -#include - +#include #include "Ppmd7.h" const Byte PPMD7_kExpEscape[16] = { 25, 14, 9, 7, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 2 }; diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index e2148c7fdb..21a1407b83 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -100,7 +100,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;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_COMPRESSION;HAVE_7ZIP;_7ZIP_ST + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;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_COMPRESSION;HAVE_7ZIP $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -142,7 +142,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;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_COMPRESSION;HAVE_7ZIP;_7ZIP_ST + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;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_COMPRESSION;HAVE_7ZIP $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -443,4 +443,4 @@ - \ No newline at end of file +