Skip to content

Commit

Permalink
macOS: Fix modern build with libepoxy (fixes #2700)
Browse files Browse the repository at this point in the history
  • Loading branch information
endrift committed Oct 21, 2022
1 parent 75da9f0 commit 981d011
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES
Expand Up @@ -12,6 +12,7 @@ Other fixes:
Misc:
- GB Serialize: Add missing savestate support for MBC6 and NT (newer)
- 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)

0.10.0: (2022-10-11)
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
Expand Up @@ -718,8 +718,12 @@ if (USE_LZMA)
endif()

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)
list(APPEND FEATURE_DEFINES BUILD_GL BUILD_GLES2 BUILD_GLES3)
if(NOT APPLE OR NOT MACOSX_SDK VERSION_GREATER 10.14)
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)
include_directories(AFTER ${EPOXY_INCLUDE_DIRS})
link_directories(${EPOXY_LIBRARY_DIRS})
Expand Down

0 comments on commit 981d011

Please sign in to comment.