threeoh6000/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues Pull Requests Projects Releases Wiki Activity

Fix CMake (Again) (Again)

Browse Source
This commit is contained in:
TheBrokenRail 2023-08-05 17:26:36 -04:00
parent 1dd0526197
commit 85e3cb6228
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media-layer/core/gles/CMakeLists.txt
View File

@ -1,5 +1,8 @@
project(media-layer-gles) project(media-layer-gles)
# Dependencies
add_subdirectory(dependencies)
# Build # Build
if(MCPI_HEADLESS_MODE) if(MCPI_HEADLESS_MODE)
# Stubs For Headless Mode # Stubs For Headless Mode
@ -7,9 +10,6 @@ if(MCPI_HEADLESS_MODE)
target_link_libraries(GLESv1_CM PRIVATE media-layer-headers) target_link_libraries(GLESv1_CM PRIVATE media-layer-headers)
elseif(MCPI_USE_GLES1_COMPATIBILITY_LAYER) elseif(MCPI_USE_GLES1_COMPATIBILITY_LAYER)
# GLESv1_CM Compatibility Layer # GLESv1_CM Compatibility Layer
set(GLES_COMPATIBILITY_LAYER_USE_SDL FALSE CACHE BOOL "" FORCE)
set(GLES_COMPATIBILITY_LAYER_DEPENDENCY glfw CACHE STRING "" FORCE)
add_subdirectory(dependencies/gles-compatibility-layer)
add_library(GLESv1_CM INTERFACE) add_library(GLESv1_CM INTERFACE)
target_link_libraries(GLESv1_CM INTERFACE gles-compatibility-layer) target_link_libraries(GLESv1_CM INTERFACE gles-compatibility-layer)
else() else()

10
media-layer/core/gles/dependencies/CMakeLists.txt Normal file
View File

@ -0,0 +1,10 @@
project(media-layer-core-gles-dependencies)
# GLES Compatibility Layer
if(NOT MCPI_HEADLESS_MODE AND MCPI_USE_GLES1_COMPATIBILITY_LAYER)
set(GLES_COMPATIBILITY_LAYER_USE_DEFAULT_INCLUDE_PATH FALSE CACHE BOOL "" FORCE)
set(GLES_COMPATIBILITY_LAYER_USE_SDL FALSE CACHE BOOL "" FORCE)
set(GLES_COMPATIBILITY_LAYER_DEPENDENCY glfw CACHE STRING "" FORCE)
add_subdirectory(gles-compatibility-layer)
target_link_libraries(gles-compatibility-layer media-layer-headers)
endif()

2
media-layer/core/gles/dependencies/gles-compatibility-layer

@ -1 +1 @@
Subproject commit c6f1947c1b0df71128bfb702ff1a949be5846ac0 Subproject commit 3078b267561053af3b590407ef60f8b4beae18bd