Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-12-23 11:31:41 +00:00
Code Issues Projects Releases Wiki Activity

Partial revert of "Mac app and tests build again"

Browse Source 
This partially reverts commit 8f155b5190.
This commit is contained in:
Aaron Culliney 2018-01-20 17:36:43 -08:00
parent 4aa75a59c8
commit 807b441ab1
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,13 +229,23 @@ 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];
cpu_pause();
emulator_start();
cpu_resume();
// 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
}
- (void)reshape

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_PHONE && !defined(ANDROID)
#if !(TARGET_OS_MAC || TARGET_OS_PHONE) && !defined(ANDROID)
video_init();
#endif