Don't link against zlib

This commit is contained in:
twinaphex 2015-02-07 18:19:53 +01:00
parent 4f9fc75fa4
commit 08c955f612
2 changed files with 7 additions and 9 deletions

View File

@ -45,7 +45,7 @@ TARGET_NAME := genesis_plus_gx
ifeq ($(platform), unix) ifeq ($(platform), unix)
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined -lz SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
PLATFORM_DEFINES := -DHAVE_ZLIB PLATFORM_DEFINES := -DHAVE_ZLIB
@ -53,7 +53,7 @@ ifeq ($(platform), unix)
else ifeq ($(platform), osx) else ifeq ($(platform), osx)
TARGET := $(TARGET_NAME)_libretro.dylib TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC fpic := -fPIC
SHARED := -dynamiclib -lz SHARED := -dynamiclib
ifeq ($(arch),ppc) ifeq ($(arch),ppc)
ENDIANNESS_DEFINES := -DBYTE_ORDER=BIG_ENDIAN ENDIANNESS_DEFINES := -DBYTE_ORDER=BIG_ENDIAN
else else
@ -75,7 +75,7 @@ else ifeq ($(platform), osx)
else ifeq ($(platform), ios) else ifeq ($(platform), ios)
TARGET := $(TARGET_NAME)_libretro_ios.dylib TARGET := $(TARGET_NAME)_libretro_ios.dylib
fpic := -fPIC fpic := -fPIC
SHARED := -dynamiclib -lz SHARED := -dynamiclib
ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
PLATFORM_DEFINES := -DHAVE_ZLIB PLATFORM_DEFINES := -DHAVE_ZLIB
@ -109,7 +109,7 @@ else ifeq ($(platform), theos_ios)
else ifeq ($(platform), qnx) else ifeq ($(platform), qnx)
TARGET := $(TARGET_NAME)_libretro_qnx.so TARGET := $(TARGET_NAME)_libretro_qnx.so
fpic := -fPIC fpic := -fPIC
SHARED := -lm -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined -lz SHARED := -lm -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
PLATFORM_DEFINES := -DHAVE_ZLIB PLATFORM_DEFINES := -DHAVE_ZLIB
CC = qcc -Vgcc_ntoarmv7le CC = qcc -Vgcc_ntoarmv7le
@ -181,7 +181,7 @@ else ifeq ($(platform), wii)
else ifneq (,$(findstring armv,$(platform))) else ifneq (,$(findstring armv,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined -lz SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
PLATFORM_DEFINES := -DHAVE_ZLIB PLATFORM_DEFINES := -DHAVE_ZLIB
ifneq (,$(findstring cortexa5,$(platform))) ifneq (,$(findstring cortexa5,$(platform)))
@ -211,7 +211,7 @@ else ifeq ($(platform), emscripten)
else else
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll
CC = gcc CC = gcc
SHARED := -shared -static-libgcc -static-libstdc++ -Wl,--version-script=libretro/link.T -Wl,--no-undefined -lz SHARED := -shared -static-libgcc -static-libstdc++ -Wl,--version-script=libretro/link.T -Wl,--no-undefined
ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
PLATFORM_DEFINES := -DHAVE_ZLIB PLATFORM_DEFINES := -DHAVE_ZLIB

View File

@ -12,8 +12,6 @@ SOURCES_C = $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \ $(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(LIBRETRO_DIR)/libretro.c $(LIBRETRO_DIR)/libretro.c
ifeq ($(WANT_CRC32), 1)
SOURCES_C += $(LIBRETRO_DIR)/scrc32.c SOURCES_C += $(LIBRETRO_DIR)/scrc32.c
endif
INCFLAGS += $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) -I$(LIBRETRO_DIR) INCFLAGS += $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) -I$(LIBRETRO_DIR)