From 94f5c48b0380b41c898c95d573f3518cf94f332a Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 2 May 2021 00:01:56 -0400 Subject: [PATCH] Update submodules (includes LLVM 12 fix) --- .github/workflows/build.yml | 9 +++++---- .github/workflows/release.yml | 8 ++++---- .gitignore | 3 ++- CMakeLists.txt | 13 ++++++++++++- extern/athena | 2 +- extern/boo | 2 +- extern/nod | 2 +- hecl/lib/WideStringConvert.cpp | 2 +- specter/lib/TextView.cpp | 2 +- 9 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4c9aa2a2..14a2adb85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce metaforce-gui hecl visigen build-macos: name: Build macOS (AppleClang x86_64) @@ -75,6 +75,7 @@ jobs: - name: Install dependencies run: | brew update + brew upgrade brew install ninja qt@5 graphicsmagick imagemagick brew link qt@5 yarn global add create-dmg @@ -90,7 +91,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce-gui build-windows-msvc: name: Build Windows (MSVC x86_64) @@ -143,7 +144,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce metaforce-gui hecl visigen build-windows-clang: name: Build Windows (Clang x86_64) @@ -198,4 +199,4 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce metaforce-gui hecl visigen diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b15e80da1..2ad7a925a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce metaforce-gui hecl visigen - name: Split debug information run: ci/split-debug-linux.sh @@ -130,7 +130,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce-gui - name: Upload debug information env: @@ -228,7 +228,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce metaforce-gui hecl visigen crashpad_handler - name: Upload debug information working-directory: ${{github.workspace}}/build/Binaries @@ -318,7 +318,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build . --target metaforce metaforce-gui hecl visigen crashpad_handler - name: Compress PDBs working-directory: ${{github.workspace}}/build/Binaries diff --git a/.gitignore b/.gitignore index de2f93579..29e5299e4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ docs/* Editor/platforms/win/metaforce.rc .vs/ out/ -cmake-build-*/ \ No newline at end of file +cmake-build-*/ +build/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e0e15ec2..d11b07796 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -335,8 +335,19 @@ if(NOT GEKKO AND NOT NX) if (NOT CMAKE_INSTALL_LIBDIR) set(CMAKE_INSTALL_LIBDIR ${CMAKE_BINARY_DIR}/fake-prefix) endif() - add_subdirectory(extern/discord-rpc/src) + add_subdirectory(extern/discord-rpc/src EXCLUDE_FROM_ALL) target_include_directories(discord-rpc PRIVATE extern/rapidjson/include PUBLIC extern/discord-rpc/include) + if (APPLE) + # remove their nasty hack + get_target_property(DISCORD_LINK_LIBRARIES discord-rpc INTERFACE_LINK_LIBRARIES) + list(REMOVE_ITEM DISCORD_LINK_LIBRARIES "-framework AppKit, -mmacosx-version-min=10.10") + set_target_properties(discord-rpc PROPERTIES INTERFACE_LINK_LIBRARIES "${DISCORD_LINK_LIBRARIES}") + endif () +endif() + +if (NOT WIN32) + find_package(ZLIB REQUIRED) + set(ZLIB_LIBRARIES ZLIB::ZLIB CACHE STRING "zlib libraries" FORCE) endif() add_subdirectory(extern/nod) diff --git a/extern/athena b/extern/athena index a87e8bb39..11b86d763 160000 --- a/extern/athena +++ b/extern/athena @@ -1 +1 @@ -Subproject commit a87e8bb39f8548f1418a5f68353c9fca890ba5df +Subproject commit 11b86d7634f883da6ab38d2ebfb604b38824ae67 diff --git a/extern/boo b/extern/boo index cd25ff4ab..e23eedb33 160000 --- a/extern/boo +++ b/extern/boo @@ -1 +1 @@ -Subproject commit cd25ff4abfeb8c32256447f97a1a829bdbaf262c +Subproject commit e23eedb338f55cc3fcd47915ac30dd3d625ae9b0 diff --git a/extern/nod b/extern/nod index 311d20532..d14b798b5 160000 --- a/extern/nod +++ b/extern/nod @@ -1 +1 @@ -Subproject commit 311d20532e5c94d605f6725f1ba2b9a4b196aef1 +Subproject commit d14b798b5f79c566ba6e6ca0434ce155f2b81d1b diff --git a/hecl/lib/WideStringConvert.cpp b/hecl/lib/WideStringConvert.cpp index ee932b583..036e3d385 100644 --- a/hecl/lib/WideStringConvert.cpp +++ b/hecl/lib/WideStringConvert.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace hecl { static logvisor::Module Log("hecl-wsconv"); diff --git a/specter/lib/TextView.cpp b/specter/lib/TextView.cpp index 140cdbce7..49ed1e334 100644 --- a/specter/lib/TextView.cpp +++ b/specter/lib/TextView.cpp @@ -1,7 +1,7 @@ #include "specter/RootView.hpp" #include "specter/TextView.hpp" #include "specter/ViewResources.hpp" -#include "utf8proc.h" +#include "athena/utf8proc.h" #include "hecl/Pipeline.hpp" #include