File tree Expand file tree Collapse file tree 7 files changed +38
-0
lines changed Expand file tree Collapse file tree 7 files changed +38
-0
lines changed Original file line number Diff line number Diff line change 121121[submodule "externals/wamr/zydis "]
122122 path = externals/wamr/zydis
123123 url = https://github.com/zyantific/zydis.git
124+ [submodule "externals/mgl/mgl "]
125+ path = externals/mgl/mgl
126+ url = https://github.com/openglonmetal/MGL.git
Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ function(cage_copy_redist)
2727 cage_copy_redist_license("${cage_copy_redist_current_list_dir} /../externals/hsluv/hsluv.h" "hsluv" COPYONLY )
2828 cage_copy_redist_license("${cage_copy_redist_current_list_dir} /../externals/jpeg/jpeg/LICENSE.md" "jpeg" COPYONLY )
2929 cage_copy_redist_license("${cage_copy_redist_current_list_dir} /../externals/mbedtls/mbedtls/LICENSE" "mbedtls" COPYONLY )
30+ cage_copy_redist_license("${cage_copy_redist_current_list_dir} /../externals/mgl/mgl/LICENSE" "mgl" COPYONLY )
3031 cage_copy_redist_license("${cage_copy_redist_current_list_dir} /../externals/msdfgen/msdfgen/LICENSE.txt" "msdfgen" COPYONLY )
3132 cage_copy_redist_license("${cage_copy_redist_current_list_dir} /../externals/ogg/ogg/COPYING" "ogg" COPYONLY )
3233 cage_copy_redist_license("${cage_copy_redist_current_list_dir} /../externals/openxr-sdk/OpenXR-SDK/LICENSE" "openxr-sdk" COPYONLY )
Original file line number Diff line number Diff line change @@ -96,6 +96,7 @@ add_subdirectory(fastnoise)
9696add_subdirectory (glad)
9797add_subdirectory (glfw)
9898add_subdirectory (glm)
99+ add_subdirectory (mgl)
99100add_subdirectory (openxr-sdk)
100101add_subdirectory (plf)
101102add_subdirectory (simplefilewatcher)
@@ -191,6 +192,7 @@ external_target_properties(libzstd_static)
191192external_target_properties(mbedcrypto)
192193external_target_properties(mbedtls)
193194external_target_properties(mbedx509)
195+ external_target_properties(mgl)
194196external_target_properties(ogg)
195197external_target_properties(openxr_loader)
196198external_target_properties(p256m)
Original file line number Diff line number Diff line change @@ -2,6 +2,11 @@ message(STATUS "----------------------------------------------------------------
22message (STATUS "glfw" )
33message (STATUS "----------------------------------------------------------------" )
44
5+ if (APPLE )
6+ message (STATUS "skipping on macos - it is provided with mgl" )
7+ return ()
8+ endif ()
9+
510set (GLFW_BUILD_EXAMPLES OFF CACHE INTERNAL "Build the GLFW example programs" )
611set (GLFW_BUILD_TESTS OFF CACHE INTERNAL "Build the GLFW test programs" )
712set (GLFW_BUILD_DOCS OFF CACHE INTERNAL "Build the GLFW documentation" )
Original file line number Diff line number Diff line change @@ -2,6 +2,11 @@ message(STATUS "----------------------------------------------------------------
22message (STATUS "glm" )
33message (STATUS "----------------------------------------------------------------" )
44
5+ if (APPLE )
6+ message (STATUS "skipping on macos - it is provided with mgl" )
7+ return ()
8+ endif ()
9+
510add_library (glm INTERFACE )
611target_include_directories (glm INTERFACE "${CMAKE_CURRENT_SOURCE_DIR} /glm" )
712
Original file line number Diff line number Diff line change 1+ message (STATUS "----------------------------------------------------------------" )
2+ message (STATUS "mgl" )
3+ message (STATUS "----------------------------------------------------------------" )
4+
5+ if (NOT APPLE )
6+ message (STATUS "mgl is used on macos only - skipping" )
7+ return ()
8+ endif ()
9+
10+ include (ExternalProject)
11+
12+ ExternalProject_Add(mgl
13+ PREFIX ${CMAKE_CURRENT_BINARY_DIR} /mgl_build
14+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} /mgl
15+ CONFIGURE_COMMAND "" # skip ./configure
16+ BUILD_COMMAND make
17+ INSTALL_COMMAND "" # skip installation
18+ )
19+
20+ add_library (glfw ALIAS mgl)
21+ add_library (glm ALIAS mgl)
You can’t perform that action at this time.
0 commit comments