Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 3rdparty #248

Merged
merged 7 commits into from
Oct 30, 2023
Merged

Update 3rdparty #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1516d49
Update freetype to VER-2-13-2
jonesmz Oct 30, 2023
834ce6f
Update newton to tag v4.02, even though we only use the 3.0 api.
jonesmz Oct 30, 2023
4e5f320
Update spdlog to v1.12.0
jonesmz Oct 30, 2023
2cc9553
Update googletest to v1.14.0
jonesmz Oct 30, 2023
ee38860
Tweak SPDLOG build settings
jonesmz Oct 30, 2023
2d49918
Hack to fix linux runner
jonesmz Oct 30, 2023
4cdcbcc
Don't enable std::format, doesn't work on... any runner
jonesmz Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ jobs:
with:
key: linux-${{ matrix.image }}-${{ matrix.compiler }}-${{ matrix.config }}

- name: Hack to fix github runner
run: |
# Hack to deal with https://github.com/actions/runner-images/issues/8659
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
sudo apt-get update
sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 libc6-dev=2.35-0ubuntu3.4 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04

- name: Install dependencies
run: |
sudo apt update
Expand Down
15 changes: 4 additions & 11 deletions 3rdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,6 @@ SET(NEWTON_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
SET(NEWTON_USE_PLUGIN_DLL OFF CACHE BOOL "" FORCE)
SET(NEWTON_WITH_AVX_PLUGIN OFF CACHE BOOL "" FORCE)
SET(NEWTON_WITH_REFERENCE_GPU_PLUGIN OFF CACHE BOOL "" FORCE)

# Work around bug in newton cmake.
# Fix merged upstream, waiting for tag: https://github.com/MADEAPPS/newton-dynamics/pull/281
if(NOT CMAKE_VS_PLATFORM_NAME)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
set(CMAKE_VS_PLATFORM_NAME "x64")
else()
set(CMAKE_VS_PLATFORM_NAME "Win32")
endif()
endif()

ADD_SUBDIRECTORY(newton-dynamics/newton-3.14/ EXCLUDE_FROM_ALL)

# Newton sets CMAKE_ARCHIVE_OUTPUT_DIRECTORY and CMAKE_LIBRARY_OUTPUT_DIRECTORY
Expand All @@ -194,6 +183,10 @@ ADD_SUBDIRECTORY(entt EXCLUDE_FROM_ALL)

SET(toml11_INSTALL OFF CACHE BOOL "" FORCE)
ADD_SUBDIRECTORY(toml11 EXCLUDE_FROM_ALL)

SET(SPDLOG_ENABLE_PCH TRUE)
# Not yet supported by github runners
# SET(SPDLOG_USE_STD_FORMAT TRUE)
ADD_SUBDIRECTORY(spdlog EXCLUDE_FROM_ALL)
ADD_SUBDIRECTORY(longeronpp EXCLUDE_FROM_ALL)

Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freetype
Open in desktop
Submodule freetype updated 177 files
2 changes: 1 addition & 1 deletion 3rdparty/googletest
Open in desktop
Submodule googletest updated 144 files
2 changes: 1 addition & 1 deletion 3rdparty/newton-dynamics
Open in desktop
Submodule newton-dynamics updated 1157 files
2 changes: 1 addition & 1 deletion 3rdparty/spdlog
Open in desktop
Submodule spdlog updated 73 files
+2 −3 .github/workflows/ci.yml
+2 −0 .gitignore
+34 −23 CMakeLists.txt
+1 −1 INSTALL
+79 −42 README.md
+3 −39 appveyor.yml
+2 −2 bench/CMakeLists.txt
+1 −1 bench/bench.cpp
+17 −4 bench/latency.cpp
+1 −1 example/CMakeLists.txt
+20 −2 example/example.cpp
+3 −3 include/spdlog/async.h
+16 −18 include/spdlog/async_logger-inl.h
+65 −6 include/spdlog/common.h
+6 −0 include/spdlog/details/backtracer-inl.h
+1 −0 include/spdlog/details/backtracer.h
+8 −0 include/spdlog/details/file_helper-inl.h
+1 −0 include/spdlog/details/file_helper.h
+0 −5 include/spdlog/details/fmt_helper.h
+24 −2 include/spdlog/details/mpmc_blocking_q.h
+41 −12 include/spdlog/details/os-inl.h
+4 −0 include/spdlog/details/os.h
+10 −1 include/spdlog/details/registry-inl.h
+2 −0 include/spdlog/details/registry.h
+1 −1 include/spdlog/details/synchronous_factory.h
+1 −1 include/spdlog/details/tcp_client-windows.h
+3 −2 include/spdlog/details/tcp_client.h
+1 −5 include/spdlog/details/thread_pool-inl.h
+6 −4 include/spdlog/details/udp_client-windows.h
+1 −1 include/spdlog/details/udp_client.h
+3 −3 include/spdlog/fmt/bin_to_hex.h
+171 −0 include/spdlog/fmt/bundled/std.h
+23 −0 include/spdlog/fmt/std.h
+3 −3 include/spdlog/logger-inl.h
+23 −49 include/spdlog/logger.h
+1 −1 include/spdlog/pattern_formatter.h
+6 −2 include/spdlog/sinks/android_sink.h
+9 −9 include/spdlog/sinks/ansicolor_sink-inl.h
+61 −0 include/spdlog/sinks/callback_sink.h
+8 −58 include/spdlog/sinks/daily_file_sink.h
+4 −4 include/spdlog/sinks/dist_sink.h
+5 −3 include/spdlog/sinks/dup_filter_sink.h
+133 −0 include/spdlog/sinks/kafka_sink.h
+18 −6 include/spdlog/sinks/msvc_sink.h
+196 −6 include/spdlog/sinks/qt_sinks.h
+1 −1 include/spdlog/sinks/ringbuffer_sink.h
+1 −2 include/spdlog/sinks/stdout_sinks-inl.h
+7 −0 include/spdlog/sinks/systemd_sink.h
+6 −6 include/spdlog/sinks/win_eventlog_sink.h
+5 −0 include/spdlog/spdlog-inl.h
+26 −17 include/spdlog/spdlog.h
+1 −1 include/spdlog/stopwatch.h
+1 −2 include/spdlog/tweakme.h
+1 −1 include/spdlog/version.h
+16 −0 tests/CMakeLists.txt
+0 −17,959 tests/catch.hpp
+0 −23 tests/catch.license
+2 −1 tests/includes.h
+1 −2 tests/main.cpp
+9 −1 tests/test_async.cpp
+13 −0 tests/test_backtrace.cpp
+93 −0 tests/test_bin_to_hex.cpp
+34 −0 tests/test_custom_callbacks.cpp
+5 −5 tests/test_daily_logger.cpp
+12 −9 tests/test_errors.cpp
+5 −5 tests/test_file_helper.cpp
+5 −5 tests/test_file_logging.cpp
+1 −1 tests/test_fmt_helper.cpp
+1 −1 tests/test_macros.cpp
+0 −91 tests/test_misc.cpp
+22 −2 tests/test_mpmc_q.cpp
+2 −2 tests/test_pattern_formatter.cpp
+3 −3 tests/test_stopwatch.cpp