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

@@ -12,8 +12,8 @@ include_directories(
 	MGL/SPIRV/SPIRV-Cross
 	MGL/include
 	MGL/include/GL
-	external/SPIRV-Cross
-	external/SPIRV-Tools/include
+	#external/SPIRV-Cross
+	#external/SPIRV-Tools/include
 	external/glslang/glslang/Include
 )
 
@@ -29,20 +29,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/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"
+	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/glslang/OSDependent/Unix/libOSDependent.a"
+	"${CMAKE_CURRENT_SOURCE_DIR}/external/glslang/build/SPIRV/libSPIRV.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"
 )
 
 # macOS Frameworks
@@ -56,3 +56,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,32 +1,37 @@
-set SDKROOT=`xcrun --show-sdk-path`
+#set SDKROOT=`xcrun --show-sdk-path`
 
 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 ../..
-cd SPIRV-Cross
-mkdir build
-cd build
-cmake ..
-make -j 4
-cd ../..
-cd SPIRV-Headers
-mkdir build
-cd build
-cmake ..
-make -j 4
-cd ../..
+
+#cd SPIRV-Tools
+#mkdir build
+#cd build
+#cmake ..
+#make -j 4
+#cd ../..
+#
+#cd SPIRV-Cross
+#mkdir build
+#cd build
+#cmake ..
+#make -j 4
+#cd ../..
+#
+#cd SPIRV-Headers
+#mkdir build
+#cd build
+#cmake ..
+#make -j 4
+#cd ../..
+
 cd glslang
 ./update_glslang_sources.py
 mkdir build
 cd build
 cmake ..
 make -j 4
 cd ../..
+
 cd glfw
 mkdir build
 cd build

external/clone_external.sh

@@ -1,9 +1,9 @@
-git clone https://github.com/KhronosGroup/OpenGL-Registry.git --depth 1
-git clone https://github.com/r58Playz/SPIRV-Cross.git -b uniform-constants
-git clone https://github.com/KhronosGroup/SPIRV-Headers.git --depth 1
-git clone https://github.com/KhronosGroup/SPIRV-Tools.git --depth 1
-cd SPIRV-Tools/external
-git clone https://github.com/KhronosGroup/SPIRV-Headers.git --depth 1
-cd ../..
-git clone https://github.com/lxfontes/ezxml.git --depth 1
+#git clone https://github.com/KhronosGroup/OpenGL-Registry.git --depth 1
+#git clone https://github.com/r58Playz/SPIRV-Cross.git -b uniform-constants
+#git clone https://github.com/KhronosGroup/SPIRV-Headers.git --depth 1
+#git clone https://github.com/KhronosGroup/SPIRV-Tools.git --depth 1
+#cd SPIRV-Tools/external
+#git clone https://github.com/KhronosGroup/SPIRV-Headers.git --depth 1
+#cd ../..
+#git clone https://github.com/lxfontes/ezxml.git --depth 1
 git clone https://github.com/KhronosGroup/glslang.git --depth 1