From 3664b1b8d17059561a60262b1074f124cfef7cb6 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 6 Jun 2021 17:35:39 -0700 Subject: [PATCH] More compile fixes, disable clang CI for now --- .github/workflows/build.yml | 1 + .github/workflows/release.yml | 1 + Runtime/MP1/CPlayMovie.cpp | 2 ++ Runtime/MP1/CPreFrontEnd.cpp | 2 ++ 4 files changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d56f329e..3ef5736ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,6 +150,7 @@ jobs: build-windows-clang: name: Build Windows (Clang x86_64) + if: 'false' # disabled due to header issues runs-on: windows-2019 env: LLVM_VERSION: 10.0.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e89624e6b..12958b708 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -258,6 +258,7 @@ jobs: build-windows-clang: name: Build Windows (Clang x86_64) + if: 'false' # disabled due to header issues runs-on: windows-2019 env: LLVM_VERSION: 10.0.1 diff --git a/Runtime/MP1/CPlayMovie.cpp b/Runtime/MP1/CPlayMovie.cpp index e71cfe1f1..afb06c32f 100644 --- a/Runtime/MP1/CPlayMovie.cpp +++ b/Runtime/MP1/CPlayMovie.cpp @@ -1,5 +1,7 @@ #include "Runtime/MP1/CPlayMovie.hpp" +#include "Runtime/GuiSys/CGuiFrame.hpp" + namespace metaforce::MP1 { const char* kMovies[] = {"Video/wingame.thp", "Video/wingame_good.thp", "Video/wingame_best.thp", diff --git a/Runtime/MP1/CPreFrontEnd.cpp b/Runtime/MP1/CPreFrontEnd.cpp index e21ec0c66..1eb3c48b6 100644 --- a/Runtime/MP1/CPreFrontEnd.cpp +++ b/Runtime/MP1/CPreFrontEnd.cpp @@ -2,6 +2,8 @@ #include "Runtime/CResLoader.hpp" #include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/GuiSys/CGuiFrame.hpp" + #include "Runtime/MP1/MP1.hpp" namespace metaforce::MP1 {