From 57c6802deb74193fa70fd184a4752ca22c18fb0d Mon Sep 17 00:00:00 2001 From: bb1950328 Date: Sat, 11 May 2024 22:06:23 +0200 Subject: [PATCH] update dependencies --- .gitmodules | 2 +- CMakeLists.txt | 2 ++ scripts/update_dependencies.py | 2 +- setup_workspace.sh | 2 +- src/lib/Catch2 | 2 +- src/lib/IconFontCppHeaders | 2 +- src/lib/ImGuiColorTextEdit | 2 +- src/lib/cpuinfo | 2 +- src/lib/curl | 2 +- src/lib/efsw | 2 +- src/lib/fast_float | 2 +- src/lib/glfw | 2 +- src/lib/glm | 2 +- src/lib/imgui | 2 +- src/lib/magic_enum | 2 +- src/lib/rapidjson | 2 +- src/lib/spdlog | 2 +- src/lib/stb | 2 +- src/lib/tinyfiledialogs | 2 +- src/lib/unordered_dense | 2 +- src/lib/utfcpp | 2 +- 21 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.gitmodules b/.gitmodules index 90a1641a..fbeb6fc9 100644 --- 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 index 7517530a..9770ea8d 100644 --- 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 index d652d56a..91b00e64 100755 --- 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 index 9e8f1193..586d15df 100755 --- 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 index 53d0d913..4e8d92bf 160000 --- a/src/lib/Catch2 +++ b/src/lib/Catch2 @@ -1 +1 @@ -Subproject commit 53d0d913a422d356b23dd927547febdf69ee9081 +Subproject commit 4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502 diff --git a/src/lib/IconFontCppHeaders b/src/lib/IconFontCppHeaders index d7254bc4..778a1275 160000 --- a/src/lib/IconFontCppHeaders +++ b/src/lib/IconFontCppHeaders @@ -1 +1 @@ -Subproject commit d7254bc4e4d8e1f1260adc1c2d8fec219469e858 +Subproject commit 778a12759ba9100f24a02efce5f2f95da89ea8a1 diff --git a/src/lib/ImGuiColorTextEdit b/src/lib/ImGuiColorTextEdit index 71572284..ec278192 160000 --- a/src/lib/ImGuiColorTextEdit +++ b/src/lib/ImGuiColorTextEdit @@ -1 +1 @@ -Subproject commit 71572284cf03a62ebb9fb39d5ba8a163cab59c4f +Subproject commit ec2781920babc83b1f749067a54d84c6b54e6390 diff --git a/src/lib/cpuinfo b/src/lib/cpuinfo index 2f4c278f..3c8b1533 160000 --- a/src/lib/cpuinfo +++ b/src/lib/cpuinfo @@ -1 +1 @@ -Subproject commit 2f4c278f7aa3e9a451c14c3e9a02c3e091140d96 +Subproject commit 3c8b1533ac03dd6531ab6e7b9245d488f13a82a5 diff --git a/src/lib/curl b/src/lib/curl index 7161cb17..de7b3e89 160000 --- a/src/lib/curl +++ b/src/lib/curl @@ -1 +1 @@ -Subproject commit 7161cb17c01dcff1dc5bf89a18437d9d729f1ecd +Subproject commit de7b3e89218467159a7af72d58cea8425946e97d diff --git a/src/lib/efsw b/src/lib/efsw index bc85bafa..34193476 160000 --- a/src/lib/efsw +++ b/src/lib/efsw @@ -1 +1 @@ -Subproject commit bc85bafae7d7b641e326ed5d01bfffd5eb0352f5 +Subproject commit 341934765471e4074e90bb5205ff4a65c16499c6 diff --git a/src/lib/fast_float b/src/lib/fast_float index f3ff46fd..f476bc71 160000 --- a/src/lib/fast_float +++ b/src/lib/fast_float @@ -1 +1 @@ -Subproject commit f3ff46fd40d28b5eb272727812e5bd8dc5a6d876 +Subproject commit f476bc713fda06fbd34dc621b466745a574b3d4c diff --git a/src/lib/glfw b/src/lib/glfw index 2c1d3100..b35641f4 160000 --- a/src/lib/glfw +++ b/src/lib/glfw @@ -1 +1 @@ -Subproject commit 2c1d31009fdc527d5a44ff887659a25ecbf1f7f0 +Subproject commit b35641f4a3c62aa86a0b3c983d163bc0fe36026d diff --git a/src/lib/glm b/src/lib/glm index 586a4023..45008b22 160000 --- a/src/lib/glm +++ b/src/lib/glm @@ -1 +1 @@ -Subproject commit 586a402397dd35d66d7a079049856d1e2cbab300 +Subproject commit 45008b225e28eb700fa0f7d3ff69b7c1db94fadf diff --git a/src/lib/imgui b/src/lib/imgui index 8add6bcb..e391fe2e 160000 --- a/src/lib/imgui +++ b/src/lib/imgui @@ -1 +1 @@ -Subproject commit 8add6bcb9f5752d53f55f2bfc959238500bc0390 +Subproject commit e391fe2e66eb1c96b1624ae8444dc64c23146ef4 diff --git a/src/lib/magic_enum b/src/lib/magic_enum index e09f2578..7afc57b1 160000 --- a/src/lib/magic_enum +++ b/src/lib/magic_enum @@ -1 +1 @@ -Subproject commit e09f25780ac8be5523474dea1e707318274ab047 +Subproject commit 7afc57b194dd08631d5e96e42b217bb52933828f diff --git a/src/lib/rapidjson b/src/lib/rapidjson index 6089180e..ab1842a2 160000 --- a/src/lib/rapidjson +++ b/src/lib/rapidjson @@ -1 +1 @@ -Subproject commit 6089180ecb704cb2b136777798fa1be303618975 +Subproject commit ab1842a2dae061284c0a62dca1cc6d5e7e37e346 diff --git a/src/lib/spdlog b/src/lib/spdlog index ac55e604..27cb4c76 160000 --- a/src/lib/spdlog +++ b/src/lib/spdlog @@ -1 +1 @@ -Subproject commit ac55e60488032b9acde8940a5de099541c4515da +Subproject commit 27cb4c76708608465c413f6d0e6b8d99a4d84302 diff --git a/src/lib/stb b/src/lib/stb index f4a71b13..ae721c50 160000 --- a/src/lib/stb +++ b/src/lib/stb @@ -1 +1 @@ -Subproject commit f4a71b13373436a2866c5d68f8f80ac6f0bc1ffe +Subproject commit ae721c50eaf761660b4f90cc590453cdb0c2acd0 diff --git a/src/lib/tinyfiledialogs b/src/lib/tinyfiledialogs index 36e91b0c..7bf259a5 160000 --- a/src/lib/tinyfiledialogs +++ b/src/lib/tinyfiledialogs @@ -1 +1 @@ -Subproject commit 36e91b0c35fb8ab02aa1597d1114da9961b80630 +Subproject commit 7bf259a5d87a56e29ad5e267b5ec65e4a7311138 diff --git a/src/lib/unordered_dense b/src/lib/unordered_dense index 335e66ca..231e48c9 160000 --- a/src/lib/unordered_dense +++ b/src/lib/unordered_dense @@ -1 +1 @@ -Subproject commit 335e66cae95064251488dee3a4db663d8ede32f0 +Subproject commit 231e48c9426bd21c273669e5fdcd042c146975cf diff --git a/src/lib/utfcpp b/src/lib/utfcpp index aed58281..6be08bbe 160000 --- a/src/lib/utfcpp +++ b/src/lib/utfcpp @@ -1 +1 @@ -Subproject commit aed58281cf45838bdb7296e3109bd5a633d677ed +Subproject commit 6be08bbea14ffa0a5c594257fb6285a054395cd7