From 93738fae9fc0557033726b948d5e1ba4ee8c587f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 18 Sep 2016 18:34:59 +0200 Subject: [PATCH 1/2] CXX_BUILD fix --- libretro-common/file/archive_file_7z.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-common/file/archive_file_7z.c b/libretro-common/file/archive_file_7z.c index a221b867b1..4e75897149 100644 --- a/libretro-common/file/archive_file_7z.c +++ b/libretro-common/file/archive_file_7z.c @@ -272,7 +272,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)) From 64d1ff2439ac6964f46c791fd2943f1bfd3e2f8e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 18 Sep 2016 18:44:46 +0200 Subject: [PATCH 2/2] Always compile in archive_file right now --- Makefile.common | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index f7092bf8f6..7643458a11 100644 --- a/Makefile.common +++ b/Makefile.common @@ -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,10 +1146,10 @@ 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 \ - tasks/task_decompress.o + OBJ += tasks/task_decompress.o endif #ifeq ($(HAVE_DIRECTX), 1)