Skip to content

Commit 3df38c3

Browse files
committed
Fix android
1 parent ea89ee4 commit 3df38c3

6 files changed

Lines changed: 13 additions & 21 deletions

File tree

.github/actions/create-android-plugin/action.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Create Fmod native build
22
description: Creates fmod native build for a specific platform
3-
env:
4-
GODOT_VERSION: 4.5
53
runs:
64
using: composite
75
steps:

.github/actions/create-native-build/action.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
name: Create Fmod native build
22
description: Creates fmod native build for a specific platform
3-
env:
4-
TARGET_PATH: demo/addons/fmod/libs/
5-
TARGET_NAME: libGodotFmod
6-
GODOT_VERSION: 4.5
7-
FMOD_VERSION: 20306
83
inputs:
94
platform:
105
description: The platform to build for.

.github/workflows/check_pr.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ on:
55

66
# Global Settings
77
env:
8-
PROJECT_FOLDER: fmod-gdextension
8+
GODOT_VERSION: 4.5
9+
NDK_VERSION: 27.3.13750724
910
TARGET_PATH: demo/addons/fmod/libs/
1011
TARGET_NAME: libGodotFmod
11-
GODOT_VERSION: 4.5
1212
FMOD_VERSION: 20306
13-
1413
jobs:
1514
build:
1615
name: ${{ matrix.name }}
@@ -100,23 +99,23 @@ jobs:
10099
platform: android
101100
target: editor
102101
fmod-executable-suffix: android.tar.gz
103-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
102+
flags: ndk_version=$NDK_VERSION arch=arm64
104103
shell: bash
105104

106105
- name: Android Debug Compilation
107106
os: "ubuntu-22.04"
108107
platform: android
109108
target: template_debug
110109
fmod-executable-suffix: android.tar.gz
111-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
110+
flags: ndk_version=$NDK_VERSION arch=arm64
112111
shell: bash
113112

114113
- name: Android Release Compilation
115114
os: "ubuntu-22.04"
116115
platform: android
117116
target: template_release
118117
fmod-executable-suffix: android.tar.gz
119-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
118+
flags: ndk_version=$NDK_VERSION arch=arm64
120119
shell: bash
121120

122121
- name: iOS Debug Compilation

.github/workflows/release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ on:
66

77
# Global Settings
88
env:
9-
PROJECT_FOLDER: fmod-gdextension
9+
GODOT_VERSION: 4.5
10+
NDK_VERSION: 27.3.13750724
1011
TARGET_PATH: demo/addons/fmod/libs/
1112
TARGET_NAME: libGodotFmod
12-
GODOT_VERSION: 4.5
1313
FMOD_VERSION: 20306
14-
1514
jobs:
1615
build:
1716
name: ${{ matrix.name }}
@@ -101,23 +100,23 @@ jobs:
101100
platform: android
102101
target: editor
103102
fmod-executable-suffix: android.tar.gz
104-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
103+
flags: ndk_version=$NDK_VERSION arch=arm64
105104
shell: bash
106105

107106
- name: Android Debug Compilation
108107
os: "ubuntu-22.04"
109108
platform: android
110109
target: template_debug
111110
fmod-executable-suffix: android.tar.gz
112-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
111+
flags: ndk_version=$NDK_VERSION arch=arm64
113112
shell: bash
114113

115114
- name: Android Release Compilation
116115
os: "ubuntu-22.04"
117116
platform: android
118117
target: template_release
119118
fmod-executable-suffix: android.tar.gz
120-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
119+
flags: ndk_version=$NDK_VERSION arch=arm64
121120
shell: bash
122121

123122
- name: iOS Debug Compilation
@@ -176,6 +175,8 @@ jobs:
176175

177176
- name: Create android plugin
178177
uses: ./.github/actions/create-android-plugin
178+
with:
179+
godot-version: ${{ env.GODOT_VERSION }}
179180

180181
- name: Download linux editor libraries
181182
uses: actions/download-artifact@v4

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)