mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 11:19:50 +03:00
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
Remove bundled zlib.
|
|
--- a/Makefile.common
|
|
+++ b/Makefile.common
|
|
@@ -4,8 +4,7 @@
|
|
-I$(CORE_DIR)/utils \
|
|
-I$(CORE_DIR)/helpers \
|
|
-I$(CORE_DIR)/include \
|
|
- -I$(CORE_DIR)/libretro-common/include \
|
|
- -I$(DEPS_DIR)/zlib
|
|
+ -I$(CORE_DIR)/libretro-common/include
|
|
|
|
SOURCES_CXX := $(CORE_DIR)/engine/mesh.cpp \
|
|
$(CORE_DIR)/engine/texture.cpp \
|
|
@@ -28,22 +27,6 @@
|
|
$(CORE_DIR)/libretro-common/streams/trans_stream_zlib.c
|
|
|
|
ifneq ($(STATIC_LINKING), 1)
|
|
-#include zlib
|
|
-SOURCES_C += $(DEPS_DIR)/zlib/adler32.c \
|
|
- $(DEPS_DIR)/zlib/compress.c \
|
|
- $(DEPS_DIR)/zlib/crc32.c \
|
|
- $(DEPS_DIR)/zlib/deflate.c \
|
|
- $(DEPS_DIR)/zlib/gzclose.c \
|
|
- $(DEPS_DIR)/zlib/gzlib.c \
|
|
- $(DEPS_DIR)/zlib/gzread.c \
|
|
- $(DEPS_DIR)/zlib/gzwrite.c \
|
|
- $(DEPS_DIR)/zlib/inffast.c \
|
|
- $(DEPS_DIR)/zlib/inflate.c \
|
|
- $(DEPS_DIR)/zlib/inftrees.c \
|
|
- $(DEPS_DIR)/zlib/trees.c \
|
|
- $(DEPS_DIR)/zlib/uncompr.c \
|
|
- $(DEPS_DIR)/zlib/zutil.c
|
|
-
|
|
SOURCES_C += \
|
|
$(CORE_DIR)/libretro-common/compat/compat_strl.c \
|
|
$(CORE_DIR)/libretro-common/compat/compat_posix_string.c \
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -265,6 +265,8 @@
|
|
LD = $(CXX)
|
|
endif
|
|
|
|
+LIBS += -lz
|
|
+
|
|
%.o: %.cpp
|
|
$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
|
|
|