Skip to content

Commit ae1a4d3

Browse files
committed
avoid submodule for macos
1 parent 08f8cd4 commit ae1a4d3

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,3 @@
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/ucpu/mgl.git

externals/mgl/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/mgl

externals/mgl/CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,9 @@ if(NOT APPLE)
77
return()
88
endif()
99

10-
add_subdirectory(mgl)
11-
12-
add_library(glfw-imp STATIC IMPORTED)
13-
set_target_properties(glfw-imp PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/mgl/external/glfw/build/src/libglfw3.a")
10+
execute_process(COMMAND "bash" "clone.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" COMMAND_ECHO STDOUT)
1411

15-
add_library(glfw INTERFACE)
16-
target_link_libraries(glfw INTERFACE glfw-imp mgl)
17-
target_include_directories(glfw INTERFACE "mgl/external/glfw/include")
18-
19-
add_dependencies(glfw mgl)
12+
add_subdirectory(mgl)
2013

2114
add_library(glm INTERFACE)
2215
target_include_directories(glm INTERFACE "mgl/MGL/include")

externals/mgl/clone.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
if [ ! -d "mgl" ]; then
3+
git clone --recursive https://github.com/ucpu/mgl.git
4+
fi

externals/mgl/mgl

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)