From 0d2dc58a1d8d8da091d26546f220f6da898f1df3 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Tue, 16 Dec 2025 14:57:02 +0000 Subject: [PATCH] [tools] Fix format of android PLATFORM define This define was temporarily removed in: 46aab0c80ee2395cf099f0fe1905505f1f98d69d before being added back in: 9f2f518857145d85776c83765303a9d995d7887d However, it was added back with the incorrect format, which gives the hxcpp error: `Badly formed android PLATFORM "21" - should be like android-123` --- tools/platforms/AndroidPlatform.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index d942014eec..c993e5e8a2 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -163,8 +163,8 @@ class AndroidPlatform extends PlatformTarget { var minSDKVer = project.config.getInt("android.minimum-sdk-version", 21); //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 haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer', "-D", 'PLATFORM=android-$minSDKVer']; + var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer', '-DPLATFORM=android-$minSDKVer']; var path = sourceSet + "/jniLibs/armeabi"; var suffix = ".so"; @@ -377,7 +377,7 @@ class AndroidPlatform extends PlatformTarget var minSDKVer = 21; var platformNumberDefine = '-DPLATFORM_NUMBER=$minSDKVer'; // Required for older ndk and gcc toolchain - var platformDefine = '-DPLATFORM=$minSDKVer'; + var platformDefine = '-DPLATFORM=android-$minSDKVer'; if (armv5) commands.push(["-Dandroid", platformDefine]); if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", platformDefine, platformNumberDefine]);