| 1 | Remove bundled zlib.
|
| 2 | |
| 3 | |
| 4 | @@ -4,8 +4,7 @@
|
| 5 | -I$(CORE_DIR)/utils \
|
| 6 | -I$(CORE_DIR)/helpers \
|
| 7 | -I$(CORE_DIR)/include \
|
| 8 | - -I$(CORE_DIR)/libretro-common/include \
|
| 9 | - -I$(DEPS_DIR)/zlib
|
| 10 | + -I$(CORE_DIR)/libretro-common/include
|
| 11 |
|
| 12 | SOURCES_CXX := $(CORE_DIR)/engine/mesh.cpp \
|
| 13 | $(CORE_DIR)/engine/texture.cpp \
|
| 14 | @@ -28,22 +27,6 @@
|
| 15 | $(CORE_DIR)/libretro-common/streams/trans_stream_zlib.c
|
| 16 |
|
| 17 | ifneq ($(STATIC_LINKING), 1)
|
| 18 | -#include zlib
|
| 19 | -SOURCES_C += $(DEPS_DIR)/zlib/adler32.c \
|
| 20 | - $(DEPS_DIR)/zlib/compress.c \
|
| 21 | - $(DEPS_DIR)/zlib/crc32.c \
|
| 22 | - $(DEPS_DIR)/zlib/deflate.c \
|
| 23 | - $(DEPS_DIR)/zlib/gzclose.c \
|
| 24 | - $(DEPS_DIR)/zlib/gzlib.c \
|
| 25 | - $(DEPS_DIR)/zlib/gzread.c \
|
| 26 | - $(DEPS_DIR)/zlib/gzwrite.c \
|
| 27 | - $(DEPS_DIR)/zlib/inffast.c \
|
| 28 | - $(DEPS_DIR)/zlib/inflate.c \
|
| 29 | - $(DEPS_DIR)/zlib/inftrees.c \
|
| 30 | - $(DEPS_DIR)/zlib/trees.c \
|
| 31 | - $(DEPS_DIR)/zlib/uncompr.c \
|
| 32 | - $(DEPS_DIR)/zlib/zutil.c
|
| 33 | -
|
| 34 | SOURCES_C += \
|
| 35 | $(CORE_DIR)/libretro-common/compat/compat_strl.c \
|
| 36 | $(CORE_DIR)/libretro-common/compat/compat_posix_string.c \
|
| 37 | |
| 38 | |
| 39 | @@ -265,6 +265,8 @@
|
| 40 | LD = $(CXX)
|
| 41 | endif
|
| 42 |
|
| 43 | +LIBS += -lz
|
| 44 | +
|
| 45 | %.o: %.cpp
|
| 46 | $(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
|
| 47 |
|