diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index b0acbbe73..11de32f6b 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -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"; @@ -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); }