Skip to content

Include PLATFORM define for older NDK support #1925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshtynjala merged 2 commits into from
Oct 3, 2025
Merged

Include PLATFORM define for older NDK support #1925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3592d48
Include PLATFORM define for older NDK support
dimensionscape Mar 14, 2025
2a5ef41
Merge branch '8.3.0-Dev' into dimensionscape-patch-1
player-03 Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions tools/platforms/AndroidPlatform.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ class AndroidPlatform extends PlatformTarget
for (architecture in architectures)
{
var minSDKVer = project.config.getInt("android.minimum-sdk-version", 21);
var haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer'];
var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer'];
//PLATFORM define needed for older ndk and gcc toolchain
var haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer', "-D", 'PLATFORM=$minSDKVer'];
var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer', '-DPLATFORM=$minSDKVer'];
var path = sourceSet + "/jniLibs/armeabi";
var suffix = ".so";

Expand Down Expand Up @@ -374,13 +375,15 @@ class AndroidPlatform extends PlatformTarget

var commands = [];
var minSDKVer = 21;
var platformDefine = '-DPLATFORM_NUMBER=$minSDKVer';
var platformNumberDefine = '-DPLATFORM_NUMBER=$minSDKVer';
// Required for older ndk and gcc toolchain
var platformDefine = '-DPLATFORM=$minSDKVer';

if (armv5) commands.push(["-Dandroid", platformDefine]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", platformDefine]);
if (arm64) commands.push(["-Dandroid", "-DHXCPP_ARM64", platformDefine]);
if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", platformDefine]);
if (x64) commands.push(["-Dandroid", "-DHXCPP_X86_64", platformDefine]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", platformDefine, platformNumberDefine]);
if (arm64) commands.push(["-Dandroid", "-DHXCPP_ARM64", platformDefine, platformNumberDefine]);
if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", platformDefine, platformNumberDefine]);
if (x64) commands.push(["-Dandroid", "-DHXCPP_X86_64", platformDefine, platformNumberDefine]);

CPPHelper.rebuild(project, commands);
}
Expand Down
Loading