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

Move zlib to Makefile.common too

Browse Source
This commit is contained in:
twinaphex 2014-09-14 04:50:10 +02:00
parent 6a730a7408
commit 0402f91ee1
4 changed files with 46 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -40,21 +40,6 @@ ifeq ($(HAVE_DYLIB), 1)
LIBS += $(DYLIB_LIB) LIBS += $(DYLIB_LIB)
endif endif
ifeq ($(HAVE_ZLIB), 1)
HAVE_COMPRESSION = 1
ZLIB_OBJS = deps/rzlib/unzip.o \
deps/rzlib/ioapi.o
OBJ += gfx/rpng/rpng.o file_extract.o decompress/zip_support.o
OBJ += $(ZLIB_OBJS)
JOYCONFIG_OBJ += decompress/zip_support.o
JOYCONFIG_OBJ += $(ZLIB_OBJS)
JOYCONFIG_LIBS += -lz
RETROLAUNCH_OBJ += decompress/zip_support.o
RETROLAUNCH_OBJ += $(ZLIB_OBJS)
LIBS += $(ZLIB_LIBS)
DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE -DHAVE_ZLIB
endif
ifeq ($(HAVE_DYNAMIC), 1) ifeq ($(HAVE_DYNAMIC), 1)
LIBS += $(DYLIB_LIB) LIBS += $(DYLIB_LIB)
else else

46
Makefile.common
View File

@ -508,6 +508,52 @@ ifeq ($(HAVE_7ZIP),1)
JOYCONFIG_OBJ += $(7ZOBJ) JOYCONFIG_OBJ += $(7ZOBJ)
endif endif
ifeq ($(HAVE_ZLIB), 1)
ZLIB_OBJS = decompress/zip_support.o
OBJ += gfx/rpng/rpng.o file_extract.o
OBJ += $(ZLIB_OBJS)
RETROLAUNCH_OBJ += $(ZLIB_OBJS)
JOYCONFIG_OBJ += $(ZLIB_OBJS)
DEFINES += -DHAVE_ZLIB
HAVE_COMPRESSION = 1
ifeq ($(WANT_MINIZ), 1)
DEFINES += -DWANT_MINIZ
else
LIBS += -lz
JOYCONFIG_LIBS += -lz
HAVE_ZLIB_DEFLATE = 1
endif
endif
ifeq ($(WANT_MINIZ),1)
OBJ += deps/rzlib/adler32.o \
deps/rzlib/compress.o \
deps/rzlib/crc32.o \
deps/rzlib/deflate.o \
deps/rzlib/gzclose.o \
deps/rzlib/gzlib.o \
deps/rzlib/gzread.o \
deps/rzlib/gzwrite.o \
deps/rzlib/inffast.o \
deps/rzlib/inflate.o \
deps/rzlib/inftrees.o \
deps/rzlib/trees.o \
deps/rzlib/uncompr.o \
deps/rzlib/zutil.o \
deps/rzlib/ioapi.o \
deps/rzlib/unzip.o
else
ZLIB_OBJS = deps/rzlib/unzip.o deps/rzlib/ioapi.o
OBJ += $(ZLIB_OBJS)
RETROLAUNCH_OBJ += $(ZLIB_OBJS)
JOYCONFIG_OBJ += $(ZLIB_OBJS)
HAVE_ZLIB_DEFLATE = 1
endif
ifeq ($(HAVE_ZLIB_DEFLATE),1)
DEFINES += -DHAVE_ZLIB_DEFLATE
endif
# Camera # Camera
ifeq ($(HAVE_V4L2),1) ifeq ($(HAVE_V4L2),1)

29
Makefile.emscripten
View File

@ -28,35 +28,6 @@ include Makefile.common
libretro = libretro_emscripten.bc libretro = libretro_emscripten.bc
ifeq ($(HAVE_ZLIB), 1)
OBJ += gfx/rpng/rpng.o file_extract.o
DEFINES += -DHAVE_ZLIB
ifeq ($(WANT_MINIZ), 1)
OBJ += deps/rzlib/adler32.o \
deps/rzlib/compress.o \
deps/rzlib/crc32.o \
deps/rzlib/deflate.o \
deps/rzlib/gzclose.o \
deps/rzlib/gzlib.o \
deps/rzlib/gzread.o \
deps/rzlib/gzwrite.o \
deps/rzlib/inffast.o \
deps/rzlib/inflate.o \
deps/rzlib/inftrees.o \
deps/rzlib/trees.o \
deps/rzlib/uncompr.o \
deps/rzlib/zutil.o \
deps/rzlib/ioapi.o \
deps/rzlib/unzip.o \
decompress/zip_support.o
DEFINES += -DWANT_MINIZ
else
OBJ += deps/rzlib/ioapi.o deps/rzlib/unzip.o decompress/zip_support.o
LIBS += -lz
DEFINES += -DHAVE_ZLIB_DEFLATE
endif
endif
ifneq ($(V), 1) ifneq ($(V), 1)
Q := @ Q := @
endif endif

20
Makefile.win
View File

@ -89,26 +89,6 @@ endif
libretro ?= -lretro libretro ?= -lretro
ifeq ($(HAVE_ZLIB), 1)
ZLIB_OBJS = deps/rzlib/unzip.o \
deps/rzlib/ioapi.o \
decompress/zip_support.o
OBJ += gfx/rpng/rpng.o file_extract.o
OBJ += $(ZLIB_OBJS)
RETROLAUNCH_OBJ += $(ZLIB_OBJS)
JOYCONFIG_OBJ += $(ZLIB_OBJS)
DEFINES += -DHAVE_ZLIB
HAVE_COMPRESSION = 1
ifeq ($(WANT_MINIZ), 1)
OBJ += deps/miniz/miniz.o
DEFINES += -DWANT_MINIZ
else
LIBS += -lz
JOYCONFIG_LIBS += -lz
DEFINES += -DHAVE_ZLIB_DEFLATE
endif
endif
ifeq ($(DYNAMIC), 1) ifeq ($(DYNAMIC), 1)
DEFINES += -DHAVE_DYNAMIC DEFINES += -DHAVE_DYNAMIC
else else