admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* No more zlib dependency for libretro port

Browse Source 
* Fixed Android build
This commit is contained in:
twinaphex
2014-04-18 19:40:45 +02:00
parent da7ac270f8
commit fb3078b01c
6 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.libretro
View File

@@ -1,5 +1,4 @@
DEBUG = 0
EXTERNAL_ZLIB = 0
WANT_GRIFFIN = 0
ifeq ($(platform),)
@@ -41,7 +40,6 @@ ifeq ($(platform), unix)
fpic := -fPIC
SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
ZLIB_DIR := ./src/zlib
else ifeq ($(platform), osx)
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
@@ -51,13 +49,11 @@ ifneq ($(arch),ppc)
ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
endif
CFLAGS += -DHAVE_ASPRINTF
ZLIB_DIR := ./src/zlib
else ifeq ($(platform), qnx)
TARGET := $(TARGET_NAME)_libretro_qnx.so
fpic := -fPIC
SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
ZLIB_DIR := ./src/zlib
CC = qcc -Vgcc_ntoarmv7le
AR = qcc -Vgcc_ntoarmv7le
@@ -68,7 +64,6 @@ else ifeq ($(platform), ios)
SHARED := -dynamiclib
ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
CFLAGS += -DHAVE_ASPRINTF -DIOS
ZLIB_DIR := ./src/zlib
CC = clang -arch armv7 -isysroot $(IOSSDK) -miphoneos-version-min=5.0
CFLAGS += -DIOS -miphoneos-version-min=5.0
else ifeq ($(platform), ps3)
@@ -123,7 +118,6 @@ else ifneq (,$(findstring armv,$(platform)))
ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
fpic := -fPIC
CC = gcc
ZLIB_DIR := ./src/zlib
ifneq (,$(findstring cortexa8,$(platform)))
PLATFORM_DEFINES += -marm -mcpu=cortex-a8
else ifneq (,$(findstring cortexa9,$(platform)))
@@ -145,7 +139,6 @@ else
CC = gcc
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/drivers/libretro/link.T
ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
ZLIB_DIR := ./src/zlib
endif
ifeq ($(DEBUG), 1)
@@ -154,17 +147,11 @@ else
CFLAGS += -O3 -DNDEBUG
endif
ifeq ($(EXTERNAL_ZLIB), 1)
ZLIB_DIR :=
CFLAGS += -DHAVE_EXTERNAL_ZLIB
LDFLAGS += -lz
endif
LIBRETRO_DIR := ./src/drivers/libretro
FCEU_DIR := ./src
CFLAGS += -DWANT_GRIFFIN
FCEU_SRC_DIRS := $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(ZLIB_DIR)
FCEU_SRC_DIRS := $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers
FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
FCEU_CSRCS += $(LIBRETRO_DIR)/griffin.c $(FCEU_DIR)/ines.c $(FCEU_DIR)/unif.c $(FCEU_DIR)/x6502.c
@@ -190,10 +177,6 @@ ifeq ($(platform), psp1)
INCDIRS += -I$(shell psp-config --pspsdk-path)/include
endif
ifeq ($(EXTERNAL_ZLIB), 0)
INCDIRS += -I$(FCEU_DIR)/zlib
endif
all: $(TARGET)
$(TARGET): $(OBJS)