From 98e82247fc7a9b6b584b2eb7077e6c83d075845c Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Thu, 22 Sep 2016 11:00:47 -0700
Subject: [PATCH] make OpenGL default render method on OS X

Currently the "simple" render method is way too slow on OS X, while
Cairo is completely broken. The OpenGL renderer, on the other hand, runs
with almost no stuttering.

Also fix dangling icon file after OS X build.
---
 src/wx/CMakeLists.txt | 3 +--
 src/wx/opts.cpp       | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index 8190fc58..222096b7 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -215,8 +215,7 @@ ENDIF(NOT WIN32 AND NOT APPLE)
 if(APPLE)
     # this should set ROM file types correctly
     SET_PROPERTY(TARGET visualboyadvance-m APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
-    SET(MACOSX_BUNDLE_ICON_FILE vbam.icns)
+    SET(MACOSX_BUNDLE_ICON_FILE ${VBAM_ICON})
     SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 endif(APPLE)
 
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index d2a06312..3a9e85d5 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -275,7 +275,8 @@ opts_t::opts_t()
     audio_api = AUD_DIRECTSOUND;
 #else
 #ifdef __WXMAC__
-    audio_api = AUD_OPENAL;
+    audio_api     = AUD_OPENAL;
+    render_method = RND_OPENGL;
 #endif
 #endif
     video_scale = 3;