mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made HAVE_COMPRESSION be defined both for zip and 7z support, added zip_support.c to make

Browse Source
This commit is contained in:
Timo Strunk 2014-09-09 15:37:45 +02:00
parent 4796ace114
commit 70523511d4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -413,7 +413,8 @@ endif
ifeq ($(HAVE_ZLIB), 1) ifeq ($(HAVE_ZLIB), 1)
OBJ += gfx/rpng/rpng.o file_extract.o HAVE_COMPRESSION = 1
OBJ += gfx/rpng/rpng.o file_extract.o decompress/zip_support.o
LIBS += $(ZLIB_LIBS) LIBS += $(ZLIB_LIBS)
DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE
endif endif
@ -464,9 +465,9 @@ ifeq ($(HAVE_NEON),1)
endif endif
ifeq ($(HAVE_7ZIP),1) ifeq ($(HAVE_7ZIP),1)
HAVE_COMPRESSION = 1
DEFINES += -D_7ZIP_ST DEFINES += -D_7ZIP_ST
DEFINES += -DHAVE_7ZIP DEFINES += -DHAVE_7ZIP
DEFINES += -DHAVE_COMPRESSION
7ZOBJ = deps/7zip/7zIn.o \ 7ZOBJ = deps/7zip/7zIn.o \
deps/7zip/7zAlloc.o \ deps/7zip/7zAlloc.o \
deps/7zip/Bra86.o \ deps/7zip/Bra86.o \
@ -490,6 +491,10 @@ ifeq ($(HAVE_7ZIP),1)
JOYCONFIG_OBJ += $(7ZOBJ) JOYCONFIG_OBJ += $(7ZOBJ)
endif endif
ifdef HAVE_COMPRESSION
DEFINES += -DHAVE_COMPRESSION
endif
ifeq ($(HAVE_PRESERVE_DYLIB),1) ifeq ($(HAVE_PRESERVE_DYLIB),1)
DEFINES += -DNO_DLCLOSE DEFINES += -DNO_DLCLOSE
endif endif