Partial revert of "Mac app and tests build again"

This partially reverts commit 8f155b5190.

Apple2Mac/Classes/OSX/EmulatorGLView.m

@@ -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();
+    // Init our renderer.  Use 0 for the defaultFBO which is appropriate for
-    emulator_start();
+    // OSX (but not iOS since iOS apps must create their own FBO)
-    cpu_resume();
+#if TARGET_OS_MAC
+    video_init();
+#elif TARGET_OS_IPHONE
+#   error this is OSX specific
+#else
+#   error "unknown/unsupported Apple platform
+#endif
 }
 
 - (void)reshape

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