diff options
-rw-r--r-- | Makefile | 110 | ||||
-rw-r--r-- | Makefile.common | 96 | ||||
-rw-r--r-- | jni/Android.mk | 33 | ||||
-rw-r--r-- | jni/Application.mk (renamed from libretro/jni/Application.mk) | 0 | ||||
-rw-r--r-- | libretro/jni/Android.mk | 25 |
5 files changed, 141 insertions, 123 deletions
@@ -68,103 +68,17 @@ else CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__ endif -ifeq ($(DEBUG), 1) -CFLAGS += -O0 -g -else -CFLAGS += -O3 -endif - - -OBJECTS = -OBJECTS += ./src/apu.o -OBJECTS += ./src/apuaux.o -OBJECTS += ./src/c4.o -OBJECTS += ./src/c4emu.o -OBJECTS += ./src/cheats.o -OBJECTS += ./src/cheats2.o -OBJECTS += ./src/clip.o -OBJECTS += ./src/data.o -OBJECTS += ./src/dsp1.o -OBJECTS += ./src/fxemu.o -OBJECTS += ./src/fxinst.o -OBJECTS += ./src/globals.o -OBJECTS += ./src/ppu.o -OBJECTS += ./src/dma.o -OBJECTS += ./src/memmap.o -OBJECTS += ./src/cpu.o -OBJECTS += ./src/cpuexec.o -OBJECTS += ./src/cpuops.o -OBJECTS += ./src/sa1.o -OBJECTS += ./src/sa1cpu.o -OBJECTS += ./src/sdd1.o -OBJECTS += ./src/sdd1emu.o -OBJECTS += ./src/snapshot.o -OBJECTS += ./src/soundux.o -OBJECTS += ./src/spc700.o -OBJECTS += ./src/spc700a.o -OBJECTS += ./src/srtc.o -OBJECTS += ./src/spc_decode.o -OBJECTS += ./src/tile16.o -OBJECTS += ./src/tile16add.o -OBJECTS += ./src/tile16add1_2.o -OBJECTS += ./src/tile16fadd1_2.o -OBJECTS += ./src/tile16sub.o -OBJECTS += ./src/tile16sub1_2.o -OBJECTS += ./src/tile16fsub1_2.o -OBJECTS += ./src/mode7new.o -OBJECTS += ./src/mode7.o -OBJECTS += ./src/mode7add.o -OBJECTS += ./src/mode7add1_2.o -OBJECTS += ./src/mode7sub.o -OBJECTS += ./src/mode7sub1_2.o -OBJECTS += ./src/mode7prio.o -OBJECTS += ./src/mode7addprio.o -OBJECTS += ./src/mode7add1_2prio.o -OBJECTS += ./src/mode7subprio.o -OBJECTS += ./src/mode7sub1_2prio.o -OBJECTS += ./src/gfx16.o -OBJECTS += ./src/rops.o -OBJECTS += ./libretro/libretro.o -OBJECTS += ./libretro/memstream.o - - -OBJECTS += ./src/os9x_65c816_global.o -OBJECTS += ./src/os9x_65c816_spcasm.o -OBJECTS += ./src/os9x_65c816_spcc.o - -OBJECTS += ./src/os9x_65c816.o +CORE_DIR := ./src +LIBRETRO_DIR := ./libretro -OBJECTS += ./src/os9x_asm_cpu.o - -#CFLAGS += -D__GP2X__ -#CFLAGS += -DASMCPU -#CFLAGS += -DVAR_CYCLES -#CFLAGS += -D_C_GW_ -##COPT = -DUSE_SA1 -# -DFAST_LSB_WORD_ACCESS -#CFLAGS += -ffast-math -#CFLAGS += -msoft-float -#CFLAGS += -finline -finline-functions -fexpensive-optimizations -#CFLAGS += -falign-functions=16 -falign-loops -falign-labels -#CFLAGS += -falign-jumps -#CFLAGS += -fomit-frame-pointer -#CFLAGS += -fstrict-aliasing -mstructure-size-boundary=32 -fweb -fsigned-char -frename-registers - - -INCLUDES = -I. -Ilibretro -DEFINES = -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -DUSE_SA1 - -ifeq ($(platform), sncps3) -WARNINGS_DEFINES = -CODE_DEFINES = -else -WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter -Wno-parentheses -Wno-write-strings -Wno-comment -CODE_DEFINES = -fomit-frame-pointer -endif +include Makefile.common -COMMON_DEFINES += $(CODE_DEFINES) $(WARNINGS_DEFINES) -DNDEBUG=1 $(fpic) +OBJECTS := $(SOURCES:.c=.o) +OBJECTS := $(OBJECTS:.cpp=.o) +OBJECTS := $(OBJECTS:.S=.o) +OBJECTS := $(OBJECTS:.s=.o) -CFLAGS += $(DEFINES) $(COMMON_DEFINES) +CFLAGS += $(DEFINES) $(COMMON_DEFINES) $(INCLUDES) all: $(TARGET) @@ -176,16 +90,16 @@ else endif %.o: %.c - $(CC) $(INCLUDES) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< %.o: %.cpp - $(CXX) $(INCLUDES) $(CFLAGS) -c -o $@ $< + $(CXX) $(CFLAGS) -c -o $@ $< %.o: %.s - $(CXX) $(INCLUDES) $(CFLAGS) -Wa,-I./src/ -c -o $@ $< + $(CXX) $(CFLAGS) -Wa,-I./src/ -c -o $@ $< %.o: %.S - $(CXX) $(INCLUDES) $(CFLAGS) -Wa,-I./src/ -c -o $@ $< + $(CXX) $(CFLAGS) -Wa,-I./src/ -c -o $@ $< clean: rm -f $(OBJECTS) $(TARGET) diff --git a/Makefile.common b/Makefile.common new file mode 100644 index 0000000..16b27bb --- /dev/null +++ b/Makefile.common @@ -0,0 +1,96 @@ + +ifeq ($(DEBUG), 1) +DEFINES += -O0 -g +else +DEFINES += -O3 -DNDEBUG=1 +endif + +SOURCES := +SOURCES += $(CORE_DIR)/apu.cpp +SOURCES += $(CORE_DIR)/apuaux.c +SOURCES += $(CORE_DIR)/c4.cpp +SOURCES += $(CORE_DIR)/c4emu.cpp +SOURCES += $(CORE_DIR)/cheats.cpp +SOURCES += $(CORE_DIR)/cheats2.cpp +SOURCES += $(CORE_DIR)/clip.cpp +SOURCES += $(CORE_DIR)/data.cpp +SOURCES += $(CORE_DIR)/dsp1.cpp +SOURCES += $(CORE_DIR)/fxemu.cpp +SOURCES += $(CORE_DIR)/fxinst.cpp +SOURCES += $(CORE_DIR)/globals.cpp +SOURCES += $(CORE_DIR)/ppu.cpp +SOURCES += $(CORE_DIR)/dma.cpp +SOURCES += $(CORE_DIR)/memmap.cpp +SOURCES += $(CORE_DIR)/cpu.cpp +SOURCES += $(CORE_DIR)/cpuexec.cpp +SOURCES += $(CORE_DIR)/cpuops.cpp +SOURCES += $(CORE_DIR)/sa1.cpp +SOURCES += $(CORE_DIR)/sa1cpu.cpp +SOURCES += $(CORE_DIR)/sdd1.cpp +SOURCES += $(CORE_DIR)/sdd1emu.cpp +SOURCES += $(CORE_DIR)/snapshot.cpp +SOURCES += $(CORE_DIR)/soundux.cpp +SOURCES += $(CORE_DIR)/spc700.cpp +SOURCES += $(CORE_DIR)/spc700a.s +SOURCES += $(CORE_DIR)/srtc.cpp +SOURCES += $(CORE_DIR)/spc_decode.S +SOURCES += $(CORE_DIR)/tile16.cpp +SOURCES += $(CORE_DIR)/tile16add.cpp +SOURCES += $(CORE_DIR)/tile16add1_2.cpp +SOURCES += $(CORE_DIR)/tile16fadd1_2.cpp +SOURCES += $(CORE_DIR)/tile16sub.cpp +SOURCES += $(CORE_DIR)/tile16sub1_2.cpp +SOURCES += $(CORE_DIR)/tile16fsub1_2.cpp +SOURCES += $(CORE_DIR)/mode7new.cpp +SOURCES += $(CORE_DIR)/mode7.cpp +SOURCES += $(CORE_DIR)/mode7add.cpp +SOURCES += $(CORE_DIR)/mode7add1_2.cpp +SOURCES += $(CORE_DIR)/mode7sub.cpp +SOURCES += $(CORE_DIR)/mode7sub1_2.cpp +SOURCES += $(CORE_DIR)/mode7prio.cpp +SOURCES += $(CORE_DIR)/mode7addprio.cpp +SOURCES += $(CORE_DIR)/mode7add1_2prio.cpp +SOURCES += $(CORE_DIR)/mode7subprio.cpp +SOURCES += $(CORE_DIR)/mode7sub1_2prio.cpp +SOURCES += $(CORE_DIR)/gfx16.cpp +SOURCES += $(CORE_DIR)/rops.cpp +SOURCES += $(LIBRETRO_DIR)/libretro.cpp +SOURCES += $(LIBRETRO_DIR)/memstream.c + + +SOURCES += $(CORE_DIR)/os9x_65c816_global.s +SOURCES += $(CORE_DIR)/os9x_65c816_spcasm.s +SOURCES += $(CORE_DIR)/os9x_65c816_spcc.s + +SOURCES += $(CORE_DIR)/os9x_65c816.s + +SOURCES += $(CORE_DIR)/os9x_asm_cpu.cpp + +#CFLAGS += -D__GP2X__ +#CFLAGS += -DASMCPU +#CFLAGS += -DVAR_CYCLES +#CFLAGS += -D_C_GW_ +##COPT = -DUSE_SA1 +# -DFAST_LSB_WORD_ACCESS +#CFLAGS += -ffast-math +#CFLAGS += -msoft-float +#CFLAGS += -finline -finline-functions -fexpensive-optimizations +#CFLAGS += -falign-functions=16 -falign-loops -falign-labels +#CFLAGS += -falign-jumps +#CFLAGS += -fomit-frame-pointer +#CFLAGS += -fstrict-aliasing -mstructure-size-boundary=32 -fweb -fsigned-char -frename-registers + +#CFLAGS += -ffast-math -funroll-loops -fomit-frame-pointer + +INCLUDES = -Ilibretro -Isrc -I. +DEFINES += -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -DUSE_SA1 + +ifeq ($(platform), sncps3) +WARNINGS_DEFINES = +CODE_DEFINES = +else +WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter -Wno-parentheses -Wno-write-strings -Wno-comment +CODE_DEFINES = -fomit-frame-pointer +endif + +COMMON_DEFINES += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic) diff --git a/jni/Android.mk b/jni/Android.mk new file mode 100644 index 0000000..cd27dbe --- /dev/null +++ b/jni/Android.mk @@ -0,0 +1,33 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := retro + +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -DANDROID_ARM +LOCAL_ARM_MODE := arm +endif + +ifeq ($(TARGET_ARCH),x86) +LOCAL_CFLAGS += -DANDROID_X86 +endif + +ifeq ($(TARGET_ARCH),mips) +LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ +endif + +ifeq ($(NDK_DEBUG),1) +DEBUG = 1 +endif + +CORE_DIR := ../src +LIBRETRO_DIR := ../libretro + +include Makefile.common + +LOCAL_SRC_FILES := $(SOURCES) +LOCAL_CFLAGS += $(DEFINES) $(COMMON_DEFINES) $(INCLUDES) +LOCAL_ASFLAGS += $(DEFINES) $(COMMON_DEFINES) $(INCLUDES) + +include $(BUILD_SHARED_LIBRARY) diff --git a/libretro/jni/Application.mk b/jni/Application.mk index f05229c..f05229c 100644 --- a/libretro/jni/Application.mk +++ b/jni/Application.mk diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk deleted file mode 100644 index 4e8f462..0000000 --- a/libretro/jni/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -APP_DIR := ../../src - -LOCAL_MODULE := retro - -ifeq ($(TARGET_ARCH),arm) -LOCAL_CFLAGS += -DANDROID_ARM -LOCAL_ARM_MODE := arm -endif - -ifeq ($(TARGET_ARCH),x86) -LOCAL_CFLAGS += -DANDROID_X86 -endif - -ifeq ($(TARGET_ARCH),mips) -LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ -endif - -LOCAL_SRC_FILES += $(APP_DIR)/apu.cpp $(APP_DIR)/apuaux.cpp $(APP_DIR)/c4.cpp $(APP_DIR)/c4emu.cpp $(APP_DIR)/cheats.cpp $(APP_DIR)/cheats2.cpp $(APP_DIR)/clip.cpp $(APP_DIR)/data.cpp $(APP_DIR)/screenshot.c $(APP_DIR)/dsp1.cpp $(APP_DIR)/fxemu.cpp $(APP_DIR)/fxinst.cpp $(APP_DIR)/globals.cpp $(APP_DIR)/loadzip.cpp $(APP_DIR)/ppu.cpp $(APP_DIR)/dma.cpp $(APP_DIR)/memmap.cpp $(APP_DIR)/cpu.cpp $(APP_DIR)/cpuexec.cpp $(APP_DIR)/cpuops.cpp $(APP_DIR)/sa1.cpp $(APP_DIR)/sa1cpu.cpp $(APP_DIR)/sdd1.cpp $(APP_DIR)/sdd1emu.cpp $(APP_DIR)/snapshot.cpp $(APP_DIR)/soundux.cpp.arm $(APP_DIR)/spc700.cpp $(APP_DIR)/spc700a.s $(APP_DIR)/srtc.cpp $(APP_DIR)/spc_decode.s $(APP_DIR)/tile16.cpp.arm $(APP_DIR)/tile16add.cpp.arm $(APP_DIR)/tile16add1_2.cpp.arm $(APP_DIR)/tile16fadd1_2.cpp.arm $(APP_DIR)/tile16sub.cpp.arm $(APP_DIR)/tile16sub1_2.cpp.arm $(APP_DIR)/tile16fsub1_2.cpp.arm $(APP_DIR)/mode7new.cpp.arm $(APP_DIR)/mode7.cpp.arm $(APP_DIR)/mode7add.cpp.arm $(APP_DIR)/mode7add1_2.cpp.arm $(APP_DIR)/mode7sub.cpp.arm $(APP_DIR)/mode7sub1_2.cpp.arm $(APP_DIR)/mode7prio.cpp.arm $(APP_DIR)/mode7addprio.cpp.arm $(APP_DIR)/mode7add1_2prio.cpp.arm $(APP_DIR)/mode7subprio.cpp.arm $(APP_DIR)/mode7sub1_2prio.cpp.arm $(APP_DIR)/gfx16.cpp.arm $(APP_DIR)/rops.cpp ../libretro.cpp ../memstream.c -LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -fomit-frame-pointer -DNDEBUG=1 -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -DUSE_SA1 # -std=gnu99 - -include $(BUILD_SHARED_LIBRARY) |