Merge remote-tracking branch 'origin/beta'

brunoherbelin · Aug 24, 2024 · 7788019 · 7788019
2 parents c12deb4 + f410ff0
commit 7788019
Show file tree

Hide file tree

Showing 18 changed files with 24,668 additions and 26,574 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -343,7 +343,8 @@ include_directories(
     ${GLAD_INCLUDE_DIRS}
 )
 add_library(GLAD "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/src/glad.c")
-message(STATUS "Including 'GLAD' Open source multi-language OpenGL loader https://glad.dav1d.de -- ${GLAD_INCLUDE_DIRS}")
+set_property(TARGET GLAD PROPERTY C_STANDARD 11)
+message(STATUS "Compiling 'GLAD 2' Open source multi-language OpenGL loader https://gen.glad.sh -- ${GLAD_INCLUDE_DIRS}")
 
 #
 # DEAR IMGUI

diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
@@ -33,7 +33,7 @@ find_package(PkgConfig)
 
 if (PKG_CONFIG_FOUND)
     pkg_check_modules(PKG_GSTREAMER gstreamer-${GSTREAMER_ABI_VERSION})
-    exec_program(${PKG_CONFIG_EXECUTABLE}
+    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
                  ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
                  OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
 endif()

diff --git a/ext/glad/include/glad/gl.h b/ext/glad/include/glad/gl.h
@@ -0,0 +1 @@
+glad.h
diff --git a/ext/glad/include/glad/glad.h b/ext/glad/include/glad/glad.h