Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-12 21:30:07 +00:00
Code Issues Projects Releases Wiki Activity

REFACTOR : macro defines into toggles

Browse Source
This commit is contained in:
Aaron Culliney 2015-02-15 18:32:45 -08:00
parent eced1c9edf
commit 1c31c1074d
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick.c
View File

@ -247,7 +247,7 @@ void c_calibrate_joystick()
extern void gldriver_joystick_reset(void); extern void gldriver_joystick_reset(void);
void c_joystick_reset() void c_joystick_reset()
{ {
#if VIDEO_OPENGL && !defined(TESTING) #if VIDEO_OPENGL && !TESTING
if (!is_headless) { if (!is_headless) {
gldriver_joystick_reset(); gldriver_joystick_reset();
} }

12
src/meta/debugger.c
View File

@ -16,7 +16,7 @@
#include "common.h" #include "common.h"
#ifdef HAVE_OPENSSL #if HAVE_OPENSSL
#include <openssl/sha.h> #include <openssl/sha.h>
#endif #endif
@ -726,7 +726,7 @@ void show_regs() {
++num_buffer_lines; ++num_buffer_lines;
} }
#if !defined(TESTING) #if !TESTING
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
will_branch () = will instruction branch? will_branch () = will instruction branch?
-1 - n/a -1 - n/a
@ -1100,7 +1100,7 @@ void clear_debugger_screen() {
fb_sha1 () -- prints SHA1 of the current Apple // framebuffer fb_sha1 () -- prints SHA1 of the current Apple // framebuffer
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
void fb_sha1() { void fb_sha1() {
#ifdef HAVE_OPENSSL #if HAVE_OPENSSL
uint8_t md[SHA_DIGEST_LENGTH]; uint8_t md[SHA_DIGEST_LENGTH];
char buf[(SHA_DIGEST_LENGTH*2)+1]; char buf[(SHA_DIGEST_LENGTH*2)+1];
@ -1174,8 +1174,8 @@ static int begin_cpu_stepping() {
ERRLOG("pthread_cond_wait : %d", err); ERRLOG("pthread_cond_wait : %d", err);
} }
#ifdef TESTING #if TESTING
#warning FIXME TODO : this is mis-named now ... GLVideo pushes sync state so we don't need to force poll ... but we need this to type the testing strings ... should refactor to leverage a common codepath, preferablly using the 'typing' mechanism here... #warning FIXME TODO : this is mis-named now ... GLVideo pushes sync state so we do not need to force poll ... but we need this to type the testing strings ... should refactor to leverage a common codepath, preferablly using the 'typing' mechanism here...
extern void testing_video_sync(); extern void testing_video_sync();
testing_video_sync(); testing_video_sync();
#else #else
@ -1289,7 +1289,7 @@ int debugger_go(stepping_struct_t s) {
int ch = begin_cpu_stepping(); int ch = begin_cpu_stepping();
#if !defined(TESTING) #if !TESTING
if (stepping_struct.step_type != LOADING) { if (stepping_struct.step_type != LOADING) {
clear_debugger_screen(); clear_debugger_screen();
disasm(cpu65_pc, 1, 0, -1); disasm(cpu65_pc, 1, 0, -1);

2
src/misc.c
View File

@ -619,7 +619,7 @@ void c_initialize_firsttime(void) {
#endif #endif
} }
#if !defined(TESTING) && !defined(__APPLE__) #if !TESTING && !defined(__APPLE__)
extern void *cpu_thread(void *dummyptr); extern void *cpu_thread(void *dummyptr);
int main(int _argc, char **_argv) { int main(int _argc, char **_argv) {

2
src/video/glinput.c
View File

@ -15,7 +15,7 @@
#include "video/glinput.h" #include "video/glinput.h"
#include <math.h> #include <math.h>
#if !defined(TESTING) #if !TESTING
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// //

2
src/video/glvideo.c
View File

@ -731,7 +731,7 @@ static void gldriver_init_glut(GLuint fbo) {
glutDisplayFunc(gldriver_render); glutDisplayFunc(gldriver_render);
glutReshapeFunc(gldriver_reshape); glutReshapeFunc(gldriver_reshape);
#if !defined(TESTING) #if !TESTING
glutKeyboardFunc(gldriver_on_key_down); glutKeyboardFunc(gldriver_on_key_down);
glutKeyboardUpFunc(gldriver_on_key_up); glutKeyboardUpFunc(gldriver_on_key_up);
glutSpecialFunc(gldriver_on_key_special_down); glutSpecialFunc(gldriver_on_key_special_down);

4
src/video/xvideo.c
View File

@ -189,7 +189,7 @@ static void getshm(int size) {
} }
#endif #endif
#if !defined(TESTING) #if !TESTING
// Map X keysyms into Apple//ix internal-representation scancodes. // Map X keysyms into Apple//ix internal-representation scancodes.
static int keysym_to_scancode(void) { static int keysym_to_scancode(void) {
int rc = XkbKeycodeToKeysym(display, xevent.xkey.keycode, 0, 0); int rc = XkbKeycodeToKeysym(display, xevent.xkey.keycode, 0, 0);
@ -440,7 +440,7 @@ void video_driver_sync(void) {
// also process other input events // also process other input events
post_image(); post_image();
#ifdef TESTING #if TESTING
// no input processing if test-driven ... // no input processing if test-driven ...
#else #else
bool keyevent = true; bool keyevent = true;