Update submodules (includes LLVM 12 fix)

.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

.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

.gitignore

@@ -8,4 +8,5 @@ docs/*
 Editor/platforms/win/metaforce.rc
 .vs/
 out/
-cmake-build-*/
+cmake-build-*/
+build/

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)

extern/athena

@@ -1 +1 @@
-Subproject commit a87e8bb39f8548f1418a5f68353c9fca890ba5df
+Subproject commit 11b86d7634f883da6ab38d2ebfb604b38824ae67

extern/boo

@@ -1 +1 @@
-Subproject commit cd25ff4abfeb8c32256447f97a1a829bdbaf262c
+Subproject commit e23eedb338f55cc3fcd47915ac30dd3d625ae9b0

extern/nod

@@ -1 +1 @@
-Subproject commit 311d20532e5c94d605f6725f1ba2b9a4b196aef1
+Subproject commit d14b798b5f79c566ba6e6ca0434ce155f2b81d1b

hecl/lib/WideStringConvert.cpp

@@ -1,5 +1,5 @@
 #include <logvisor/logvisor.hpp>
-#include <utf8proc.h>
+#include <athena/utf8proc.h>
 
 namespace hecl {
 static logvisor::Module Log("hecl-wsconv");

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 <boo/graphicsdev/IGraphicsCommandQueue.hpp>