Skip to content

Commit 492c204

Browse files
committed
Fix android
1 parent ea89ee4 commit 492c204

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/check_pr.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ env:
1010
TARGET_NAME: libGodotFmod
1111
GODOT_VERSION: 4.5
1212
FMOD_VERSION: 20306
13+
NDK_VERSION: 27.3.13750724
1314

1415
jobs:
1516
build:
@@ -100,23 +101,23 @@ jobs:
100101
platform: android
101102
target: editor
102103
fmod-executable-suffix: android.tar.gz
103-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
104+
flags: ndk_version=${{ env.NDK_VERSION }} arch=arm64
104105
shell: bash
105106

106107
- name: Android Debug Compilation
107108
os: "ubuntu-22.04"
108109
platform: android
109110
target: template_debug
110111
fmod-executable-suffix: android.tar.gz
111-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
112+
flags: ndk_version=${{ env.NDK_VERSION }} arch=arm64
112113
shell: bash
113114

114115
- name: Android Release Compilation
115116
os: "ubuntu-22.04"
116117
platform: android
117118
target: template_release
118119
fmod-executable-suffix: android.tar.gz
119-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
120+
flags: ndk_version=${{ env.NDK_VERSION }} arch=arm64
120121
shell: bash
121122

122123
- name: iOS Debug Compilation

.github/workflows/release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
TARGET_NAME: libGodotFmod
1212
GODOT_VERSION: 4.5
1313
FMOD_VERSION: 20306
14+
NDK_VERSION: 27.3.13750724
1415

1516
jobs:
1617
build:
@@ -101,23 +102,23 @@ jobs:
101102
platform: android
102103
target: editor
103104
fmod-executable-suffix: android.tar.gz
104-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
105+
flags: ndk_version=${{ env.NDK_VERSION }} arch=arm64
105106
shell: bash
106107

107108
- name: Android Debug Compilation
108109
os: "ubuntu-22.04"
109110
platform: android
110111
target: template_debug
111112
fmod-executable-suffix: android.tar.gz
112-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
113+
flags: ndk_version=${{ env.NDK_VERSION }} arch=arm64
113114
shell: bash
114115

115116
- name: Android Release Compilation
116117
os: "ubuntu-22.04"
117118
platform: android
118119
target: template_release
119120
fmod-executable-suffix: android.tar.gz
120-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
121+
flags: ndk_version=${{ env.NDK_VERSION }} arch=arm64
121122
shell: bash
122123

123124
- name: iOS Debug Compilation

demo/addons/fmod/fmod.gdextension

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[configuration]
22
entry_symbol = "fmod_library_init"
33
compatibility_minimum = 4.5
4-
android_aar_plugin = true
54

65
[libraries]
76
windows.editor.x86_64 = "res://addons/fmod/libs/windows/libGodotFmod.windows.editor.x86_64.dll"

demo/android/.build_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.4.1.stable
1+
4.5.stable

0 commit comments

Comments
 (0)