update dependencies

bb1950328 · May 11, 2024 · 57c6802 · 57c6802
1 parent 32da6b2
commit 57c6802
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 20 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -61,7 +61,7 @@
 	url = https://github.com/martinus/unordered_dense.git
 [submodule "src/lib/ImGuiColorTextEdit"]
 	path = src/lib/ImGuiColorTextEdit
-	url = https://github.com/BalazsJako/ImGuiColorTextEdit.git
+	url = https://github.com/bb1950328/ImGuiColorTextEdit.git
 [submodule "src/lib/utfcpp"]
 	path = src/lib/utfcpp
 	url = https://github.com/nemtrif/utfcpp.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -163,6 +163,7 @@ set(ENABLE_BZIP2 OFF CACHE BOOL "Enable use of BZip2" FORCE)
 set(ENABLE_LZMA OFF CACHE BOOL "Enable use of LZMA" FORCE)
 set(ENABLE_ZSTD OFF CACHE BOOL "Enable use of Zstandard" FORCE)
 set(BUILD_REGRESS OFF CACHE BOOL "Build regression tests" FORCE)
+set(BUILD_DOC OFF CACHE BOOL "Build documentation" FORCE)
 add_subdirectory(src/lib/libzip)
 target_link_libraries(BrickSimLib PUBLIC libzip::zip)
 if (NOT MSVC)
@@ -211,6 +212,7 @@ target_link_libraries(BrickSimBenchmarks PRIVATE Catch2::Catch2)
 #GLM
 add_subdirectory(src/lib/glm)
 target_link_libraries(BrickSimLib PUBLIC glm::glm)
+target_compile_definitions(BrickSimLib PUBLIC GLM_ENABLE_EXPERIMENTAL)
 
 #tinyfiledialogs
 target_include_directories(BrickSimLib PUBLIC src/lib/tinyfiledialogs)

diff --git a/scripts/update_dependencies.py b/scripts/update_dependencies.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import json
 import subprocess

diff --git a/setup_workspace.sh b/setup_workspace.sh
@@ -38,7 +38,7 @@ if [[ "$OS" == "linux" ]]; then
   sudo apt-get install -y build-essential gcc-12 g++-12 gcc-multilib g++-multilib gcc-12-multilib g++-12-multilib \
                           cmake mesa-utils libxinerama-dev libxrandr-dev libxcursor-dev libxi-dev ninja-build \
                           freeglut3-dev libcurl4-openssl-dev libtbb-dev libssl-dev libeigen3-dev libccd-dev \
-                          zlib1g-dev
+                          zlib1g-dev libwayland-dev libxkbcommon-dev
 
   if $install_32bit_packages; then
     sudo apt-get install -y libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 freeglut3-dev:i386 libzstd-dev:i386  \

diff --git a/src/lib/Catch2 b/src/lib/Catch2
diff --git a/src/lib/IconFontCppHeaders b/src/lib/IconFontCppHeaders
diff --git a/src/lib/ImGuiColorTextEdit b/src/lib/ImGuiColorTextEdit
diff --git a/src/lib/cpuinfo b/src/lib/cpuinfo
diff --git a/src/lib/curl b/src/lib/curl
diff --git a/src/lib/efsw b/src/lib/efsw
diff --git a/src/lib/fast_float b/src/lib/fast_float
diff --git a/src/lib/glfw b/src/lib/glfw
diff --git a/src/lib/glm b/src/lib/glm
diff --git a/src/lib/imgui b/src/lib/imgui
diff --git a/src/lib/magic_enum b/src/lib/magic_enum
diff --git a/src/lib/rapidjson b/src/lib/rapidjson
diff --git a/src/lib/spdlog b/src/lib/spdlog
diff --git a/src/lib/stb b/src/lib/stb
diff --git a/src/lib/tinyfiledialogs b/src/lib/tinyfiledialogs
diff --git a/src/lib/unordered_dense b/src/lib/unordered_dense
diff --git a/src/lib/utfcpp b/src/lib/utfcpp