(libretro) Disable cyclone/neon for android (#13)

libretro · Nov 28, 2018 · 714208a · 714208a
2 parents c8ee25f + f3f1f31
commit 714208a
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 103 deletions.
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -8,8 +8,8 @@ INCLUDE_7Z_SUPPORT        := 1
 EXTERNAL_ZLIB             := 0
 BUILD_X64_EXE             := 0
 WANT_NEOGEOCD             := 0
-HAVE_NEON                 := 1
-USE_CYCLONE               := 1
+HAVE_NEON                 := 0
+USE_CYCLONE               := 0
 
 CFLAGS      :=
 CXXFLAGS    :=
@@ -20,7 +20,7 @@ FBA_DEFINES :=
 
 include $(ROOT_DIR)/makefile.libretro_common
 
-COMMON_FLAGS := -DUSE_CYCLONE -DUSE_SPEEDHACKS -D__LIBRETRO__ -DANDROID -DFRONTEND_SUPPORTS_RGB565 -Wno-write-strings -DLSB_FIRST $(FBA_DEFINES)
+COMMON_FLAGS := -DUSE_SPEEDHACKS -D__LIBRETRO__ -DANDROID -DFRONTEND_SUPPORTS_RGB565 -Wno-write-strings -DLSB_FIRST $(FBA_DEFINES)
 
 # Build shared library including static C module
 include $(CLEAR_VARS)

diff --git a/makefile.libretro b/makefile.libretro
@@ -479,10 +479,6 @@ ifeq ($(FASTCALL), 1)
    FBA_DEFINES += -DFASTCALL
 endif
 
-ifeq ($(USE_CYCLONE), 1)
-   FBA_DEFINES += -DUSE_CYCLONE
-endif
-
 ifeq ($(FASTMATH), 1)
    ifeq (,$(findstring msvc,$(platform)))
       CFLAGS += -ffast-math

diff --git a/makefile.libretro_common b/makefile.libretro_common
@@ -305,6 +305,7 @@ INCLUDE_DIRS := $(FBA_BURNER_DIR)/win32 \
 ARM_FLAGS =
 
 ifeq ($(USE_CYCLONE), 1)
+	FBA_DEFINES		+= -DUSE_CYCLONE
 	INCLUDE_DIRS	+= $(FBA_CPU_DIR)/cyclone
 	SOURCES_S		+= $(FBA_CPU_DIR)/cyclone/Cyclone.S
 	BURN_BLACKLIST	+= $(FBA_CPU_DIR)/m68000_intf.cpp

diff --git a/src/burn/drv/atari/d_gauntlet.cpp b/src/burn/drv/atari/d_gauntlet.cpp
@@ -3,7 +3,6 @@
 
 // to do:
 //	play test hard!! verify
-//  remove internal sound device, add atariJSA device
 
 #include "tiles_generic.h"
 #include "m68000_intf.h"