CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-04 10:36:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

upstream merge

Browse Source
This commit is contained in:
Brad Parker 2016-09-18 12:52:20 -04:00
commit 25105ed565
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -971,6 +971,8 @@ endif
# Compression/Archive
OBJ += libretro-common/file/archive_file.o
ifeq ($(HAVE_7ZIP),1)
CFLAGS += -I./deps/7zip
HAVE_COMPRESSION = 1
@ -1144,6 +1146,7 @@ ifeq ($(HAVE_FFMPEG), 1)
DEFINES += -Wno-deprecated-declarations -DHAVE_FFMPEG -Iffmpeg
endif
ifeq ($(HAVE_COMPRESSION), 1)
DEFINES += -DHAVE_COMPRESSION
OBJ += libretro-common/file/archive_file.o \

2
libretro-common/file/archive_file_7z.c
View File

@ -273,7 +273,7 @@ static int sevenzip_parse_file_init(file_archive_transfer_t *state,
if (memcmp(state->data, SEVENZIP_MAGIC, SEVENZIP_MAGIC_LEN) != 0)
return -1;
sevenzip_context = sevenzip_stream_new();
sevenzip_context = (struct sevenzip_context_t*)sevenzip_stream_new();
/* could not open 7zip archive? */
if (InFile_Open(&sevenzip_context->archiveStream.file, file))