aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortwinaphex2014-11-01 08:25:16 +0100
committertwinaphex2014-11-01 08:25:16 +0100
commit889f89ec26526a82d7e67438073f1bf92f4258df (patch)
tree9a520f57fb85571620ecf838990b26fb4dc2595c /Makefile
parentbbac1324c6135fc17641fe12f5aa2b7c3623483c (diff)
downloadsnesemu-889f89ec26526a82d7e67438073f1bf92f4258df.tar.gz
snesemu-889f89ec26526a82d7e67438073f1bf92f4258df.tar.bz2
snesemu-889f89ec26526a82d7e67438073f1bf92f4258df.zip
Add Android JNI Makefiles and Makefile.common
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile49
1 files changed, 5 insertions, 44 deletions
diff --git a/Makefile b/Makefile
index 8b9b96e..86205e9 100644
--- a/Makefile
+++ b/Makefile
@@ -127,53 +127,13 @@ DEFS += -DSPC700_C -DEXECUTE_SUPERFX_PER_LINE -DSDD1_DECOMP \
DEFS += -D__LIBRETRO__
-CATSFC_DIR := libfreedo
-
-ifeq ($(HAVE_GRIFFIN), 1)
-CATSFC_SOURCES := source/catsfc_griffin.c
-CATSFC_SOURCES += source/sa1.c source/sa1cpu.c
-LIBRETRO_SOURCES :=
-else
-CATSFC_SOURCES := source/apu.c source/c4.c \
- source/c4emu.c \
- source/cheats2.c \
- source/cheats.c \
- source/clip.c \
- source/cpu.c \
- source/cpuexec.c \
- source/cpuops.c \
- source/data.c\
- source/dma.c \
- source/dsp1.c \
- source/fxdbg.c \
- source/fxemu.c \
- source/fxinst.c \
- source/gfx.c source/globals.c \
- source/memmap.c \
- source/obc1.c \
- source/ppu.c \
- source/sa1.c \
- source/sa1cpu.c \
- source/sdd1.c \
- source/sdd1emu.c \
- source/seta010.c \
- source/seta011.c \
- source/seta018.c \
- source/seta.c \
- source/soundux.c \
- source/spc700.c source/spc7110.c \
- source/srtc.c \
- source/tile.c
-LIBRETRO_SOURCES := libretro.c
-endif
+CORE_DIR := ./source
+LIBRETRO_DIR := .
+include Makefile.common
-SOURCES_C := $(LIBRETRO_SOURCES) $(CATSFC_SOURCES)
-
-SOURCES_CPP :=
OBJECTS := $(SOURCES_C:.c=.o)
-#OBJECTS += $(SOURCES_CPP:.cpp=.o)
all: $(TARGET)
@@ -189,7 +149,8 @@ endif
LDFLAGS += $(fpic) -lz $(SHARED)
FLAGS += $(fpic)
-FLAGS += -Isource -I.
+FLAGS += $(INCFLAGS)
+
ifeq ($(OLD_GCC), 1)
WARNINGS := -Wall