Skip to content

fixes to make just launch work on macos #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
paulsonnentag wants to merge 1 commit into from
Closed

fixes to make just launch work on macos #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Endless projects
MODDABLE_PLATFORMER_REPO=endlessm/moddable-platformer
MODDABLE_PLATFORMER_REPO=https://github.com/endlessm/moddable-platformer
MODDABLE_PLATFORMER_REF=godot-4.6
THREADBARE_REPO=endlessm/threadbare
THREADBARE_REPO=https://github.com/endlessm/threadbare
THREADBARE_REF=godot-4.6

# Godot
GODOT_REPO=godotengine/godot.git
GODOT_REPO=https://github.com/godotengine/godot.git
GODOT_REF=bb92a4c8e27e30cdec05ab6d540d724b9b3cfb72

# Godot formatters for LLVM
GODOT_FORMATTERS_REPO=nikitalita/GodotFormatters.git
GODOT_FORMATTERS_REPO=https://github.com/nikitalita/GodotFormatters.git
GODOT_FORMATTERS_REF=master
12 changes: 6 additions & 6 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ build-godot profile: _link-godot
cd "build/godot"
# TODO: figure out a way to see if scons actually needs a run, since this takes forever even when built
if [[ {{profile}} = "release" ]] ; then
scons dev_build=no debug_symbols=no target=editor deprecated=yes minizip=yes compiledb=yes
scons dev_build=no debug_symbols=no target=editor deprecated=yes minizip=yes compiledb=yes metal=no
elif [[ {{profile}} = "sani" ]] ; then
scons dev_build=yes target=editor compiledb=yes deprecated=yes minizip=yes tests=yes use_asan=yes
scons dev_build=yes target=editor compiledb=yes deprecated=yes minizip=yes tests=yes use_asan=yes metal=no
else
scons dev_build=yes target=editor compiledb=yes deprecated=yes minizip=yes tests=yes
scons dev_build=yes target=editor compiledb=yes deprecated=yes minizip=yes tests=yes metal=no
fi

# Build the Rust plugin binaries.
Expand Down Expand Up @@ -156,8 +156,8 @@ _build-plugin-single-arch architecture profile: (_build-plugin architecture prof
build/patchwork/bin/patchwork_rust_core.linux.{{architecture}}.so
fi

if [ -f "target/{{architecture}}/{{profile}}/patchwork_rust_core.dylib" ] ; then
cp "target/{{architecture}}/{{profile}}/patchwork_rust_core.dylib" \
if [ -f "target/{{architecture}}/{{profile}}/libpatchwork_rust_core.dylib" ] ; then
cp "target/{{architecture}}/{{profile}}/libpatchwork_rust_core.dylib" \
build/patchwork/bin/libpatchwork_rust_core.macos.framework/libpatchwork_rust_core.macos.dylib
fi

Expand Down Expand Up @@ -361,7 +361,7 @@ launch project="moddable-platformer" patchwork_profile="release" godot_profile="
ext=".exe" ;;
"linux")
ext="" ;;
"mac")
"mac"|"macos")
ext="" ;;
*)
echo "Unsupported OS for development: {{os()}}."
Expand Down
Loading