use submodules for externals

Author: malytomas

.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

.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

CMakeLists.txt

@@ -1,12 +1,28 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.31)
 project(MGL LANGUAGES C CXX OBJC)
 
-execute_process(COMMAND "bash" "build_external.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/external" COMMAND_ECHO STDOUT)
+execute_process(COMMAND "python3" "update_glslang_sources.py" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/external/glslang" COMMAND_ECHO STDOUT)
 
+set(CMAKE_SKIP_INSTALL_RULES TRUE) # disable installs
+set(CMAKE_POLICY_VERSION_MINIMUM 3.31) # override cmake minimum version for dependencies
 set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD 20)
+set(SPIRV_CROSS_CLI OFF CACHE INTERNAL "Build the CLI binary. Requires SPIRV_CROSS_STATIC.")
+set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE INTERNAL "Enable SPIRV-Cross tests.")
+set(SPIRV_CROSS_SKIP_INSTALL ON CACHE INTERNAL "Skips installation targets.")
+set(ENABLE_OPT ON CACHE INTERNAL "use spirv-tools inside glslang")
 
-include_directories(
+add_subdirectory(external/SPIRV-Cross)
+add_subdirectory(external/glslang)
+add_subdirectory(external/glfw)
+
+file(GLOB_RECURSE MGL_SOURCES
+	MGL/src/*.c
+	MGL/src/*.m
+	MGL/spirv_cross_c.cpp
+)
+add_library(mgl_static STATIC ${MGL_SOURCES})
+target_include_directories(mgl_static PUBLIC 
 	MGL/SPIRV/SPIRV-Cross
 	MGL/include
 	MGL/include/GL
@@ -16,39 +32,17 @@ include_directories(
 	external/glslang/glslang/Include
 	external/glslang/glslang/Public
 )
-
-file(GLOB_RECURSE MGL_SOURCES
-	MGL/src/*.c
-	MGL/src/*.m
-	MGL/spirv_cross_c.cpp
-)
-
-add_library(mgl STATIC ${MGL_SOURCES})
-
-target_link_libraries(mgl PUBLIC
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-c.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-core.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-cpp.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-glsl.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-hlsl.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-msl.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-reflect.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/SPIRV-Cross/build/libspirv-cross-util.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/External/spirv-tools/source/diff/libSPIRV-Tools-diff.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/External/spirv-tools/source/libSPIRV-Tools.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/External/spirv-tools/source/link/libSPIRV-Tools-link.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/External/spirv-tools/source/lint/libSPIRV-Tools-lint.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/External/spirv-tools/source/opt/libSPIRV-Tools-opt.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/External/spirv-tools/source/reduce/libSPIRV-Tools-reduce.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/SPIRV/libSPIRV.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/glslang/OSDependent/Unix/libOSDependent.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/glslang/libGenericCodeGen.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/glslang/libMachineIndependent.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/glslang/libglslang-default-resource-limits.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/glslang/libglslang.a"
+target_link_libraries(mgl_static PUBLIC
+	spirv-cross-glsl
+	spirv-cross-hlsl
+	spirv-cross-cpp
+	spirv-cross-reflect
+	spirv-cross-msl
+	spirv-cross-util
+	spirv-cross-core
+	glslang
 )
-
-target_link_libraries(mgl PUBLIC
+target_link_libraries(mgl_static PUBLIC
 	"-framework AppKit"
 	"-framework Cocoa"
 	"-framework CoreFoundation"
@@ -59,19 +53,10 @@ target_link_libraries(mgl PUBLIC
 	"-framework QuartzCore"
 )
 
-if(MGL_BUILD_TEST)
-	add_library(glfw-imp STATIC IMPORTED)
-	set_target_properties(glfw-imp PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/external/glfw/build/src/libglfw3.a")
-
-	add_library(glfw INTERFACE)
-	target_link_libraries(glfw INTERFACE glfw-imp mgl)
-	target_include_directories(glfw INTERFACE "external/glfw/include")
-
-	add_dependencies(glfw mgl)
-
-	add_library(glm INTERFACE)
-	target_include_directories(glm INTERFACE "mgl/MGL/include")
+target_link_libraries(glfw PUBLIC mgl_static)
 
+option(MGL_BUILD_TEST "Build mgl_test" OFF)
+if(MGL_BUILD_TEST)
 	add_executable(mgl_test mgl_test.cpp)
-	target_link_libraries(mgl_test glfw glm)
+	target_link_libraries(mgl_test mgl_static glfw)
 endif()

external/SPIRV-Cross

@@ -161,7 +161,7 @@ if (GLFW_BUILD_WIN32)
 endif()
 
 if (GLFW_BUILD_COCOA)
-    target_link_libraries(glfw PRIVATE "-L /usr/local/lib -lmgl"
+    target_link_libraries(glfw PRIVATE "-L /usr/local/lib"
                                        "-framework Cocoa"
                                        "-framework IOKit"
                                        "-framework CoreFoundation")

external/build_external.sh

@@ -0,0 +1 @@
+../../../MGL/include/MGLContext.h

external/glfw/src/CMakeLists.txt

@@ -0,0 +1 @@
+../../../MGL/include/MGLRenderer.h