diff --git a/.github/workflows/linux_export.yml b/.github/workflows/linux_export.yml index fc7761a..a54b25b 100644 --- a/.github/workflows/linux_export.yml +++ b/.github/workflows/linux_export.yml @@ -42,6 +42,7 @@ jobs: - name: Godot Export run: | set -x + mkdir godot/.godot touch godot/.godot/extension_list.cfg echo "res://rust.gdextension" >> godot/.godot/extension_list.cfg just linux-release @@ -84,9 +85,9 @@ jobs: - name: Godot Export run: | set -x + mkdir godot/.godot touch godot/.godot/extension_list.cfg echo "res://rust.gdextension" >> godot/.godot/extension_list.cfg - godot --headless -q -e --quit echo "export/android/java_sdk_path = \"$(dirname $(dirname $(which java)))\"" >> ~/.config/godot/editor_settings-4.tres echo "export/android/android_sdk_path = \"$(pwd)/dependencies/android-sdk/\"" >> ~/.config/godot/editor_settings-4.tres export GODOT_ANDROID_KEYSTORE_RELEASE_PATH="$PWD/secrets/debug.keystore" diff --git a/.github/workflows/macos_export.yml b/.github/workflows/macos_export.yml new file mode 100644 index 0000000..dc55111 --- /dev/null +++ b/.github/workflows/macos_export.yml @@ -0,0 +1,122 @@ +name: MacOS Export + +on: [push] + +env: + CARGO_TERM_COLOR: always + RUSTFLAGS: -Dwarnings + CARGO_INCREMENTAL: 0 + PROJECT_NAME: Godot Spike + WORKING_DIRECTORY: godot + IOS_APPLE_ID_USERNAME: ${{ secrets.IOS_APPLE_ID_USERNAME }} + IOS_APPLE_ID_PASSWORD: ${{ secrets.IOS_APPLE_ID_PASSWORD }} + + BUILD_CERTIFICATE_BASE64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} + P12_PASSWORD: ${{ secrets.P12_PASSWORD }} + BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }} + KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} + +jobs: + export-macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + components: rustfmt, clippy + - uses: rui314/setup-mold@v1 + - uses: chickensoft-games/setup-godot@v1 + name: Setup Godot + with: + version: 4.2.2 + include-templates: true + use-dotnet: false + - uses: Swatinem/rust-cache@v2 + with: + workspaces: "rust -> target" + cache-all-crates: "true" + + - name: Install just + run: cargo install just + + - name: just Check + run: just --version + + - name: Godot Check + run: | + godot --version + + - name: Godot Export + run: | + set -x + mkdir godot/.godot + touch godot/.godot/extension_list.cfg + echo "res://rust.gdextension" >> godot/.godot/extension_list.cfg + just macos-release + + export-ios: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/checkout@v2 + + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + components: rustfmt, clippy + - uses: rui314/setup-mold@v1 + - uses: chickensoft-games/setup-godot@v1 + name: Setup Godot + with: + version: 4.2.2 + include-templates: true + use-dotnet: false + - uses: Swatinem/rust-cache@v2 + with: + workspaces: "rust -> target" + cache-all-crates: "true" + + - name: Install just + run: cargo install just + + - name: just Check + run: just --version + + - name: Godot Check + run: | + godot --version + + - name: Godot Export + run: | + set -x + mkdir godot/.godot + touch godot/.godot/extension_list.cfg + echo "res://rust.gdextension" >> godot/.godot/extension_list.cfg + + # create variables + CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 + PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision + KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db + + # import certificate and provisioning profile from secrets + echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH + echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH + + # create temporary keychain + security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH + security set-keychain-settings -lut 21600 $KEYCHAIN_PATH + security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH + + # import certificate to keychain + security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH + security list-keychain -d user -s $KEYCHAIN_PATH + + # apply provisioning profile + mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles + cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles + + just setup-ios + just ios-debug diff --git a/.gitignore b/.gitignore index 61e45c1..66e8219 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,4 @@ secrets/ export/ rust/target/ .godot/ -!.godot/imported/ -!.godot/global_script_class_cache.cfg *.vscode/ diff --git a/export/macos/.gitkeep b/export/macos/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/godot/.godot/global_script_class_cache.cfg b/godot/.godot/global_script_class_cache.cfg deleted file mode 100644 index 3eb53ea..0000000 --- a/godot/.godot/global_script_class_cache.cfg +++ /dev/null @@ -1,43 +0,0 @@ -list=Array[Dictionary]([{ -"base": &"VBoxContainer", -"class": &"AutoRefresh", -"icon": "", -"language": &"GDScript", -"path": "res://src/widgets/AutoRefresh/auto_refresh.gd" -}, { -"base": &"Button", -"class": &"DragAndDropItem", -"icon": "", -"language": &"GDScript", -"path": "res://src/widgets/dragable_item/draggable.gd" -}, { -"base": &"EditorPlugin", -"class": &"FormatOnSave", -"icon": "", -"language": &"GDScript", -"path": "res://addons/format_on_save/format_on_save.gd" -}, { -"base": &"RefCounted", -"class": &"GutHookScript", -"icon": "", -"language": &"GDScript", -"path": "res://addons/gut/hook_script.gd" -}, { -"base": &"RefCounted", -"class": &"GutStringUtils", -"icon": "", -"language": &"GDScript", -"path": "res://addons/gut/strutils.gd" -}, { -"base": &"Node", -"class": &"GutTest", -"icon": "", -"language": &"GDScript", -"path": "res://addons/gut/test.gd" -}, { -"base": &"Object", -"class": &"GutUtils", -"icon": "", -"language": &"GDScript", -"path": "res://addons/gut/utils.gd" -}]) diff --git a/godot/.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60afbe608aa49.fontdata b/godot/.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60afbe608aa49.fontdata deleted file mode 100644 index f1d0907..0000000 Binary files a/godot/.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60afbe608aa49.fontdata and /dev/null differ diff --git a/godot/.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60afbe608aa49.md5 b/godot/.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60afbe608aa49.md5 deleted file mode 100644 index eeec8d1..0000000 --- a/godot/.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60afbe608aa49.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="401e77d048b500d714375a77d4ca4326" -dest_md5="e5a412eda16e1d823e7edfffe7460b67" - diff --git a/godot/.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd32c4f0754d8c83d.fontdata b/godot/.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd32c4f0754d8c83d.fontdata deleted file mode 100644 index 71b31fe..0000000 Binary files a/godot/.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd32c4f0754d8c83d.fontdata and /dev/null differ diff --git a/godot/.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd32c4f0754d8c83d.md5 b/godot/.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd32c4f0754d8c83d.md5 deleted file mode 100644 index 38e0726..0000000 --- a/godot/.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd32c4f0754d8c83d.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="75a018507317f09d0004b8c1148dd3e5" -dest_md5="679d3767ce4f77408ad994917e598186" - diff --git a/godot/.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d570de2a42c1.fontdata b/godot/.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d570de2a42c1.fontdata deleted file mode 100644 index 52be5b0..0000000 Binary files a/godot/.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d570de2a42c1.fontdata and /dev/null differ diff --git a/godot/.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d570de2a42c1.md5 b/godot/.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d570de2a42c1.md5 deleted file mode 100644 index 136b902..0000000 --- a/godot/.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d570de2a42c1.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="b3f0e3061651d3bf5c65104a3179e57b" -dest_md5="f7aff71c2f9645f52c2212eb216dc6a5" - diff --git a/godot/.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca8d8ff1724f13.fontdata b/godot/.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca8d8ff1724f13.fontdata deleted file mode 100644 index 5f05d69..0000000 Binary files a/godot/.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca8d8ff1724f13.fontdata and /dev/null differ diff --git a/godot/.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca8d8ff1724f13.md5 b/godot/.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca8d8ff1724f13.md5 deleted file mode 100644 index 49ec735..0000000 --- a/godot/.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca8d8ff1724f13.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="418d6668afcddb7714104f43bfb39657" -dest_md5="833039e4737803291cf2a1b80ded72e8" - diff --git a/godot/.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e7756f4fa235.fontdata b/godot/.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e7756f4fa235.fontdata deleted file mode 100644 index 4dc0694..0000000 Binary files a/godot/.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e7756f4fa235.fontdata and /dev/null differ diff --git a/godot/.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e7756f4fa235.md5 b/godot/.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e7756f4fa235.md5 deleted file mode 100644 index 94a8c46..0000000 --- a/godot/.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e7756f4fa235.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="696e70ec3151341523d0a1362670d8ad" -dest_md5="66128c4c7d6f88412784bff3d7ec6833" - diff --git a/godot/.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8f96313da4ad7019.fontdata b/godot/.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8f96313da4ad7019.fontdata deleted file mode 100644 index 8312906..0000000 Binary files a/godot/.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8f96313da4ad7019.fontdata and /dev/null differ diff --git a/godot/.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8f96313da4ad7019.md5 b/godot/.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8f96313da4ad7019.md5 deleted file mode 100644 index f666f99..0000000 --- a/godot/.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8f96313da4ad7019.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="15e9706fbc67b38db21e8e963fc1a6c0" -dest_md5="9d42ca86e45e35f527268a50ff3302c1" - diff --git a/godot/.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72fb20b907112.fontdata b/godot/.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72fb20b907112.fontdata deleted file mode 100644 index 0408568..0000000 Binary files a/godot/.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72fb20b907112.fontdata and /dev/null differ diff --git a/godot/.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72fb20b907112.md5 b/godot/.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72fb20b907112.md5 deleted file mode 100644 index 4117698..0000000 --- a/godot/.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72fb20b907112.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="ace04e0c254883041bc7effb9d951cf2" -dest_md5="01bbdd6ea5ed5db11c72d6b8ddc09e57" - diff --git a/godot/.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a84c14b4f1fe23.fontdata b/godot/.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a84c14b4f1fe23.fontdata deleted file mode 100644 index ba38145..0000000 Binary files a/godot/.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a84c14b4f1fe23.fontdata and /dev/null differ diff --git a/godot/.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a84c14b4f1fe23.md5 b/godot/.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a84c14b4f1fe23.md5 deleted file mode 100644 index f78f684..0000000 --- a/godot/.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a84c14b4f1fe23.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="03ef685b34f3356631c3f60c91917002" -dest_md5="49ab49592f43367f99e411b6beb096bf" - diff --git a/godot/.godot/imported/Folder.svg-caa50e6a0be9d456fd81991dfb537916.ctex b/godot/.godot/imported/Folder.svg-caa50e6a0be9d456fd81991dfb537916.ctex deleted file mode 100644 index 364bfde..0000000 Binary files a/godot/.godot/imported/Folder.svg-caa50e6a0be9d456fd81991dfb537916.ctex and /dev/null differ diff --git a/godot/.godot/imported/Folder.svg-caa50e6a0be9d456fd81991dfb537916.md5 b/godot/.godot/imported/Folder.svg-caa50e6a0be9d456fd81991dfb537916.md5 deleted file mode 100644 index 97524cd..0000000 --- a/godot/.godot/imported/Folder.svg-caa50e6a0be9d456fd81991dfb537916.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="b2eb5b5a4efd5c7a7ebed1d28d72d7e8" -dest_md5="43e6e3c565cecde497e3dca4f9324533" - diff --git a/godot/.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a4788186f3dcb.fontdata b/godot/.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a4788186f3dcb.fontdata deleted file mode 100644 index ca875d0..0000000 Binary files a/godot/.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a4788186f3dcb.fontdata and /dev/null differ diff --git a/godot/.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a4788186f3dcb.md5 b/godot/.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a4788186f3dcb.md5 deleted file mode 100644 index 2924b64..0000000 --- a/godot/.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a4788186f3dcb.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="a39e5778312a715a82d7afe88ebac015" -dest_md5="2ff03d243427673442953485f72ee755" - diff --git a/godot/.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa974176016de19.fontdata b/godot/.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa974176016de19.fontdata deleted file mode 100644 index 670ce47..0000000 Binary files a/godot/.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa974176016de19.fontdata and /dev/null differ diff --git a/godot/.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa974176016de19.md5 b/godot/.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa974176016de19.md5 deleted file mode 100644 index c115d4e..0000000 --- a/godot/.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa974176016de19.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="9f56fb2bffbac7662cb53b783248698a" -dest_md5="4095d2e475b73f7e3cfa641bf08a58ee" - diff --git a/godot/.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c4ee75159e.fontdata b/godot/.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c4ee75159e.fontdata deleted file mode 100644 index f1ff8ac..0000000 Binary files a/godot/.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c4ee75159e.fontdata and /dev/null differ diff --git a/godot/.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c4ee75159e.md5 b/godot/.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c4ee75159e.md5 deleted file mode 100644 index a4e8d20..0000000 --- a/godot/.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c4ee75159e.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="40a68e931d9f1c543eac616acb53b2d8" -dest_md5="8227e06ec0fc86a3d61b098543bce7be" - diff --git a/godot/.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd875d0fe04b.fontdata b/godot/.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd875d0fe04b.fontdata deleted file mode 100644 index 4ed88ad..0000000 Binary files a/godot/.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd875d0fe04b.fontdata and /dev/null differ diff --git a/godot/.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd875d0fe04b.md5 b/godot/.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd875d0fe04b.md5 deleted file mode 100644 index 8584f9c..0000000 --- a/godot/.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd875d0fe04b.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="fb8c29136b1ee99fe9dd45a6f8bcc9fd" -dest_md5="e4bf8ae34f8a7fee963c13a5edb43c55" - diff --git a/godot/.godot/imported/Script.svg-34c66aae9c985e3e0470426acbbcda04.ctex b/godot/.godot/imported/Script.svg-34c66aae9c985e3e0470426acbbcda04.ctex deleted file mode 100644 index 92f8f20..0000000 Binary files a/godot/.godot/imported/Script.svg-34c66aae9c985e3e0470426acbbcda04.ctex and /dev/null differ diff --git a/godot/.godot/imported/Script.svg-34c66aae9c985e3e0470426acbbcda04.md5 b/godot/.godot/imported/Script.svg-34c66aae9c985e3e0470426acbbcda04.md5 deleted file mode 100644 index 36ae93e..0000000 --- a/godot/.godot/imported/Script.svg-34c66aae9c985e3e0470426acbbcda04.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="bfe6d3baadf5fbe569922334140eb2fe" -dest_md5="a1f5358b8ed3c01a32ddfa4b67484795" - diff --git a/godot/.godot/imported/arrow.png-2b5b2d838b5b3467cf300ac2da1630d9.ctex b/godot/.godot/imported/arrow.png-2b5b2d838b5b3467cf300ac2da1630d9.ctex deleted file mode 100644 index 77acd62..0000000 Binary files a/godot/.godot/imported/arrow.png-2b5b2d838b5b3467cf300ac2da1630d9.ctex and /dev/null differ diff --git a/godot/.godot/imported/arrow.png-2b5b2d838b5b3467cf300ac2da1630d9.md5 b/godot/.godot/imported/arrow.png-2b5b2d838b5b3467cf300ac2da1630d9.md5 deleted file mode 100644 index 19c6d01..0000000 --- a/godot/.godot/imported/arrow.png-2b5b2d838b5b3467cf300ac2da1630d9.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="e08fa5e2d1db0b8c3be5d7c3a283e0d6" -dest_md5="4a3771c003760773de74ab4e1fcdf319" - diff --git a/godot/.godot/imported/download.png-ea320563117dc97148ee50507799467b.ctex b/godot/.godot/imported/download.png-ea320563117dc97148ee50507799467b.ctex deleted file mode 100644 index 76d5041..0000000 Binary files a/godot/.godot/imported/download.png-ea320563117dc97148ee50507799467b.ctex and /dev/null differ diff --git a/godot/.godot/imported/download.png-ea320563117dc97148ee50507799467b.md5 b/godot/.godot/imported/download.png-ea320563117dc97148ee50507799467b.md5 deleted file mode 100644 index 058d281..0000000 --- a/godot/.godot/imported/download.png-ea320563117dc97148ee50507799467b.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="eec5b49020efb7895ff997aafbfacd2f" -dest_md5="17fac642cfcfbc43539f9cb394882a7a" - diff --git a/godot/.godot/imported/green.png-e3a17091688e10a7013279b38edc7f8a.ctex b/godot/.godot/imported/green.png-e3a17091688e10a7013279b38edc7f8a.ctex deleted file mode 100644 index 7b05632..0000000 Binary files a/godot/.godot/imported/green.png-e3a17091688e10a7013279b38edc7f8a.ctex and /dev/null differ diff --git a/godot/.godot/imported/green.png-e3a17091688e10a7013279b38edc7f8a.md5 b/godot/.godot/imported/green.png-e3a17091688e10a7013279b38edc7f8a.md5 deleted file mode 100644 index 5435ed2..0000000 --- a/godot/.godot/imported/green.png-e3a17091688e10a7013279b38edc7f8a.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="7e797286efcb86b4faa1ffb8c94d3729" -dest_md5="9dd9518447983107985e8dea670a3760" - diff --git a/godot/.godot/imported/icon.png-91b084043b8aaf2f1c906e7b9fa92969.ctex b/godot/.godot/imported/icon.png-91b084043b8aaf2f1c906e7b9fa92969.ctex deleted file mode 100644 index 93f359b..0000000 Binary files a/godot/.godot/imported/icon.png-91b084043b8aaf2f1c906e7b9fa92969.ctex and /dev/null differ diff --git a/godot/.godot/imported/icon.png-91b084043b8aaf2f1c906e7b9fa92969.md5 b/godot/.godot/imported/icon.png-91b084043b8aaf2f1c906e7b9fa92969.md5 deleted file mode 100644 index 4467715..0000000 --- a/godot/.godot/imported/icon.png-91b084043b8aaf2f1c906e7b9fa92969.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="f882b9f30a6463fbe33f92d3de5591a1" -dest_md5="47f392d2dafc98219db2ee08876166fe" - diff --git a/godot/.godot/imported/icon.svg-6c8e7c7a8dcdd81e58bcb0386e6e4017.ctex b/godot/.godot/imported/icon.svg-6c8e7c7a8dcdd81e58bcb0386e6e4017.ctex deleted file mode 100644 index b3dc4e7..0000000 Binary files a/godot/.godot/imported/icon.svg-6c8e7c7a8dcdd81e58bcb0386e6e4017.ctex and /dev/null differ diff --git a/godot/.godot/imported/icon.svg-6c8e7c7a8dcdd81e58bcb0386e6e4017.md5 b/godot/.godot/imported/icon.svg-6c8e7c7a8dcdd81e58bcb0386e6e4017.md5 deleted file mode 100644 index 1a4a624..0000000 --- a/godot/.godot/imported/icon.svg-6c8e7c7a8dcdd81e58bcb0386e6e4017.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="43b305bd3d55f8faec5e5175cbe35533" -dest_md5="cd597a3db8bc95c5fb8eb9c9d8ecf49d" - diff --git a/godot/.godot/imported/play.png-5c90e88e8136487a183a099d67a7de24.ctex b/godot/.godot/imported/play.png-5c90e88e8136487a183a099d67a7de24.ctex deleted file mode 100644 index 69475d8..0000000 Binary files a/godot/.godot/imported/play.png-5c90e88e8136487a183a099d67a7de24.ctex and /dev/null differ diff --git a/godot/.godot/imported/play.png-5c90e88e8136487a183a099d67a7de24.md5 b/godot/.godot/imported/play.png-5c90e88e8136487a183a099d67a7de24.md5 deleted file mode 100644 index 667fffd..0000000 --- a/godot/.godot/imported/play.png-5c90e88e8136487a183a099d67a7de24.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="a7e19d807f2c9531dad610497baf5c99" -dest_md5="a4b804eb87c97b53fccc0d3a20a03e22" - diff --git a/godot/.godot/imported/red.png-47a557c3922e800f76686bc1a4ad0c3c.ctex b/godot/.godot/imported/red.png-47a557c3922e800f76686bc1a4ad0c3c.ctex deleted file mode 100644 index 5322612..0000000 Binary files a/godot/.godot/imported/red.png-47a557c3922e800f76686bc1a4ad0c3c.ctex and /dev/null differ diff --git a/godot/.godot/imported/red.png-47a557c3922e800f76686bc1a4ad0c3c.md5 b/godot/.godot/imported/red.png-47a557c3922e800f76686bc1a4ad0c3c.md5 deleted file mode 100644 index 5c7067d..0000000 --- a/godot/.godot/imported/red.png-47a557c3922e800f76686bc1a4ad0c3c.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="76aafb04bec0b2c96e9bbcd625a4f6a1" -dest_md5="39aa4086ff9a60a7337c59f1bfe17ac1" - diff --git a/godot/.godot/imported/source_code_pro.fnt-042fb383b3c7b4c19e67c852f7fbefca.fontdata b/godot/.godot/imported/source_code_pro.fnt-042fb383b3c7b4c19e67c852f7fbefca.fontdata deleted file mode 100644 index 3e6121c..0000000 Binary files a/godot/.godot/imported/source_code_pro.fnt-042fb383b3c7b4c19e67c852f7fbefca.fontdata and /dev/null differ diff --git a/godot/.godot/imported/source_code_pro.fnt-042fb383b3c7b4c19e67c852f7fbefca.md5 b/godot/.godot/imported/source_code_pro.fnt-042fb383b3c7b4c19e67c852f7fbefca.md5 deleted file mode 100644 index 00eb35b..0000000 --- a/godot/.godot/imported/source_code_pro.fnt-042fb383b3c7b4c19e67c852f7fbefca.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="6b13e81eab722af33d424ec5a589068e" -dest_md5="77e111b8cff5ee07c66010f63ca68801" - diff --git a/godot/.godot/imported/yellow.png-b3cf3d463958a169d909273d3d742052.ctex b/godot/.godot/imported/yellow.png-b3cf3d463958a169d909273d3d742052.ctex deleted file mode 100644 index a4a9692..0000000 Binary files a/godot/.godot/imported/yellow.png-b3cf3d463958a169d909273d3d742052.ctex and /dev/null differ diff --git a/godot/.godot/imported/yellow.png-b3cf3d463958a169d909273d3d742052.md5 b/godot/.godot/imported/yellow.png-b3cf3d463958a169d909273d3d742052.md5 deleted file mode 100644 index da0f82e..0000000 --- a/godot/.godot/imported/yellow.png-b3cf3d463958a169d909273d3d742052.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="2bfcbc12c7b7fc61fc6d0576796962ba" -dest_md5="acb879a463bc0701372e6b74dc6321fd" - diff --git a/godot/rust.gdextension b/godot/rust.gdextension index bc7aa54..d78f2ae 100644 --- a/godot/rust.gdextension +++ b/godot/rust.gdextension @@ -12,3 +12,7 @@ android.debug.arm64 = "res://../rust/target/aarch64-linux-android/debug/libgo android.release.arm64 = "res://../rust/target/aarch64-linux-android/release/libgodot_plugin.so" windows.debug.x86_64 = "res://../rust/target/x86_64-pc-windows-msvc/debug/godot_plugin.dll" windows.release.x86_64 = "res://../rust/target/x86_64-pc-windows-msvc/release/godot_plugin.dll" +macos.debug.arm64 = "res://../rust/target/debug/libgodot_plugin.dylib" +macos.release.arm64 = "res://../rust/target/release/libgodot_plugin.dylib" +ios.debug.arm64 = "res://../rust/target/aarch64-apple-ios/debug/libgodot_plugin.dylib" +ios.release.arm64 = "res://../rust/target/aarch64-apple-ios/release/libgodot_plugin.dylib" diff --git a/justfile b/justfile index e30eb0a..d555037 100644 --- a/justfile +++ b/justfile @@ -56,19 +56,20 @@ windows-release: [macos] macos-debug: - {{rustdir}} cargo build + {{rustdir}} cargo build {{godotdir}} godot --headless --export-debug "macOS" "../export/macos/Godot Spike.dmg" [macos] macos-release: - {{rustdir}} cargo build --release - {{godotdir}} godot --headless --export-release "macOS" "../export/macos/Godot Spike.dmg" + {{rustdir}} cargo build + {{rustdir}} cargo build --release + {{godotdir}} godot --headless --export-release "macOS" "../export/macos/Godot Spike.dmg" [macos] ios-debug: - # NOTE: can only work on MacOS with xcode + {{rustdir}} cargo build {{rustdir}} cargo build --target aarch64-apple-ios - {{godotdir}} godot --headless --export-debug "iOS" "../export/ios/Godot Spike.ipa" + {{godotdir}} godot --headless --import --export-debug "iOS" "../export/ios/Godot Spike.ipa" [macos] ios-release: @@ -82,7 +83,6 @@ setup: just _setup-verify-dependencies _setup-precommit _setup-rust setup-{{os()}} # ------------------------------------------------- -# Execute to verify if all dependencies are installed _setup-verify-dependencies: @ {{message}} "Verifying all required programs are installed...\nAll programs need to be in \$PATH!" rustup --version @@ -106,7 +106,7 @@ setup-windows: rustup target add x86_64-pc-windows-gnu [macos] -setup-macos: +setup-ios: @ {{message}} "Installing Rust tools for iOS builds..." rustup target add aarch64-apple-ios cargo install cargo-lipo