mirror of
https://github.com/libretro/RetroArch
synced 2025-04-07 13:23:32 +00:00
Move 7zip to deps/
This commit is contained in:
twinaphex
parent
233aeaab64
commit
09d240330f
34
Makefile
34
Makefile
@ -467,23 +467,23 @@ ifeq ($(HAVE_7ZIP),1)
|
|||||||
DEFINES += -D_7ZIP_ST
|
DEFINES += -D_7ZIP_ST
|
||||||
DEFINES += -DHAVE_7ZIP
|
DEFINES += -DHAVE_7ZIP
|
||||||
DEFINES += -DHAVE_COMPRESSION
|
DEFINES += -DHAVE_COMPRESSION
|
||||||
7ZOBJ = decompress/7zip/7zIn.o \
|
7ZOBJ = deps/7zip/7zIn.o \
|
||||||
decompress/7zip/7zAlloc.o \
|
deps/7zip/7zAlloc.o \
|
||||||
decompress/7zip/Bra86.o \
|
deps/7zip/Bra86.o \
|
||||||
decompress/7zip/CpuArch.o \
|
deps/7zip/CpuArch.o \
|
||||||
decompress/7zip/7zFile.o \
|
deps/7zip/7zFile.o \
|
||||||
decompress/7zip/7zStream.o \
|
deps/7zip/7zStream.o \
|
||||||
decompress/7zip/7zBuf2.o \
|
deps/7zip/7zBuf2.o \
|
||||||
decompress/7zip/Ppmd7.o \
|
deps/7zip/Ppmd7.o \
|
||||||
decompress/7zip/LzmaDec.o \
|
deps/7zip/LzmaDec.o \
|
||||||
decompress/7zip/7zCrcOpt.o \
|
deps/7zip/7zCrcOpt.o \
|
||||||
decompress/7zip/Bra.o \
|
deps/7zip/Bra.o \
|
||||||
decompress/7zip/7zDec.o \
|
deps/7zip/7zDec.o \
|
||||||
decompress/7zip/Bcj2.o \
|
deps/7zip/Bcj2.o \
|
||||||
decompress/7zip/7zCrc.o \
|
deps/7zip/7zCrc.o \
|
||||||
decompress/7zip/Lzma2Dec.o \
|
deps/7zip/Lzma2Dec.o \
|
||||||
decompress/7zip/7zBuf.o \
|
deps/7zip/7zBuf.o \
|
||||||
decompress/7zip/Ppmd7Dec.o \
|
deps/7zip/Ppmd7Dec.o \
|
||||||
decompress/7zip_support.o
|
decompress/7zip_support.o
|
||||||
OBJ += $(7ZOBJ)
|
OBJ += $(7ZOBJ)
|
||||||
RETROLAUNCH_OBJ += $(7ZOBJ)
|
RETROLAUNCH_OBJ += $(7ZOBJ)
|
||||||
|
|||||||
36
Makefile.win
36
Makefile.win
@ -289,27 +289,27 @@ ifeq ($(HAVE_FFMPEG), 1)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HAVE_7ZIP),1)
|
ifeq ($(HAVE_7ZIP),1)
|
||||||
CFLAGS += -I./decompress/7zip
|
CFLAGS += -I./deps/7zip
|
||||||
DEFINES += -D_7ZIP_ST
|
DEFINES += -D_7ZIP_ST
|
||||||
DEFINES += -DHAVE_7ZIP
|
DEFINES += -DHAVE_7ZIP
|
||||||
DEFINES += -DHAVE_COMPRESSION
|
DEFINES += -DHAVE_COMPRESSION
|
||||||
7ZOBJ = decompress/7zip/7zIn.o \
|
7ZOBJ = deps/7zip/7zIn.o \
|
||||||
decompress/7zip/7zAlloc.o \
|
deps/7zip/7zAlloc.o \
|
||||||
decompress/7zip/Bra86.o \
|
deps/7zip/Bra86.o \
|
||||||
decompress/7zip/CpuArch.o \
|
deps/7zip/CpuArch.o \
|
||||||
decompress/7zip/7zFile.o \
|
deps/7zip/7zFile.o \
|
||||||
decompress/7zip/7zStream.o \
|
deps/7zip/7zStream.o \
|
||||||
decompress/7zip/7zBuf2.o \
|
deps/7zip/7zBuf2.o \
|
||||||
decompress/7zip/Ppmd7.o \
|
deps/7zip/Ppmd7.o \
|
||||||
decompress/7zip/LzmaDec.o \
|
deps/7zip/LzmaDec.o \
|
||||||
decompress/7zip/7zCrcOpt.o \
|
deps/7zip/7zCrcOpt.o \
|
||||||
decompress/7zip/Bra.o \
|
deps/7zip/Bra.o \
|
||||||
decompress/7zip/7zDec.o \
|
deps/7zip/7zDec.o \
|
||||||
decompress/7zip/Bcj2.o \
|
deps/7zip/Bcj2.o \
|
||||||
decompress/7zip/7zCrc.o \
|
deps/7zip/7zCrc.o \
|
||||||
decompress/7zip/Lzma2Dec.o \
|
deps/7zip/Lzma2Dec.o \
|
||||||
decompress/7zip/7zBuf.o \
|
deps/7zip/7zBuf.o \
|
||||||
decompress/7zip/Ppmd7Dec.o \
|
deps/7zip/Ppmd7Dec.o \
|
||||||
decompress/7zip_support.o
|
decompress/7zip_support.o
|
||||||
OBJ += $(7ZOBJ)
|
OBJ += $(7ZOBJ)
|
||||||
RETROLAUNCH_OBJ += $(7ZOBJ)
|
RETROLAUNCH_OBJ += $(7ZOBJ)
|
||||||
|
|||||||
@ -22,11 +22,11 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "../miscellaneous.h"
|
#include "../miscellaneous.h"
|
||||||
|
|
||||||
#include "7zip/7z.h"
|
#include "../deps/7zip/7z.h"
|
||||||
#include "7zip/7zAlloc.h"
|
#include "../deps/7zip/7zAlloc.h"
|
||||||
#include "7zip/7zCrc.h"
|
#include "../deps/7zip/7zCrc.h"
|
||||||
#include "7zip/7zFile.h"
|
#include "../deps/7zip/7zFile.h"
|
||||||
#include "7zip/7zVersion.h"
|
#include "../deps/7zip/7zVersion.h"
|
||||||
|
|
||||||
static ISzAlloc g_Alloc = { SzAlloc, SzFree };
|
static ISzAlloc g_Alloc = { SzAlloc, SzFree };
|
||||||
|
|
||||||
|
|||||||
0
decompress/7zip/7z.h → deps/7zip/7z.h
vendored
0
decompress/7zip/7z.h → deps/7zip/7z.h
vendored
0
decompress/7zip/Bra.c → deps/7zip/Bra.c
vendored
0
decompress/7zip/Bra.c → deps/7zip/Bra.c
vendored
0
decompress/7zip/Bra.h → deps/7zip/Bra.h
vendored
0
decompress/7zip/Bra.h → deps/7zip/Bra.h
vendored
@ -657,23 +657,23 @@ DEPENDENCIES
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_7ZIP
|
#ifdef HAVE_7ZIP
|
||||||
#include "../decompress/7zip/7zIn.c"
|
#include "../deps/7zip/7zIn.c"
|
||||||
#include "../decompress/7zip/7zAlloc.c"
|
#include "../deps/7zip/7zAlloc.c"
|
||||||
#include "../decompress/7zip/Bra86.c"
|
#include "../deps/7zip/Bra86.c"
|
||||||
#include "../decompress/7zip/CpuArch.c"
|
#include "../deps/7zip/CpuArch.c"
|
||||||
#include "../decompress/7zip/7zFile.c"
|
#include "../deps/7zip/7zFile.c"
|
||||||
#include "../decompress/7zip/7zStream.c"
|
#include "../deps/7zip/7zStream.c"
|
||||||
#include "../decompress/7zip/7zBuf2.c"
|
#include "../deps/7zip/7zBuf2.c"
|
||||||
#include "../decompress/7zip/Ppmd7.c"
|
#include "../deps/7zip/Ppmd7.c"
|
||||||
#include "../decompress/7zip/LzmaDec.c"
|
#include "../deps/7zip/LzmaDec.c"
|
||||||
#include "../decompress/7zip/7zCrcOpt.c"
|
#include "../deps/7zip/7zCrcOpt.c"
|
||||||
#include "../decompress/7zip/Bra.c"
|
#include "../deps/7zip/Bra.c"
|
||||||
#include "../decompress/7zip/7zDec.c"
|
#include "../deps/7zip/7zDec.c"
|
||||||
#include "../decompress/7zip/Bcj2.c"
|
#include "../deps/7zip/Bcj2.c"
|
||||||
#include "../decompress/7zip/7zCrc.c"
|
#include "../deps/7zip/7zCrc.c"
|
||||||
#include "../decompress/7zip/Lzma2Dec.c"
|
#include "../deps/7zip/Lzma2Dec.c"
|
||||||
#include "../decompress/7zip/7zBuf.c"
|
#include "../deps/7zip/7zBuf.c"
|
||||||
#include "../decompress/7zip/Ppmd7Dec.c"
|
#include "../deps/7zip/Ppmd7Dec.c"
|
||||||
#include "../decompress/7zip_support.c"
|
#include "../decompress/7zip_support.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user