Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-08 16:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Excise unused preprocessor macro

Browse Source
This commit is contained in:
Aaron Culliney 2016-07-23 12:00:20 -07:00
parent cc9a164bec
commit fc9ad6d4e1
6 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android/jni/sources.mk
View File

@ -40,7 +40,7 @@ APPLE2_MAIN_SRC = \
jnihooks.c androidkeys.c
APPLE2_OPTIM_CFLAGS := -Os
APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -std=gnu11 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH)
APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -std=gnu11 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH)
APPLE2_BASE_LDLIBS := -Wl,-z,text -Wl,-z,noexecstack -llog -landroid -lGLESv2 -lz -lOpenSLES -latomic
LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures

20
Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj
View File

@ -2773,7 +2773,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_CPU=1",
"VIDEO_OPENGL=1",
@ -2810,7 +2809,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_CPU=1",
"VIDEO_OPENGL=1",
@ -2850,7 +2848,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_VM=1",
"VIDEO_OPENGL=1",
@ -2887,7 +2884,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_VM=1",
"VIDEO_OPENGL=1",
@ -2927,7 +2923,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_DISK=1",
"CPU_TRACING=1",
@ -2967,7 +2962,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_DISK=1",
"CPU_TRACING=1",
@ -3010,7 +3004,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_DISPLAY=1",
"VIDEO_OPENGL=1",
@ -3047,7 +3040,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"TESTING=1",
"TEST_DISPLAY=1",
"VIDEO_OPENGL=1",
@ -3080,7 +3072,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TEST_DISK=1",
"TESTING=1",
@ -3112,7 +3103,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TEST_DISK=1",
"TESTING=1",
@ -3145,7 +3135,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TEST_VM=1",
"TESTING=1",
@ -3174,7 +3163,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TEST_VM=1",
"TESTING=1",
@ -3316,7 +3304,6 @@
GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"VIDEO_OPENGL=1",
);
@ -3345,7 +3332,6 @@
GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"VIDEO_OPENGL=1",
"NDEBUG=1",
@ -3375,7 +3361,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TEST_CPU=1",
"TESTING=1",
@ -3404,7 +3389,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TEST_CPU=1",
"TESTING=1",
@ -3434,7 +3418,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TESTING=1",
"TEST_DISPLAY=1",
@ -3463,7 +3446,6 @@
GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"APPLE2IX=1",
"DEBUGGER=1",
"KEYPAD_JOYSTICK=1",
"TESTING=1",
"TEST_DISPLAY=1",
@ -3500,7 +3482,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"VIDEO_OPENGL=1",
);
INFOPLIST_FILE = "$(SRCROOT)/Apple2iOS/Apple2iOS-Info.plist";
@ -3535,7 +3516,6 @@
"APPLE2IX=1",
"INTERFACE_TOUCH=1",
"MOBILE_DEVICE=1",
"DEBUGGER=1",
"VIDEO_OPENGL=1",
"NDEBUG=1",
);

1
configure.ac
View File

@ -302,7 +302,6 @@ AS_IF([test "x$openal_supported" = "xyes"], [
dnl ---------------------------------------------------------------------------
dnl Debugger & classic interface ...
AC_ARG_ENABLE([debugger], AS_HELP_STRING([--disable-debugger], [Disable 6502 debugging console]), [], [
AC_DEFINE(DEBUGGER, 1, [Enable 6502 debugger module])
META_O="src/meta/debug.o src/meta/debugger.o src/meta/opcodes.o src/test/sha1.o"
dnl HACK there's gotta be a better way ... without this verbosity, CFLAGS are not correct (lacking -DTESTING=1 , etc) if we don't specify specific obj files for test binaries
testcpu_META_O="src/meta/testcpu-debug.o src/meta/testcpu-debugger.o src/meta/testcpu-opcodes.o src/test/testcpu-sha1.o"

2
src/interface.c
View File

@ -1572,11 +1572,9 @@ static void *interface_thread(void *current_key)
c_interface_keyboard_layout();
break;
#ifdef DEBUGGER
case kF7:
c_interface_debugging();
break;
#endif
case kF8:
c_interface_credits();

2
src/keys.c
View File

@ -469,9 +469,7 @@ bool c_keys_is_interface_key(int key)
case kF1:
case kF2:
case kF5:
#ifdef DEBUGGER
case kF7:
#endif
case kF8:
case kF10:
return true;

4
src/meta/debug.h
View File

@ -19,11 +19,7 @@
#include "common.h"
#ifdef DEBUGGER
extern volatile bool is_debugging;
#else
#define is_debugging false
#endif
typedef enum {
STEPPING = 0,