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

macOS: Fix modern build with libepoxy (fixes #2700)

This commit is contained in:
Vicki Pfau 2022-10-20 20:11:19 -07:00
parent 455525e3b6
commit 12f7168e9f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -8,6 +8,7 @@ Other fixes:
- Res: Fix species name location in Ruby/Sapphire revs 1/2 (fixes mgba.io/i/2685) - Res: Fix species name location in Ruby/Sapphire revs 1/2 (fixes mgba.io/i/2685)
Misc: Misc:
- macOS: Add category to plist (closes mgba.io/i/2691) - macOS: Add category to plist (closes mgba.io/i/2691)
- macOS: Fix modern build with libepoxy (fixes mgba.io/i/2700)
- Qt: Keep track of current pslette preset name (fixes mgba.io/i/2680) - Qt: Keep track of current pslette preset name (fixes mgba.io/i/2680)
0.10.0: (2022-10-11) 0.10.0: (2022-10-11)

8
CMakeLists.txt
View File

@ -718,8 +718,12 @@ if (USE_LZMA)
endif() endif()
if(USE_EPOXY) if(USE_EPOXY)
list(APPEND FEATURE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/opengl/gl.c ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/opengl/gles2.c) if(NOT APPLE OR NOT MACOSX_SDK VERSION_GREATER 10.14)
list(APPEND FEATURE_DEFINES BUILD_GL BUILD_GLES2 BUILD_GLES3) list(APPEND FEATURE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/opengl/gl.c)
list(APPEND FEATURE_DEFINES BUILD_GL)
endif()
list(APPEND FEATURE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/opengl/gles2.c)
list(APPEND FEATURE_DEFINES BUILD_GLES2 BUILD_GLES3)
list(APPEND FEATURES EPOXY) list(APPEND FEATURES EPOXY)
include_directories(AFTER ${EPOXY_INCLUDE_DIRS}) include_directories(AFTER ${EPOXY_INCLUDE_DIRS})
link_directories(${EPOXY_LIBRARY_DIRS}) link_directories(${EPOXY_LIBRARY_DIRS})