use spirv from glslang

Author: malytomas

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake ..
+        cmake -DMGL_BUILD_TEST=TRUE ..
 
     - name: Build
       run: |

CMakeLists.txt

@@ -1,20 +1,22 @@
 cmake_minimum_required(VERSION 3.15)
 project(MGL LANGUAGES C CXX OBJC)
 
-execute_process(COMMAND "bash" "clone_external.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/external" COMMAND_ECHO STDOUT)
 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)
 
 # Include paths
 include_directories(
+	#external/SPIRV-Tools/include
 	MGL/SPIRV/SPIRV-Cross
 	MGL/include
 	MGL/include/GL
 	external/SPIRV-Cross
-	external/SPIRV-Tools/include
+	external/SPIRV-Headers/include
+	external/glslang/SPIRV
 	external/glslang/glslang/Include
+	external/glslang/glslang/Public
 )
 
 # Gather all source files
@@ -29,20 +31,20 @@ add_library(mgl STATIC ${MGL_SOURCES})
 
 # Link libraries
 target_link_libraries(mgl PUBLIC
-	"${CMAKE_CURRENT_LIST_DIR}/external/glslang/build/glslang/libGenericCodeGen.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/glslang/build/glslang/libMachineIndependent.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/glslang/build/glslang/libglslang-default-resource-limits.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/glslang/build/glslang/libglslang.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/glslang/build/glslang/OSDependent/Unix/libOSDependent.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/glslang/build/SPIRV/libSPIRV.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-c.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-core.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-cpp.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-glsl.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-hlsl.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-msl.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-reflect.a"
-	"${CMAKE_CURRENT_LIST_DIR}/external/SPIRV-Cross/build/libspirv-cross-util.a"
+	"${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/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"
 )
 
 # macOS Frameworks
@@ -56,3 +58,20 @@ target_link_libraries(mgl PUBLIC
 	"-framework OpenGL"
 	"-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")
+
+	add_executable(mgl_test mgl_test.cpp)
+	target_link_libraries(mgl_test glfw glm)
+endif()

external/build_external.sh

@@ -1,35 +1,36 @@
-set SDKROOT=`xcrun --show-sdk-path`
+#!/bin/bash
 
-cp ../MGL/include/MGLContext.h glfw/src
-cp ../MGL/include/MGLRenderer.h glfw/src
-cd SPIRV-Tools
-mkdir build
-cd build
-cmake ..
-make -j 4
-cd ../..
+set -e  # Stop on error
+
+# Optional: for macOS SDK if you're using system frameworks
+# export SDKROOT=$(xcrun --show-sdk-path)
+
+# Clone only the required repositories
+git clone --depth 1 https://github.com/KhronosGroup/glslang.git
+git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Cross.git
+git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Headers.git
+
+# === Build SPIRV-Cross ===
 cd SPIRV-Cross
-mkdir build
-cd build
-cmake ..
-make -j 4
-cd ../..
-cd SPIRV-Headers
-mkdir build
-cd build
-cmake ..
-make -j 4
+mkdir -p build && cd build
+cmake -DSPIRV-Headers_SOURCE_DIR=../../SPIRV-Headers ..
+make -j$(nproc)
 cd ../..
+
+# === Build glslang ===
 cd glslang
+# This updates autogenerated files (optional but recommended)
 ./update_glslang_sources.py
-mkdir build
-cd build
-cmake ..
-make -j 4
+mkdir -p build && cd build
+cmake -DSPIRV-Headers_SOURCE_DIR=../../SPIRV-Headers ..
+make -j$(nproc)
 cd ../..
+
+# === Build glfw ===
+cp ../MGL/include/MGLContext.h glfw/src
+cp ../MGL/include/MGLRenderer.h glfw/src
 cd glfw
-mkdir build
-cd build
+mkdir -p build && cd build
 cmake ..
-make -j 4 glfw
+make -j$(nproc)
 cd ../..