Merge pull request #24 from rkitover/master

make OpenGL default render method on OS X

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)
 

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;