AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: Add libgtk-3-dev, disable freetype in macOS build

This commit is contained in:
Luke Street 2022-03-16 02:33:39 -04:00
parent b8bddf8cae
commit b4e242b88d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -47,7 +47,7 @@ jobs:
sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \ sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \
zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \ zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default libfreetype-dev \ libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default libfreetype-dev \
libxinerama-dev libxcursor-dev python3-markupsafe libxinerama-dev libxcursor-dev python3-markupsafe libgtk-3-dev
yarn global add @sentry/cli yarn global add @sentry/cli
echo "$(yarn global bin)" >> $GITHUB_PATH echo "$(yarn global bin)" >> $GITHUB_PATH
@ -104,7 +104,7 @@ jobs:
run: | run: |
brew update brew update
brew upgrade --formula brew upgrade --formula
brew install ninja graphicsmagick imagemagick freetype brew install ninja graphicsmagick imagemagick
yarn global add create-dmg yarn global add create-dmg
pip3 install markupsafe==2.0.1 pip3 install markupsafe==2.0.1

2
Runtime/Character/CCharacterFactory.hpp
View File

@ -10,6 +10,7 @@
#include "Runtime/IFactory.hpp" #include "Runtime/IFactory.hpp"
#include "Runtime/IObjFactory.hpp" #include "Runtime/IObjFactory.hpp"
#include "Runtime/Character/CAnimationSet.hpp" #include "Runtime/Character/CAnimationSet.hpp"
#include "Runtime/Character/CCharacterInfo.hpp"
namespace metaforce { namespace metaforce {
class CAdditiveAnimationInfo; class CAdditiveAnimationInfo;
@ -18,7 +19,6 @@ class CAnimCharacterSet;
class CAnimData; class CAnimData;
class CAnimationManager; class CAnimationManager;
class CCharLayoutInfo; class CCharLayoutInfo;
class CCharacterInfo;
class CSimplePool; class CSimplePool;
class CTransitionDatabaseGame; class CTransitionDatabaseGame;
class CTransitionManager; class CTransitionManager;