ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from rkitover/master 

make OpenGL default render method on OS X
This commit is contained in:
Zach Bacon 2016-09-23 22:16:07 -04:00 committed by GitHub
parent 30801e1554 98e82247fc
commit 153a5bf686
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wx/CMakeLists.txt
View File

@ -215,8 +215,7 @@ ENDIF(NOT WIN32 AND NOT APPLE)
if(APPLE) if(APPLE)
# this should set ROM file types correctly # this should set ROM file types correctly
SET_PROPERTY(TARGET visualboyadvance-m APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in) 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_ICON})
SET(MACOSX_BUNDLE_ICON_FILE vbam.icns)
SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif(APPLE) endif(APPLE)

1
src/wx/opts.cpp
View File

@ -276,6 +276,7 @@ opts_t::opts_t()
#else #else
#ifdef __WXMAC__ #ifdef __WXMAC__
audio_api = AUD_OPENAL; audio_api = AUD_OPENAL;
render_method = RND_OPENGL;
#endif #endif
#endif #endif
video_scale = 3; video_scale = 3;