From 5ac7bf38cbc40155b191a6cf9bfe2d07a9f8c4c1 Mon Sep 17 00:00:00 2001 From: Gustavo Maciel Date: Sun, 30 Jul 2023 16:36:03 -0300 Subject: [PATCH 1/2] fix: manual build not working for Godot v4.1+ --- .github/workflows/manual_release_ios.yml | 9 +-------- .github/workflows/release_ios_v3_3+.yml | 9 +-------- SConstruct | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/manual_release_ios.yml b/.github/workflows/manual_release_ios.yml index 061b74d..6cf22f7 100755 --- a/.github/workflows/manual_release_ios.yml +++ b/.github/workflows/manual_release_ios.yml @@ -90,14 +90,7 @@ jobs: env: SCONS_CACHE: ${{github.workspace}}/godot-${{env.CURRENT_GODOT_VERSION}}-stable/.scons_cache/ run: | - VERSION_TO_BUILD=0 - - if [ ${CURRENT_GODOT_VERSION:0:1} -gt 3 ] - then - VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:3} - else - VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x - fi + VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x ./scripts/release_static_library.sh ${VERSION_TO_BUILD} diff --git a/.github/workflows/release_ios_v3_3+.yml b/.github/workflows/release_ios_v3_3+.yml index 933d4bf..2789d33 100755 --- a/.github/workflows/release_ios_v3_3+.yml +++ b/.github/workflows/release_ios_v3_3+.yml @@ -117,14 +117,7 @@ jobs: env: SCONS_CACHE: ${{github.workspace}}/godot-${{env.CURRENT_GODOT_VERSION}}-stable/.scons_cache/ run: | - VERSION_TO_BUILD=0 - - if [ ${CURRENT_GODOT_VERSION:0:1} -gt 3 ] - then - VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:3} - else - VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x - fi + VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x ./scripts/release_static_library.sh ${VERSION_TO_BUILD} diff --git a/SConstruct b/SConstruct index c28c1a7..6ea8ae2 100755 --- a/SConstruct +++ b/SConstruct @@ -25,7 +25,7 @@ opts.Add(BoolVariable('simulator', "Compilation platform", 'no')) opts.Add(BoolVariable('use_llvm', "Use the LLVM / Clang compiler", 'no')) opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'bin/')) opts.Add(EnumVariable('plugin', 'Plugin to build', '', ['', 'admob'])) -opts.Add(EnumVariable('version', 'Godot version to target', '', ['', '3.x', '4.0'])) +opts.Add(EnumVariable('version', 'Godot version to target', '', ['', '3.x', '4.x'])) # Updates the environment with the option variables. opts.Update(env) From d75fa9ca0c92a702ac5cc99e5bc463589fedaa12 Mon Sep 17 00:00:00 2001 From: Gustavo Maciel Date: Sun, 30 Jul 2023 16:43:31 -0300 Subject: [PATCH 2/2] fix: change SConstruct env['version'] value --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 6ea8ae2..0517b08 100755 --- a/SConstruct +++ b/SConstruct @@ -134,7 +134,7 @@ if env['version'] == '3.x': if env['arch'] != 'armv7': env.Prepend(CXXFLAGS=['-fomit-frame-pointer']) -elif env['version'] == '4.0': +elif env['version'] == '4.x': env.Append(CCFLAGS=["$IOS_SDK_PATH"]) env.Prepend(CXXFLAGS=['-DIOS_ENABLED']) env.Prepend(CXXFLAGS=['-DVERSION_4_0'])