diff options
| author | Twinaphex | 2017-06-18 18:41:06 +0200 |
|---|---|---|
| committer | GitHub | 2017-06-18 18:41:06 +0200 |
| commit | 1aecedc999445e9a27e04f665fd562b576775d08 (patch) | |
| tree | c526c7d332be548a42364eea9113b6d33345b840 /jni | |
| parent | dc596c886e0ec2728dc353dd7862cdf1e5a5ff44 (diff) | |
| parent | bcaf44c511efaad9d803dde9b0fdbb046498c66f (diff) | |
| download | snes9x2005-1aecedc999445e9a27e04f665fd562b576775d08.tar.gz snes9x2005-1aecedc999445e9a27e04f665fd562b576775d08.tar.bz2 snes9x2005-1aecedc999445e9a27e04f665fd562b576775d08.zip | |
Merge pull request #36 from jamsilva/master
Compatibility fixes.
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 579cb12..21da6bb 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -12,12 +12,10 @@ LIBRETRO_DIR := .. DEBUG = 0 PERF_TEST = 0 -#HAVE_GRIFFIN = 1 HAVE_GRIFFIN = 0 LOAD_FROM_MEMORY_TEST = 1 USE_BLARGG_APU = 0 - LOCAL_MODULE := retro ifeq ($(TARGET_ARCH),arm) @@ -33,10 +31,9 @@ ifeq ($(TARGET_ARCH),mips) LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ endif - include ../Makefile.common LOCAL_SRC_FILES += $(SOURCES_C) -LOCAL_CFLAGS += -std=gnu99 -ffast-math -DINLINE=inline $(FLAGS) +LOCAL_CFLAGS += -std=gnu99 -ffast-math $(FLAGS) include $(BUILD_SHARED_LIBRARY) |