From 09d240330f6ae7a2f7b3291ebe048adedbb76bda Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 2 Sep 2014 21:45:14 +0200 Subject: [PATCH] Move 7zip to deps/ --- Makefile | 34 ++++++++++++------------ Makefile.win | 36 +++++++++++++------------- decompress/7zip_support.c | 10 +++---- {decompress => deps}/7zip/7z.h | 0 {decompress => deps}/7zip/7zAlloc.c | 0 {decompress => deps}/7zip/7zAlloc.h | 0 {decompress => deps}/7zip/7zBuf.c | 0 {decompress => deps}/7zip/7zBuf.h | 0 {decompress => deps}/7zip/7zBuf2.c | 0 {decompress => deps}/7zip/7zCrc.c | 0 {decompress => deps}/7zip/7zCrc.h | 0 {decompress => deps}/7zip/7zCrcOpt.c | 0 {decompress => deps}/7zip/7zDec.c | 0 {decompress => deps}/7zip/7zFile.c | 0 {decompress => deps}/7zip/7zFile.h | 0 {decompress => deps}/7zip/7zIn.c | 0 {decompress => deps}/7zip/7zStream.c | 0 {decompress => deps}/7zip/7zVersion.h | 0 {decompress => deps}/7zip/Bcj2.c | 0 {decompress => deps}/7zip/Bcj2.h | 0 {decompress => deps}/7zip/Bra.c | 0 {decompress => deps}/7zip/Bra.h | 0 {decompress => deps}/7zip/Bra86.c | 0 {decompress => deps}/7zip/CpuArch.c | 0 {decompress => deps}/7zip/CpuArch.h | 0 {decompress => deps}/7zip/Lzma2Dec.c | 0 {decompress => deps}/7zip/Lzma2Dec.h | 0 {decompress => deps}/7zip/LzmaDec.c | 0 {decompress => deps}/7zip/LzmaDec.h | 0 {decompress => deps}/7zip/Ppmd.h | 0 {decompress => deps}/7zip/Ppmd7.c | 0 {decompress => deps}/7zip/Ppmd7.h | 0 {decompress => deps}/7zip/Ppmd7Dec.c | 0 {decompress => deps}/7zip/RotateDefs.h | 0 {decompress => deps}/7zip/Types.h | 0 griffin/griffin.c | 34 ++++++++++++------------ 36 files changed, 57 insertions(+), 57 deletions(-) rename {decompress => deps}/7zip/7z.h (100%) rename {decompress => deps}/7zip/7zAlloc.c (100%) rename {decompress => deps}/7zip/7zAlloc.h (100%) rename {decompress => deps}/7zip/7zBuf.c (100%) rename {decompress => deps}/7zip/7zBuf.h (100%) rename {decompress => deps}/7zip/7zBuf2.c (100%) rename {decompress => deps}/7zip/7zCrc.c (100%) rename {decompress => deps}/7zip/7zCrc.h (100%) rename {decompress => deps}/7zip/7zCrcOpt.c (100%) rename {decompress => deps}/7zip/7zDec.c (100%) rename {decompress => deps}/7zip/7zFile.c (100%) rename {decompress => deps}/7zip/7zFile.h (100%) rename {decompress => deps}/7zip/7zIn.c (100%) rename {decompress => deps}/7zip/7zStream.c (100%) rename {decompress => deps}/7zip/7zVersion.h (100%) rename {decompress => deps}/7zip/Bcj2.c (100%) rename {decompress => deps}/7zip/Bcj2.h (100%) rename {decompress => deps}/7zip/Bra.c (100%) rename {decompress => deps}/7zip/Bra.h (100%) rename {decompress => deps}/7zip/Bra86.c (100%) rename {decompress => deps}/7zip/CpuArch.c (100%) rename {decompress => deps}/7zip/CpuArch.h (100%) rename {decompress => deps}/7zip/Lzma2Dec.c (100%) rename {decompress => deps}/7zip/Lzma2Dec.h (100%) rename {decompress => deps}/7zip/LzmaDec.c (100%) rename {decompress => deps}/7zip/LzmaDec.h (100%) rename {decompress => deps}/7zip/Ppmd.h (100%) rename {decompress => deps}/7zip/Ppmd7.c (100%) rename {decompress => deps}/7zip/Ppmd7.h (100%) rename {decompress => deps}/7zip/Ppmd7Dec.c (100%) rename {decompress => deps}/7zip/RotateDefs.h (100%) rename {decompress => deps}/7zip/Types.h (100%) diff --git a/Makefile b/Makefile index 0985abec18..80cf918e56 100644 --- a/Makefile +++ b/Makefile @@ -467,23 +467,23 @@ ifeq ($(HAVE_7ZIP),1) DEFINES += -D_7ZIP_ST DEFINES += -DHAVE_7ZIP DEFINES += -DHAVE_COMPRESSION - 7ZOBJ = decompress/7zip/7zIn.o \ - decompress/7zip/7zAlloc.o \ - decompress/7zip/Bra86.o \ - decompress/7zip/CpuArch.o \ - decompress/7zip/7zFile.o \ - decompress/7zip/7zStream.o \ - decompress/7zip/7zBuf2.o \ - decompress/7zip/Ppmd7.o \ - decompress/7zip/LzmaDec.o \ - decompress/7zip/7zCrcOpt.o \ - decompress/7zip/Bra.o \ - decompress/7zip/7zDec.o \ - decompress/7zip/Bcj2.o \ - decompress/7zip/7zCrc.o \ - decompress/7zip/Lzma2Dec.o \ - decompress/7zip/7zBuf.o \ - decompress/7zip/Ppmd7Dec.o \ + 7ZOBJ = deps/7zip/7zIn.o \ + deps/7zip/7zAlloc.o \ + deps/7zip/Bra86.o \ + deps/7zip/CpuArch.o \ + deps/7zip/7zFile.o \ + deps/7zip/7zStream.o \ + deps/7zip/7zBuf2.o \ + deps/7zip/Ppmd7.o \ + deps/7zip/LzmaDec.o \ + deps/7zip/7zCrcOpt.o \ + deps/7zip/Bra.o \ + deps/7zip/7zDec.o \ + deps/7zip/Bcj2.o \ + deps/7zip/7zCrc.o \ + deps/7zip/Lzma2Dec.o \ + deps/7zip/7zBuf.o \ + deps/7zip/Ppmd7Dec.o \ decompress/7zip_support.o OBJ += $(7ZOBJ) RETROLAUNCH_OBJ += $(7ZOBJ) diff --git a/Makefile.win b/Makefile.win index 7ca47780bb..04a7e9ebc1 100644 --- a/Makefile.win +++ b/Makefile.win @@ -289,27 +289,27 @@ ifeq ($(HAVE_FFMPEG), 1) endif ifeq ($(HAVE_7ZIP),1) - CFLAGS += -I./decompress/7zip + CFLAGS += -I./deps/7zip DEFINES += -D_7ZIP_ST DEFINES += -DHAVE_7ZIP DEFINES += -DHAVE_COMPRESSION - 7ZOBJ = decompress/7zip/7zIn.o \ - decompress/7zip/7zAlloc.o \ - decompress/7zip/Bra86.o \ - decompress/7zip/CpuArch.o \ - decompress/7zip/7zFile.o \ - decompress/7zip/7zStream.o \ - decompress/7zip/7zBuf2.o \ - decompress/7zip/Ppmd7.o \ - decompress/7zip/LzmaDec.o \ - decompress/7zip/7zCrcOpt.o \ - decompress/7zip/Bra.o \ - decompress/7zip/7zDec.o \ - decompress/7zip/Bcj2.o \ - decompress/7zip/7zCrc.o \ - decompress/7zip/Lzma2Dec.o \ - decompress/7zip/7zBuf.o \ - decompress/7zip/Ppmd7Dec.o \ + 7ZOBJ = deps/7zip/7zIn.o \ + deps/7zip/7zAlloc.o \ + deps/7zip/Bra86.o \ + deps/7zip/CpuArch.o \ + deps/7zip/7zFile.o \ + deps/7zip/7zStream.o \ + deps/7zip/7zBuf2.o \ + deps/7zip/Ppmd7.o \ + deps/7zip/LzmaDec.o \ + deps/7zip/7zCrcOpt.o \ + deps/7zip/Bra.o \ + deps/7zip/7zDec.o \ + deps/7zip/Bcj2.o \ + deps/7zip/7zCrc.o \ + deps/7zip/Lzma2Dec.o \ + deps/7zip/7zBuf.o \ + deps/7zip/Ppmd7Dec.o \ decompress/7zip_support.o OBJ += $(7ZOBJ) RETROLAUNCH_OBJ += $(7ZOBJ) diff --git a/decompress/7zip_support.c b/decompress/7zip_support.c index 6eb4dacccc..cdec20c973 100644 --- a/decompress/7zip_support.c +++ b/decompress/7zip_support.c @@ -22,11 +22,11 @@ #include #include "../miscellaneous.h" -#include "7zip/7z.h" -#include "7zip/7zAlloc.h" -#include "7zip/7zCrc.h" -#include "7zip/7zFile.h" -#include "7zip/7zVersion.h" +#include "../deps/7zip/7z.h" +#include "../deps/7zip/7zAlloc.h" +#include "../deps/7zip/7zCrc.h" +#include "../deps/7zip/7zFile.h" +#include "../deps/7zip/7zVersion.h" static ISzAlloc g_Alloc = { SzAlloc, SzFree }; diff --git a/decompress/7zip/7z.h b/deps/7zip/7z.h similarity index 100% rename from decompress/7zip/7z.h rename to deps/7zip/7z.h diff --git a/decompress/7zip/7zAlloc.c b/deps/7zip/7zAlloc.c similarity index 100% rename from decompress/7zip/7zAlloc.c rename to deps/7zip/7zAlloc.c diff --git a/decompress/7zip/7zAlloc.h b/deps/7zip/7zAlloc.h similarity index 100% rename from decompress/7zip/7zAlloc.h rename to deps/7zip/7zAlloc.h diff --git a/decompress/7zip/7zBuf.c b/deps/7zip/7zBuf.c similarity index 100% rename from decompress/7zip/7zBuf.c rename to deps/7zip/7zBuf.c diff --git a/decompress/7zip/7zBuf.h b/deps/7zip/7zBuf.h similarity index 100% rename from decompress/7zip/7zBuf.h rename to deps/7zip/7zBuf.h diff --git a/decompress/7zip/7zBuf2.c b/deps/7zip/7zBuf2.c similarity index 100% rename from decompress/7zip/7zBuf2.c rename to deps/7zip/7zBuf2.c diff --git a/decompress/7zip/7zCrc.c b/deps/7zip/7zCrc.c similarity index 100% rename from decompress/7zip/7zCrc.c rename to deps/7zip/7zCrc.c diff --git a/decompress/7zip/7zCrc.h b/deps/7zip/7zCrc.h similarity index 100% rename from decompress/7zip/7zCrc.h rename to deps/7zip/7zCrc.h diff --git a/decompress/7zip/7zCrcOpt.c b/deps/7zip/7zCrcOpt.c similarity index 100% rename from decompress/7zip/7zCrcOpt.c rename to deps/7zip/7zCrcOpt.c diff --git a/decompress/7zip/7zDec.c b/deps/7zip/7zDec.c similarity index 100% rename from decompress/7zip/7zDec.c rename to deps/7zip/7zDec.c diff --git a/decompress/7zip/7zFile.c b/deps/7zip/7zFile.c similarity index 100% rename from decompress/7zip/7zFile.c rename to deps/7zip/7zFile.c diff --git a/decompress/7zip/7zFile.h b/deps/7zip/7zFile.h similarity index 100% rename from decompress/7zip/7zFile.h rename to deps/7zip/7zFile.h diff --git a/decompress/7zip/7zIn.c b/deps/7zip/7zIn.c similarity index 100% rename from decompress/7zip/7zIn.c rename to deps/7zip/7zIn.c diff --git a/decompress/7zip/7zStream.c b/deps/7zip/7zStream.c similarity index 100% rename from decompress/7zip/7zStream.c rename to deps/7zip/7zStream.c diff --git a/decompress/7zip/7zVersion.h b/deps/7zip/7zVersion.h similarity index 100% rename from decompress/7zip/7zVersion.h rename to deps/7zip/7zVersion.h diff --git a/decompress/7zip/Bcj2.c b/deps/7zip/Bcj2.c similarity index 100% rename from decompress/7zip/Bcj2.c rename to deps/7zip/Bcj2.c diff --git a/decompress/7zip/Bcj2.h b/deps/7zip/Bcj2.h similarity index 100% rename from decompress/7zip/Bcj2.h rename to deps/7zip/Bcj2.h diff --git a/decompress/7zip/Bra.c b/deps/7zip/Bra.c similarity index 100% rename from decompress/7zip/Bra.c rename to deps/7zip/Bra.c diff --git a/decompress/7zip/Bra.h b/deps/7zip/Bra.h similarity index 100% rename from decompress/7zip/Bra.h rename to deps/7zip/Bra.h diff --git a/decompress/7zip/Bra86.c b/deps/7zip/Bra86.c similarity index 100% rename from decompress/7zip/Bra86.c rename to deps/7zip/Bra86.c diff --git a/decompress/7zip/CpuArch.c b/deps/7zip/CpuArch.c similarity index 100% rename from decompress/7zip/CpuArch.c rename to deps/7zip/CpuArch.c diff --git a/decompress/7zip/CpuArch.h b/deps/7zip/CpuArch.h similarity index 100% rename from decompress/7zip/CpuArch.h rename to deps/7zip/CpuArch.h diff --git a/decompress/7zip/Lzma2Dec.c b/deps/7zip/Lzma2Dec.c similarity index 100% rename from decompress/7zip/Lzma2Dec.c rename to deps/7zip/Lzma2Dec.c diff --git a/decompress/7zip/Lzma2Dec.h b/deps/7zip/Lzma2Dec.h similarity index 100% rename from decompress/7zip/Lzma2Dec.h rename to deps/7zip/Lzma2Dec.h diff --git a/decompress/7zip/LzmaDec.c b/deps/7zip/LzmaDec.c similarity index 100% rename from decompress/7zip/LzmaDec.c rename to deps/7zip/LzmaDec.c diff --git a/decompress/7zip/LzmaDec.h b/deps/7zip/LzmaDec.h similarity index 100% rename from decompress/7zip/LzmaDec.h rename to deps/7zip/LzmaDec.h diff --git a/decompress/7zip/Ppmd.h b/deps/7zip/Ppmd.h similarity index 100% rename from decompress/7zip/Ppmd.h rename to deps/7zip/Ppmd.h diff --git a/decompress/7zip/Ppmd7.c b/deps/7zip/Ppmd7.c similarity index 100% rename from decompress/7zip/Ppmd7.c rename to deps/7zip/Ppmd7.c diff --git a/decompress/7zip/Ppmd7.h b/deps/7zip/Ppmd7.h similarity index 100% rename from decompress/7zip/Ppmd7.h rename to deps/7zip/Ppmd7.h diff --git a/decompress/7zip/Ppmd7Dec.c b/deps/7zip/Ppmd7Dec.c similarity index 100% rename from decompress/7zip/Ppmd7Dec.c rename to deps/7zip/Ppmd7Dec.c diff --git a/decompress/7zip/RotateDefs.h b/deps/7zip/RotateDefs.h similarity index 100% rename from decompress/7zip/RotateDefs.h rename to deps/7zip/RotateDefs.h diff --git a/decompress/7zip/Types.h b/deps/7zip/Types.h similarity index 100% rename from decompress/7zip/Types.h rename to deps/7zip/Types.h diff --git a/griffin/griffin.c b/griffin/griffin.c index 4afb7e9386..fde82465a6 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -657,23 +657,23 @@ DEPENDENCIES #endif #ifdef HAVE_7ZIP -#include "../decompress/7zip/7zIn.c" -#include "../decompress/7zip/7zAlloc.c" -#include "../decompress/7zip/Bra86.c" -#include "../decompress/7zip/CpuArch.c" -#include "../decompress/7zip/7zFile.c" -#include "../decompress/7zip/7zStream.c" -#include "../decompress/7zip/7zBuf2.c" -#include "../decompress/7zip/Ppmd7.c" -#include "../decompress/7zip/LzmaDec.c" -#include "../decompress/7zip/7zCrcOpt.c" -#include "../decompress/7zip/Bra.c" -#include "../decompress/7zip/7zDec.c" -#include "../decompress/7zip/Bcj2.c" -#include "../decompress/7zip/7zCrc.c" -#include "../decompress/7zip/Lzma2Dec.c" -#include "../decompress/7zip/7zBuf.c" -#include "../decompress/7zip/Ppmd7Dec.c" +#include "../deps/7zip/7zIn.c" +#include "../deps/7zip/7zAlloc.c" +#include "../deps/7zip/Bra86.c" +#include "../deps/7zip/CpuArch.c" +#include "../deps/7zip/7zFile.c" +#include "../deps/7zip/7zStream.c" +#include "../deps/7zip/7zBuf2.c" +#include "../deps/7zip/Ppmd7.c" +#include "../deps/7zip/LzmaDec.c" +#include "../deps/7zip/7zCrcOpt.c" +#include "../deps/7zip/Bra.c" +#include "../deps/7zip/7zDec.c" +#include "../deps/7zip/Bcj2.c" +#include "../deps/7zip/7zCrc.c" +#include "../deps/7zip/Lzma2Dec.c" +#include "../deps/7zip/7zBuf.c" +#include "../deps/7zip/Ppmd7Dec.c" #include "../decompress/7zip_support.c" #endif