Skip to content

Commit 6558f79

Browse files
committed
Fix android
1 parent b6f44ea commit 6558f79

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
@@ -7,12 +7,11 @@ on:
77

88
# Global Settings
99
env:
10-
PROJECT_FOLDER: fmod-gdextension
10+
GODOT_VERSION: 4.5
11+
NDK_VERSION: 27.3.13750724
1112
TARGET_PATH: demo/addons/fmod/libs/
1213
TARGET_NAME: libGodotFmod
13-
GODOT_VERSION: 4.5
1414
FMOD_VERSION: 20306
15-
1615
jobs:
1716
build:
1817
# EXCLUSIVE PATHS:
@@ -113,23 +112,23 @@ jobs:
113112
platform: android
114113
target: editor
115114
fmod-executable-suffix: android.tar.gz
116-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
115+
flags: ndk_version=$NDK_VERSION arch=arm64
117116
shell: bash
118117

119118
- name: Android Debug Compilation
120119
os: "ubuntu-22.04"
121120
platform: android
122121
target: template_debug
123122
fmod-executable-suffix: android.tar.gz
124-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
123+
flags: ndk_version=$NDK_VERSION arch=arm64
125124
shell: bash
126125

127126
- name: Android Release Compilation
128127
os: "ubuntu-22.04"
129128
platform: android
130129
target: template_release
131130
fmod-executable-suffix: android.tar.gz
132-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
131+
flags: ndk_version=$NDK_VERSION arch=arm64
133132
shell: bash
134133

135134
- 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)