diff --git a/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj b/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj index 1a93aa27..9ab84cad 100644 --- a/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj +++ b/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj @@ -3782,7 +3782,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -3810,7 +3810,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -3839,7 +3839,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -3873,7 +3873,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4216,7 +4216,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4245,7 +4245,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4275,7 +4275,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4303,7 +4303,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4501,7 +4501,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4529,7 +4529,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4558,7 +4558,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", @@ -4586,7 +4586,7 @@ CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Apple2Mac/Apple2Mac-Prefix.pch"; + GCC_PREFIX_HEADER = "Apple2Mac-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "APPLE2IX=1", "KEYPAD_JOYSTICK=1", diff --git a/Apple2Mac/Apple2Mac/Apple2Mac-Prefix.pch b/Apple2Mac/Apple2Mac/Apple2Mac-Prefix.pch deleted file mode 100644 index 35d76409..00000000 --- a/Apple2Mac/Apple2Mac/Apple2Mac-Prefix.pch +++ /dev/null @@ -1,9 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - -#ifdef __OBJC__ - #import -#endif diff --git a/Apple2Mac/Classes/OSX/EmulatorGLView.m b/Apple2Mac/Classes/OSX/EmulatorGLView.m index 124afcd9..7c6ee9e7 100644 --- a/Apple2Mac/Classes/OSX/EmulatorGLView.m +++ b/Apple2Mac/Classes/OSX/EmulatorGLView.m @@ -229,23 +229,13 @@ static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt # endif #endif - cpu_pause(); - emulator_start(); - cpu_resume(); - // Synchronize buffer swaps with vertical refresh rate GLint swapInt = 1; [[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; - - // Init our renderer. Use 0 for the defaultFBO which is appropriate for - // OSX (but not iOS since iOS apps must create their own FBO) -#if TARGET_OS_MAC - video_init(); -#elif TARGET_OS_IPHONE -# error this is OSX specific -#else -# error "unknown/unsupported Apple platform -#endif + + cpu_pause(); + emulator_start(); + cpu_resume(); } - (void)reshape diff --git a/Apple2Mac/Classes/OSX/EmulatorJoystickController.m b/Apple2Mac/Classes/OSX/EmulatorJoystickController.m index 5bf1b43a..dee9dbc4 100644 --- a/Apple2Mac/Classes/OSX/EmulatorJoystickController.m +++ b/Apple2Mac/Classes/OSX/EmulatorJoystickController.m @@ -179,11 +179,11 @@ #endif // sample buttons only if apple keys aren't pressed. keys get set to 0xff, and js buttons are set to 0x80. - if ((buttonNumber == 0x01) && !(joy_button0 & 0x7f)) { - joy_button0 = 0x80; + if ((buttonNumber == 0x01) && !(run_args.joy_button0 & 0x7f)) { + run_args.joy_button0 = 0x80; } - if ((buttonNumber == 0x02) && !(joy_button1 & 0x7f)) { - joy_button1 = 0x80; + if ((buttonNumber == 0x02) && !(run_args.joy_button1 & 0x7f)) { + run_args.joy_button1 = 0x80; } } @@ -196,11 +196,11 @@ #endif // sample buttons only if apple keys aren't pressed. keys get set to 0xff, and js buttons are set to 0x80. - if ((buttonNumber == 0x01) && !(joy_button0 & 0x7f)) { - joy_button0 = 0x0; + if ((buttonNumber == 0x01) && !(run_args.joy_button0 & 0x7f)) { + run_args.joy_button0 = 0x0; } - if ((buttonNumber == 0x02) && !(joy_button1 & 0x7f)) { - joy_button1 = 0x0; + if ((buttonNumber == 0x02) && !(run_args.joy_button1 & 0x7f)) { + run_args.joy_button1 = 0x0; } } diff --git a/Apple2Mac/main.m b/Apple2Mac/main.m index 0b91c812..d9943236 100644 --- a/Apple2Mac/main.m +++ b/Apple2Mac/main.m @@ -11,6 +11,10 @@ #if TARGET_OS_IPHONE # import "AppDelegate.h" +#elif TARGET_OS_MAC +# import +#else +# error what new devilry is this? #endif #include "common.h" @@ -21,8 +25,6 @@ int main(int argc_, char *argv_[]) argc = argc_; argv = argv_; - cpu_pause(); - @autoreleasepool { #if TARGET_OS_IPHONE retVal = UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); diff --git a/src/misc.c b/src/misc.c index c4b21bf1..f565e6d9 100644 --- a/src/misc.c +++ b/src/misc.c @@ -418,7 +418,7 @@ void emulator_start(void) { c_keys_set_key(kF8); // show credits before emulation start #endif -#if !(TARGET_OS_MAC || TARGET_OS_PHONE) && !defined(ANDROID) +#if !TARGET_OS_PHONE && !defined(ANDROID) video_init(); #endif