thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move data folder out of app bundle

Browse source
This commit is contained in:
Kayden Tebau 2022-12-18 13:21:26 -08:00
parent 05c62eee57
commit 6b8d03adf2
No known key found for this signature in database
GPG key ID: 933A1F44222C2634
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.circleci/config.yml
View file

@ -198,6 +198,7 @@ jobs:
cp /usr/local/lib/libturbojpeg.0.2.0.dylib libturbojpeg.0.dylib
cp /usr/local/lib/libvorbis.0.4.9.dylib libvorbis.0.4.9.dylib
cp /usr/local/lib/libvorbisfile.3.3.8.dylib libvorbisfile.3.3.8.dylib
cp /usr/local/lib/libvorbisenc.2.0.12.dylib libvorbisenc.2.0.12.dylib
cp /usr/local/lib/libz.1.2.13.dylib libz.1.dylib
# These libraries have dangling RPATHs
install_name_tool -delete_rpath /usr/local/lib libturbojpeg.0.dylib

1
.gitignore vendored
View file

@ -14,6 +14,7 @@ package.json
package-lock.json
macos-dist/MarbleBlast Platinum.app/
macos-dist/data/
.DS_Store
**/.DS_Store

2
package-macos.sh
View file

@ -17,7 +17,7 @@ sed -i "" -e "s/@VERSION@/$1/" "macos-dist/MarbleBlast Platinum.app/Contents/Inf
# Copy binary
cp native/marblegame "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/marblegame" || exit $?
# Copy data
cp -r data "macos-dist/MarbleBlast Platinum.app/Contents/Resources/" || exit $?
cp -r data "macos-dist/" || exit $?
cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/"
install_name_tool -change ui.hdll @rpath/ui.hdll \

2
src/ResourceLoader.hx
View file

@ -23,7 +23,7 @@ import src.Settings;
class ResourceLoader {
#if (hl && !android)
#if MACOS_BUNDLE
public static var fileSystem:FileSystem = new TorqueFileSystem(Path.normalize(Path.join([Path.directory(Sys.programPath()), "..", "Resources"])), null);
public static var fileSystem:FileSystem = new TorqueFileSystem(Path.normalize(Path.join([Path.directory(Sys.programPath()), "..", "..", ".."])), null);
#else
public static var fileSystem:FileSystem = new TorqueFileSystem(".", null);
#end