new JNI files

Makefile

@@ -234,8 +234,6 @@ CFLAGSOSDEPEND = $(CFLAGS)
 # the windows osd code at least cannot be compiled with -pedantic
 CFLAGSPEDANTIC = $(CFLAGS) -pedantic
 
-SOURCES_C :=
-
 # include the various .mak files
 include Makefile.common
 

Makefile.common

@@ -4,7 +4,7 @@ INCFLAGS := -I$(CORE_DIR) \
 				-I$(CORE_DIR)/cpu/m68000 \
 				-I$(CORE_DIR)/cpu/m68000
 
-SOURCES_C += $(CORE_DIR)/libretro/libretro.c \
+SOURCES_C := $(CORE_DIR)/libretro/libretro.c \
 				 $(CORE_DIR)/libretro/osd.c \
 				 $(CORE_DIR)/libretro/keyboard.c \
 				 $(CORE_DIR)/libretro/joystick.c \
@@ -2574,20 +2574,20 @@ endif
 ifeq ($(STATIC_LINKING),1)
 INCFLAGS += -I$(CORE_DIR)/libretro/includes/zlib
 else
-SOURCES_C += deps/zlib/adler32.c \
-				 deps/zlib/compress.c \
-				 deps/zlib/crc32.c \
-				 deps/zlib/deflate.c \
-				 deps/zlib/gzclose.c \
-				 deps/zlib/gzlib.c \
-				 deps/zlib/gzread.c \
-				 deps/zlib/gzwrite.c \
-				 deps/zlib/inffast.c \
-				 deps/zlib/inflate.c \
-				 deps/zlib/inftrees.c \
-				 deps/zlib/trees.c \
-				 deps/zlib/uncompr.c \
-				 deps/zlib/zutil.c \
-				 deps/zlib/ioapi.c \
-				 deps/zlib/unzip.c
+SOURCES_C += $(CORE_DIR)/../deps/zlib/adler32.c \
+				 $(CORE_DIR)/../deps/zlib/compress.c \
+				 $(CORE_DIR)/../deps/zlib/crc32.c \
+				 $(CORE_DIR)/../deps/zlib/deflate.c \
+				 $(CORE_DIR)/../deps/zlib/gzclose.c \
+				 $(CORE_DIR)/../deps/zlib/gzlib.c \
+				 $(CORE_DIR)/../deps/zlib/gzread.c \
+				 $(CORE_DIR)/../deps/zlib/gzwrite.c \
+				 $(CORE_DIR)/../deps/zlib/inffast.c \
+				 $(CORE_DIR)/../deps/zlib/inflate.c \
+				 $(CORE_DIR)/../deps/zlib/inftrees.c \
+				 $(CORE_DIR)/../deps/zlib/trees.c \
+				 $(CORE_DIR)/../deps/zlib/uncompr.c \
+				 $(CORE_DIR)/../deps/zlib/zutil.c \
+				 $(CORE_DIR)/../deps/zlib/ioapi.c \
+				 $(CORE_DIR)/../deps/zlib/unzip.c
 endif

jni/Android.mk

@@ -0,0 +1,35 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := retro
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CFLAGS += -DANDROID_ARM
+LOCAL_ARM_MODE := arm
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_CFLAGS += -D__ARM_NEON__ -mfpu=neon
+endif
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CFLAGS +=  -DANDROID_X86
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
+endif
+
+CORE_ROOT_DIR := ..
+CORE_DIR      := $(CORE_ROOT_DIR)/src
+
+include $(CORE_ROOT_DIR)/Makefile.common
+
+LOCAL_SRC_FILES    += $(SOURCES_C)
+
+LOCAL_C_INCLUDES = $(INCFLAGS)
+
+LOCAL_CFLAGS += $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS)
+LOCAL_CFLAGS += -O3 -std=gnu99 -ffast-math -funroll-loops -Dstricmp=strcasecmp -DINLINE="static inline" -DANDROID $(INCFLAGS)
+
+include $(BUILD_SHARED_LIBRARY)

jni/Application.mk

@@ -0,0 +1 @@
+APP_ABI := all