mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-28 16:51:56 -05:00
Code Issues Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
briaguya 2024-02-19 15:52:58 -05:00
parent e97e843cd9
commit ab83149f9e
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/generate-builds.yml vendored
View File

@ -92,18 +92,16 @@ jobs:
if [ -d /opt/local/ ]; then
echo "MacPorts already installed"
else
wget https://github.com/macports/macports-base/releases/download/v2.7.2/MacPorts-2.7.2-12-Monterey.pkg
sudo installer -pkg ./MacPorts-2.7.2-12-Monterey.pkg -target /
wget https://github.com/macports/macports-base/releases/download/v2.9.1/MacPorts-2.9.1-12-Monterey.pkg
sudo installer -pkg ./MacPorts-2.9.1-12-Monterey.pkg -target /
fi
echo "/opt/local/bin:/opt/local/sbin" >> $GITHUB_PATH
- name: Install dependencies
if: ${{ !vars.MAC_RUNNER }}
run: |
brew uninstall --ignore-dependencies libpng libzip
sudo port selfupdate
sudo port install $(cat .github/workflows/macports-deps.txt)
brew install ninja
brew reinstall libzip
- name: Download soh.otr
uses: actions/download-artifact@v4
with:
@ -237,7 +235,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libzip-dev zipcmp zipmerge ziptool ninja-build
sudo apt-get install -y ninja-build
sudo apt-get remove -y cmake
wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir

0
soh/assets/custom/textures/nintendo_rogo_static/fancyShipDL.xml → soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL
View File

6
soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL.meta
View File

@ -1,6 +0,0 @@
{
"path": "textures/nintendo_rogo_static/fancyShipDL.xml",
"type": "DisplayList",
"format": "XML",
"version": 0
}

4
soh/soh/OTRGlobals.cpp
View File

@ -256,7 +256,7 @@ OTRGlobals::OTRGlobals() {
if (std::filesystem::exists(ootPath)) {
OTRFiles.push_back(ootPath);
}
std::string sohOtrPath = LUS::Context::GetPathRelativeToAppBundle("soh.zip");
std::string sohOtrPath = LUS::Context::GetPathRelativeToAppBundle("soh.otr");
if (std::filesystem::exists(sohOtrPath)) {
OTRFiles.push_back(sohOtrPath);
}
@ -1047,7 +1047,7 @@ extern "C" void InitOTR() {
}
#endif
// CheckSoHOTRVersion(LUS::Context::GetPathRelativeToAppBundle("soh.otr"));
CheckSoHOTRVersion(LUS::Context::GetPathRelativeToAppBundle("soh.otr"));
if (!std::filesystem::exists(LUS::Context::LocateFileAcrossAppDirs("oot-mq.otr", appShortName)) &&
!std::filesystem::exists(LUS::Context::LocateFileAcrossAppDirs("oot.otr", appShortName))){