use submodules for externals

malytomas · malytomas · commit 9adba06ea8c0 · 2025-07-18T11:03:21.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,6 @@
 config.mk
 build/
 libmgl.dylib
-external/glfw/src/MGLContext.h
-external/glfw/src/MGLRenderer.h
-external/OpenGL-Registry/
-external/SPIRV-Cross/
-external/SPIRV-Headers/
-external/SPIRV-Tools/
-external/ezxml/
-external/glslang/
 *.DS_Store
 /SPIRV-Headers
 /SPIRV-Cross
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "external/glslang"]
+	path = external/glslang
+	url = https://github.com/KhronosGroup/glslang.git
+[submodule "external/SPIRV-Cross"]
+	path = external/SPIRV-Cross
+	url = https://github.com/r58Playz/SPIRV-Cross.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,15 @@
 cmake_minimum_required(VERSION 3.15)
 project(MGL LANGUAGES C CXX OBJC)
 
-execute_process(COMMAND "bash" "build_external.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/external" COMMAND_ECHO STDOUT)
-
 set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD 20)
 
+set(ENABLE_OPT ON)
+
+add_subdirectory(external/SPIRV-Cross)
+add_subdirectory(external/glslang)
+add_subdirectory(external/glfw)
+
 include_directories(
 	MGL/SPIRV/SPIRV-Cross
 	MGL/include
diff --git a/external/SPIRV-Cross b/external/SPIRV-Cross
@@ -0,0 +1 @@
+Subproject commit 1884e758a2ccddc3b3ab7e8ce9511400f86f58fd
diff --git a/external/build_external.sh b/external/build_external.sh
diff --git a/external/glfw/src/MGLContext.h b/external/glfw/src/MGLContext.h
@@ -0,0 +1 @@
+../../../MGL/include/MGLContext.h
diff --git a/external/glfw/src/MGLRenderer.h b/external/glfw/src/MGLRenderer.h
@@ -0,0 +1 @@
+../../../MGL/include/MGLRenderer.h
diff --git a/external/glslang b/external/glslang
@@ -0,0 +1 @@
+Subproject commit eb77189a282b90e9856fc0ed5b08361a70025bec
