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

Mac app and tests build again

Browse Source
This commit is contained in:
Aaron Culliney 2018-01-20 08:14:08 -08:00
parent e4e0c941d3
commit 8f155b5190
6 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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",

9
Apple2Mac/Apple2Mac/Apple2Mac-Prefix.pch
View File

@ -1,9 +0,0 @@
//
// Prefix header
//
// The contents of this file are implicitly included at the beginning of every source file.
//
#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
#endif

18
Apple2Mac/Classes/OSX/EmulatorGLView.m
View File

@ -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

16
Apple2Mac/Classes/OSX/EmulatorJoystickController.m
View File

@ -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;
}
}

6
Apple2Mac/main.m
View File

@ -11,6 +11,10 @@
#if TARGET_OS_IPHONE
# import "AppDelegate.h"
#elif TARGET_OS_MAC
# import <AppKit/NSApplication.h>
#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]));

2
src/misc.c
View File

@ -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