From ef0d252dee60426398c388032936647116414ee8 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sat, 18 May 2013 20:56:16 +0200
Subject: [PATCH] (libretro Android) Add Android JNI Makefile

---
 libretro/Makefile           | 10 +++++-----
 libretro/jni/Android.mk     | 23 +++++++++++++++++++++++
 libretro/jni/Application.mk |  2 ++
 memmap.cpp                  |  2 ++
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 libretro/jni/Android.mk
 create mode 100644 libretro/jni/Application.mk

diff --git a/libretro/Makefile b/libretro/Makefile
index 10fe16ce..6be417a4 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -44,35 +44,35 @@ else ifeq ($(platform), ps3)
    CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
    CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
    AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
-   CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+   CXXFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 	STATIC_LINKING = 1
 else ifeq ($(platform), sncps3)
    TARGET := $(TARGET_NAME)_libretro_ps3.a
    CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
    CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
    AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
-   CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+   CXXFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 	STATIC_LINKING = 1
 else ifeq ($(platform), psl1ght)
    TARGET := $(TARGET_NAME)_libretro_psl1ght.a
    CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
    CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
    AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
-   CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+   CXXFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 	STATIC_LINKING = 1
 else ifeq ($(platform), xenon)
    TARGET := $(TARGET_NAME)_libretro_xenon360.a
    CC = xenon-gcc$(EXE_EXT)
    CXX = xenon-g++$(EXE_EXT)
    AR = xenon-ar$(EXE_EXT)
-   CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
+   CXXFLAGS += -D__LIBXENON__ -m32 -D__ppc__
 	STATIC_LINKING = 1
 else ifeq ($(platform), wii)
    TARGET := $(TARGET_NAME)_libretro_wii.a
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
    AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-   CFLAGS += -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+   CXXFLAGS += -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 	STATIC_LINKING = 1
 else
    TARGET := $(TARGET_NAME)_libretro.dll
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
new file mode 100644
index 00000000..a7a1a437
--- /dev/null
+++ b/libretro/jni/Android.mk
@@ -0,0 +1,23 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+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
+endif
+
+LOCAL_MODULE    := libretro
+LOCAL_SRC_FILES    =  ../../apu/apu.cpp ../../apu/bapu/dsp/sdsp.cpp  ../../apu/bapu/dsp/SPC_DSP.cpp ../../apu/bapu/smp/smp.cpp ../../apu/bapu/smp/smp_state.cpp  ../../bsx.cpp ../../c4.cpp ../../c4emu.cpp ../../cheats.cpp ../../cheats2.cpp ../../clip.cpp ../../conffile.cpp ../../controls.cpp ../../cpu.cpp ../../cpuexec.cpp ../../cpuops.cpp ../../crosshairs.cpp ../../dma.cpp ../../dsp.cpp ../../dsp1.cpp ../../dsp2.cpp ../../dsp3.cpp ../../dsp4.cpp ../../fxinst.cpp ../../fxemu.cpp ../../gfx.cpp ../../globals.cpp ../../logger.cpp ../../memmap.cpp ../../movie.cpp ../../obc1.cpp ../../ppu.cpp ../../stream.cpp ../../sa1.cpp ../../sa1cpu.cpp ../../screenshot.cpp ../../sdd1.cpp ../../sdd1emu.cpp ../../seta.cpp ../../seta010.cpp ../../seta011.cpp ../../seta018.cpp ../../snapshot.cpp ../../snes9x.cpp ../../spc7110.cpp ../../srtc.cpp ../../tile.cpp ../libretro.cpp
+LOCAL_CXXFLAGS = -DANDROID
+LOCAL_C_INCLUDES = ../../ ../../apu/bapu/
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libretro/jni/Application.mk b/libretro/jni/Application.mk
new file mode 100644
index 00000000..8a357c3c
--- /dev/null
+++ b/libretro/jni/Application.mk
@@ -0,0 +1,2 @@
+APP_STL := stlport_static
+APP_ABI := all
diff --git a/memmap.cpp b/memmap.cpp
index dba837c6..7af40629 100644
--- a/memmap.cpp
+++ b/memmap.cpp
@@ -188,6 +188,8 @@
 #include "jma/s9x-jma.h"
 #endif
 
+#include <ctype.h>
+
 #include "snes9x.h"
 #include "memmap.h"
 #include "apu/apu.h"