Misc. dependency updates and Linux build fixes (#34)

* Add x11 premake support * Update glm to version 1.0.1 * Update Tracy to 0.11.0 * Update glfw to 3.4 * Temporarily disable Generate build on linux
novusengine · Jul 30, 2024 · ef0c8a8 · ef0c8a8
1 parent fe1e27f
commit ef0c8a8
Show file tree

Hide file tree

Showing 581 changed files with 51,803 additions and 22,934 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -23,7 +23,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        sudo apt-get update && sudo apt-get install -yq clang libx11-dev
+        sudo apt-get update && sudo apt-get install -yq clang libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libvulkan-dev
         sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
 
     - name: Install Vulkan SDK

diff --git a/Dependencies/Dependencies.lua b/Dependencies/Dependencies.lua
@@ -9,7 +9,7 @@ local dependencies =
     "base64/base64.lua",
     "catch2/catch2.lua",
     "dxcompiler/dxcompiler.lua",
-    "enkiTS/enkiTS.lua",
+    "enkits/enkiTS.lua",
     "entt/entt.lua",
     "glfw/glfw.lua",
     "gli/gli.lua",

diff --git a/Dependencies/dxcompiler/dxcompiler.lua b/Dependencies/dxcompiler/dxcompiler.lua
@@ -1,18 +1,9 @@
 local mod = Solution.Util.CreateDepTable("dxcompiler", {})
+local libPath = iif(os.istarget("windows"), mod.Path .. "/lib/windows/dxcompiler.dll", mod.Path .. "/lib/linux/dxcompiler.so")
 
 Solution.Util.CreateDep(mod.Name, mod.Dependencies, function()
     Solution.Util.SetIncludes(mod.Path .. "/include")
-
-    Solution.Util.SetFilter("platforms:Win64", function()
-        local link = mod.Path .. "/lib/windows/dxcompiler.lib"
-        Solution.Util.SetLinks(link)
-    end)
-
-    Solution.Util.SetFilter("platforms:Linux", function()
-        local link = mod.Path .. "/lib/linux/dxcompiler.so"
-        Solution.Util.SetLinks(link)
-    end)
+    Solution.Util.SetLinks(libPath)
 end)
 
-local libPath = iif(os.istarget("windows"), mod.Path .. "/lib/windows/dxcompiler.dll", mod.Path .. "/lib/linux/dxcompiler.so")
 BuildSettings:Add("DXCompiler Dynamic Lib Path", libPath)
diff --git a/Dependencies/dxcompiler/include/WinAdapter.h b/Dependencies/dxcompiler/include/WinAdapter.h
@@ -46,7 +46,9 @@
 #define CoTaskMemAlloc malloc
 #define CoTaskMemFree free
 
+#ifndef ARRAYSIZE
 #define ARRAYSIZE(array) (sizeof(array) / sizeof(array[0]))
+#endif // ARRAYSIZE
 
 #define _countof(a) (sizeof(a) / sizeof(*(a)))
 
@@ -186,7 +188,7 @@
 
 #define vsnprintf_s vsnprintf
 #define strcat_s strcat
-#define strcpy_s(dst, n, src) strncpy(dst, src, n)
+#define strncpy_s(dst, n, src) strncpy(dst, src, n)
 #define _vscwprintf vwprintf
 #define vswprintf_s vswprintf
 #define swprintf_s swprintf

diff --git a/Dependencies/dxcompiler/include/dxcapi.h b/Dependencies/dxcompiler/include/dxcapi.h
@@ -35,7 +35,7 @@
 
 #include <dlfcn.h>
 #if !WIN32
-#undef strcpy_s
+#undef strncpy_s
 #undef ARRAYSIZE
 #endif
 #include "WinAdapter.h"

diff --git a/Dependencies/enkiTS/.github/FUNDING.yml → Dependencies/enkits/.github/FUNDING.yml b/Dependencies/enkiTS/.github/FUNDING.yml → Dependencies/enkits/.github/FUNDING.yml
diff --git a/Dependencies/enkiTS/.gitignore → Dependencies/enkits/.gitignore b/Dependencies/enkiTS/.gitignore → Dependencies/enkits/.gitignore
diff --git a/Dependencies/enkiTS/.travis.yml → Dependencies/enkits/.travis.yml b/Dependencies/enkiTS/.travis.yml → Dependencies/enkits/.travis.yml
diff --git a/Dependencies/enkiTS/CMakeLists.txt → Dependencies/enkits/CMakeLists.txt b/Dependencies/enkiTS/CMakeLists.txt → Dependencies/enkits/CMakeLists.txt
diff --git a/Dependencies/enkiTS/License.txt → Dependencies/enkits/License.txt b/Dependencies/enkiTS/License.txt → Dependencies/enkits/License.txt
diff --git a/Dependencies/enkiTS/README.md → Dependencies/enkits/README.md b/Dependencies/enkiTS/README.md → Dependencies/enkits/README.md
diff --git a/Dependencies/enkiTS/enkiTS.lua → Dependencies/enkits/enkiTS.lua b/Dependencies/enkiTS/enkiTS.lua → Dependencies/enkits/enkiTS.lua
diff --git a/...ies/enkiTS/enkiTS/LockLessMultiReadPipe.h → ...ies/enkits/enkiTS/LockLessMultiReadPipe.h b/...ies/enkiTS/enkiTS/LockLessMultiReadPipe.h → ...ies/enkits/enkiTS/LockLessMultiReadPipe.h
diff --git a/Dependencies/enkiTS/enkiTS/TaskScheduler.cpp → Dependencies/enkits/enkiTS/TaskScheduler.cpp b/Dependencies/enkiTS/enkiTS/TaskScheduler.cpp → Dependencies/enkits/enkiTS/TaskScheduler.cpp
diff --git a/Dependencies/enkiTS/enkiTS/TaskScheduler.h → Dependencies/enkits/enkiTS/TaskScheduler.h b/Dependencies/enkiTS/enkiTS/TaskScheduler.h → Dependencies/enkits/enkiTS/TaskScheduler.h
diff --git a/...dencies/enkiTS/enkiTS/TaskScheduler_c.cpp → ...dencies/enkits/enkiTS/TaskScheduler_c.cpp b/...dencies/enkiTS/enkiTS/TaskScheduler_c.cpp → ...dencies/enkits/enkiTS/TaskScheduler_c.cpp
diff --git a/Dependencies/enkiTS/enkiTS/TaskScheduler_c.h → Dependencies/enkits/enkiTS/TaskScheduler_c.h b/Dependencies/enkiTS/enkiTS/TaskScheduler_c.h → Dependencies/enkits/enkiTS/TaskScheduler_c.h
diff --git a/...ncies/enkiTS/example/CompletionAction.cpp → ...ncies/enkits/example/CompletionAction.cpp b/...ncies/enkiTS/example/CompletionAction.cpp → ...ncies/enkits/example/CompletionAction.cpp
diff --git a/...ncies/enkiTS/example/CompletionAction_c.c → ...ncies/enkits/example/CompletionAction_c.c b/...ncies/enkiTS/example/CompletionAction_c.c → ...ncies/enkits/example/CompletionAction_c.c
diff --git a/...encies/enkiTS/example/CustomAllocator.cpp → ...encies/enkits/example/CustomAllocator.cpp b/...encies/enkiTS/example/CustomAllocator.cpp → ...encies/enkits/example/CustomAllocator.cpp
diff --git a/...encies/enkiTS/example/CustomAllocator_c.c → ...encies/enkits/example/CustomAllocator_c.c b/...encies/enkiTS/example/CustomAllocator_c.c → ...encies/enkits/example/CustomAllocator_c.c
diff --git a/Dependencies/enkiTS/example/Dependencies.cpp → Dependencies/enkits/example/Dependencies.cpp b/Dependencies/enkiTS/example/Dependencies.cpp → Dependencies/enkits/example/Dependencies.cpp
diff --git a/Dependencies/enkiTS/example/Dependencies_c.c → Dependencies/enkits/example/Dependencies_c.c b/Dependencies/enkiTS/example/Dependencies_c.c → Dependencies/enkits/example/Dependencies_c.c
diff --git a/...ies/enkiTS/example/ExternalTaskThread.cpp → ...ies/enkits/example/ExternalTaskThread.cpp b/...ies/enkiTS/example/ExternalTaskThread.cpp → ...ies/enkits/example/ExternalTaskThread.cpp
diff --git a/...ies/enkiTS/example/ExternalTaskThread_c.c → ...ies/enkits/example/ExternalTaskThread_c.c b/...ies/enkiTS/example/ExternalTaskThread_c.c → ...ies/enkits/example/ExternalTaskThread_c.c
diff --git a/Dependencies/enkiTS/example/LambdaTask.cpp → Dependencies/enkits/example/LambdaTask.cpp b/Dependencies/enkiTS/example/LambdaTask.cpp → Dependencies/enkits/example/LambdaTask.cpp
diff --git a/Dependencies/enkiTS/example/ParallelSum.cpp → Dependencies/enkits/example/ParallelSum.cpp b/Dependencies/enkiTS/example/ParallelSum.cpp → Dependencies/enkits/example/ParallelSum.cpp
diff --git a/Dependencies/enkiTS/example/ParallelSum_c.c → Dependencies/enkits/example/ParallelSum_c.c b/Dependencies/enkiTS/example/ParallelSum_c.c → Dependencies/enkits/example/ParallelSum_c.c
diff --git a/Dependencies/enkiTS/example/PinnedTask.cpp → Dependencies/enkits/example/PinnedTask.cpp b/Dependencies/enkiTS/example/PinnedTask.cpp → Dependencies/enkits/example/PinnedTask.cpp
diff --git a/Dependencies/enkiTS/example/PinnedTask_c.c → Dependencies/enkits/example/PinnedTask_c.c b/Dependencies/enkiTS/example/PinnedTask_c.c → Dependencies/enkits/example/PinnedTask_c.c
diff --git a/Dependencies/enkiTS/example/Priorities.cpp → Dependencies/enkits/example/Priorities.cpp b/Dependencies/enkiTS/example/Priorities.cpp → Dependencies/enkits/example/Priorities.cpp
diff --git a/Dependencies/enkiTS/example/Priorities_c.c → Dependencies/enkits/example/Priorities_c.c b/Dependencies/enkiTS/example/Priorities_c.c → Dependencies/enkits/example/Priorities_c.c
diff --git a/Dependencies/enkiTS/example/TaskOverhead.cpp → Dependencies/enkits/example/TaskOverhead.cpp b/Dependencies/enkiTS/example/TaskOverhead.cpp → Dependencies/enkits/example/TaskOverhead.cpp
diff --git a/...dencies/enkiTS/example/TaskThroughput.cpp → ...dencies/enkits/example/TaskThroughput.cpp b/...dencies/enkiTS/example/TaskThroughput.cpp → ...dencies/enkits/example/TaskThroughput.cpp
diff --git a/Dependencies/enkiTS/example/TestAll.cpp → Dependencies/enkits/example/TestAll.cpp b/Dependencies/enkiTS/example/TestAll.cpp → Dependencies/enkits/example/TestAll.cpp
diff --git a/...encies/enkiTS/example/TestWaitforTask.cpp → ...encies/enkits/example/TestWaitforTask.cpp b/...encies/enkiTS/example/TestWaitforTask.cpp → ...encies/enkits/example/TestWaitforTask.cpp
diff --git a/Dependencies/enkiTS/example/Timer.h → Dependencies/enkits/example/Timer.h b/Dependencies/enkiTS/example/Timer.h → Dependencies/enkits/example/Timer.h
diff --git a/.../enkiTS/example/WaitForNewPinnedTasks.cpp → .../enkits/example/WaitForNewPinnedTasks.cpp b/.../enkiTS/example/WaitForNewPinnedTasks.cpp → .../enkits/example/WaitForNewPinnedTasks.cpp
diff --git a/.../enkiTS/example/WaitForNewPinnedTasks_c.c → .../enkits/example/WaitForNewPinnedTasks_c.c b/.../enkiTS/example/WaitForNewPinnedTasks_c.c → .../enkits/example/WaitForNewPinnedTasks_c.c
diff --git a/Dependencies/glfw/.github/CODEOWNERS b/Dependencies/glfw/.github/CODEOWNERS
@@ -0,0 +1,8 @@
+
+*               @elmindreda
+
+docs/*.css      @glfw/webdev
+docs/*.scss     @glfw/webdev
+docs/*.html     @glfw/webdev
+docs/*.xml      @glfw/webdev
+
diff --git a/Dependencies/glfw/.github/workflows/build.yml b/Dependencies/glfw/.github/workflows/build.yml
@@ -0,0 +1,100 @@
+name: Build
+on:
+    pull_request:
+    push:
+        branches: [ ci, master, latest, 3.3-stable ]
+    workflow_dispatch:
+permissions:
+    statuses: write
+    contents: read
+
+jobs:
+    build-linux-clang:
+        name: Linux (Clang)
+        runs-on: ubuntu-latest
+        timeout-minutes: 4
+        env:
+            CC: clang
+            CFLAGS: -Werror
+        steps:
+            - uses: actions/checkout@v4
+            - name: Install dependencies
+              run: |
+                  sudo apt update
+                  sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev
+
+            - name: Configure Null shared library
+              run: cmake -B build-null-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
+            - name: Build Null shared library
+              run: cmake --build build-null-shared --parallel
+
+            - name: Configure X11 shared library
+              run: cmake -B build-x11-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=ON -D BUILD_SHARED_LIBS=ON
+            - name: Build X11 shared library
+              run: cmake --build build-x11-shared --parallel
+
+            - name: Configure Wayland shared library
+              run: cmake -B build-wayland-shared -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
+            - name: Build Wayland shared library
+              run: cmake --build build-wayland-shared --parallel
+
+            - name: Configure Wayland+X11 static library
+              run: cmake -B build-full-static -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=ON
+            - name: Build Wayland+X11 static library
+              run: cmake --build build-full-static --parallel
+
+            - name: Configure Wayland+X11 shared library
+              run: cmake -B build-full-shared -D GLFW_BUILD_WAYLAND=ON -D BUILD_SHARED_LIBS=ON -D GLFW_BUILD_X11=ON
+            - name: Build Wayland+X11 shared library
+              run: cmake --build build-full-shared --parallel
+
+    build-macos-clang:
+        name: macOS (Clang)
+        runs-on: macos-latest
+        timeout-minutes: 4
+        env:
+            CFLAGS: -Werror
+            MACOSX_DEPLOYMENT_TARGET: 10.8
+            CMAKE_OSX_ARCHITECTURES: x86_64;arm64
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Configure Null shared library
+              run: cmake -B build-null-shared -D GLFW_BUILD_COCOA=OFF -D BUILD_SHARED_LIBS=ON
+            - name: Build Null shared library
+              run: cmake --build build-null-shared --parallel
+
+            - name: Configure Cocoa static library
+              run: cmake -B build-cocoa-static
+            - name: Build Cocoa static library
+              run: cmake --build build-cocoa-static --parallel
+
+            - name: Configure Cocoa shared library
+              run: cmake -B build-cocoa-shared -D BUILD_SHARED_LIBS=ON
+            - name: Build Cocoa shared library
+              run: cmake --build build-cocoa-shared --parallel
+
+    build-windows-vs2022:
+        name: Windows (VS2022)
+        runs-on: windows-latest
+        timeout-minutes: 4
+        env:
+            CFLAGS: /WX
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Configure Win32 shared x86 library
+              run: cmake -B build-win32-shared-x86 -G "Visual Studio 17 2022" -A Win32 -D BUILD_SHARED_LIBS=ON
+            - name: Build Win32 shared x86 library
+              run: cmake --build build-win32-shared-x86 --parallel
+
+            - name: Configure Win32 static x64 library
+              run: cmake -B build-win32-static-x64 -G "Visual Studio 17 2022" -A x64
+            - name: Build Win32 static x64 library
+              run: cmake --build build-win32-static-x64 --parallel
+
+            - name: Configure Win32 shared x64 library
+              run: cmake -B build-win32-shared-x64 -G "Visual Studio 17 2022" -A x64 -D BUILD_SHARED_LIBS=ON
+            - name: Build Win32 shared x64 library
+              run: cmake --build build-win32-shared-x64 --parallel
+
diff --git a/Dependencies/glfw/CMake/GenerateMappings.cmake b/Dependencies/glfw/CMake/GenerateMappings.cmake
@@ -23,8 +23,23 @@ endif()
 
 file(STRINGS "${source_path}" lines)
 foreach(line ${lines})
-    if ("${line}" MATCHES "^[0-9a-fA-F].*$")
-        set(GLFW_GAMEPAD_MAPPINGS "${GLFW_GAMEPAD_MAPPINGS}\"${line}\",\n")
+    if (line MATCHES "^[0-9a-fA-F]")
+        if (line MATCHES "platform:Windows")
+            if (GLFW_WIN32_MAPPINGS)
+                string(APPEND GLFW_WIN32_MAPPINGS "\n")
+            endif()
+            string(APPEND GLFW_WIN32_MAPPINGS "\"${line}\",")
+        elseif (line MATCHES "platform:Mac OS X")
+            if (GLFW_COCOA_MAPPINGS)
+                string(APPEND GLFW_COCOA_MAPPINGS "\n")
+            endif()
+            string(APPEND GLFW_COCOA_MAPPINGS "\"${line}\",")
+        elseif (line MATCHES "platform:Linux")
+            if (GLFW_LINUX_MAPPINGS)
+                string(APPEND GLFW_LINUX_MAPPINGS "\n")
+            endif()
+            string(APPEND GLFW_LINUX_MAPPINGS "\"${line}\",")
+        endif()
     endif()
 endforeach()
 

diff --git a/...cies/glfw/CMake/MacOSXBundleInfo.plist.in → Dependencies/glfw/CMake/Info.plist.in b/...cies/glfw/CMake/MacOSXBundleInfo.plist.in → Dependencies/glfw/CMake/Info.plist.in
diff --git a/Dependencies/glfw/cmake_uninstall.cmake.in → ...ncies/glfw/CMake/cmake_uninstall.cmake.in b/Dependencies/glfw/cmake_uninstall.cmake.in → ...ncies/glfw/CMake/cmake_uninstall.cmake.in
@@ -1,9 +1,9 @@
 
-if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+if (NOT EXISTS "@GLFW_BINARY_DIR@/install_manifest.txt")
+    message(FATAL_ERROR "Cannot find install manifest: \"@GLFW_BINARY_DIR@/install_manifest.txt\"")
 endif()
 
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+file(READ "@GLFW_BINARY_DIR@/install_manifest.txt" files)
 string(REGEX REPLACE "\n" ";" files "${files}")
 
 foreach (file ${files})

diff --git a/Dependencies/glfw/src/glfw3.pc.in → Dependencies/glfw/CMake/glfw3.pc.in b/Dependencies/glfw/src/glfw3.pc.in → Dependencies/glfw/CMake/glfw3.pc.in
@@ -5,9 +5,9 @@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 
 Name: GLFW
 Description: A multi-platform library for OpenGL, window and input
-Version: @GLFW_VERSION_FULL@
+Version: @GLFW_VERSION@
 URL: https://www.glfw.org/
-Requires.private: @GLFW_PKG_DEPS@
-Libs: -L${libdir} -l@GLFW_LIB_NAME@
-Libs.private: @GLFW_PKG_LIBS@
+Requires.private: @GLFW_PKG_CONFIG_REQUIRES_PRIVATE@
+Libs: -L${libdir} -l@GLFW_LIB_NAME@@GLFW_LIB_NAME_SUFFIX@
+Libs.private: @GLFW_PKG_CONFIG_LIBS_PRIVATE@
 Cflags: -I${includedir}
diff --git a/Dependencies/glfw/CMake/glfw3Config.cmake.in b/Dependencies/glfw/CMake/glfw3Config.cmake.in
@@ -0,0 +1,3 @@
+include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake")
diff --git a/Dependencies/glfw/CMake/modules/FindEpollShim.cmake b/Dependencies/glfw/CMake/modules/FindEpollShim.cmake
@@ -13,5 +13,5 @@ if (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
 endif (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(EPOLLSHIM DEFAULT_MSG EPOLLSHIM_LIBRARIES EPOLLSHIM_INCLUDE_DIRS)
+find_package_handle_standard_args(EpollShim DEFAULT_MSG EPOLLSHIM_LIBRARIES EPOLLSHIM_INCLUDE_DIRS)
 mark_as_advanced(EPOLLSHIM_INCLUDE_DIRS EPOLLSHIM_LIBRARIES)
diff --git a/Dependencies/glfw/CMake/modules/FindWaylandProtocols.cmake b/Dependencies/glfw/CMake/modules/FindWaylandProtocols.cmake
diff --git a/Dependencies/glfw/CMake/modules/FindXKBCommon.cmake b/Dependencies/glfw/CMake/modules/FindXKBCommon.cmake