Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-02-28 21:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix Apple2Mac build

Browse Source
This commit is contained in:
Aaron Culliney 2018-01-22 07:33:33 -08:00
parent dd42645c4c
commit 154b9a7ef8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apple2Mac/Classes/OSX/EmulatorPrefsController.m
View File

@ -295,8 +295,8 @@
if (![self.joystickCalibrationView isHidden]) if (![self.joystickCalibrationView isHidden])
{ {
[self.joystickCalibrationView setNeedsDisplay:YES]; [self.joystickCalibrationView setNeedsDisplay:YES];
[self.button0Pressed setHidden:!(joy_button0)]; [self.button0Pressed setHidden:!(run_args.joy_button0)];
[self.button1Pressed setHidden:!(joy_button1)]; [self.button1Pressed setHidden:!(run_args.joy_button1)];
} }
} }
@ -324,8 +324,8 @@
leftAltEngaged = NO; leftAltEngaged = NO;
rightAltEngaged = NO; rightAltEngaged = NO;
} }
[self.button0Pressed setHidden:!(joy_button0)]; [self.button0Pressed setHidden:!(run_args.joy_button0)];
[self.button1Pressed setHidden:!(joy_button1)]; [self.button1Pressed setHidden:!(run_args.joy_button1)];
} }
- (void)_handleKeyEvent:(NSEvent *)event pressed:(BOOL)pressed - (void)_handleKeyEvent:(NSEvent *)event pressed:(BOOL)pressed

6
Apple2Mac/main.m
View File

@ -24,7 +24,11 @@ int main(int argc_, char *argv_[])
int retVal = 1; int retVal = 1;
argc = argc_; argc = argc_;
argv = argv_; argv = argv_;
#if !TESTING
cpu_pause();
#endif
@autoreleasepool { @autoreleasepool {
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
retVal = UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); retVal = UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));