Skip to content

Commit 3e4b5d0

Browse files
tobil4skjoshtynjala
authored andcommitted
[tools] Fix format of android PLATFORM define
This define was temporarily removed in: 46aab0c before being added back in: 9f2f518 However, it was added back with the incorrect format, which gives the hxcpp error: `Badly formed android PLATFORM "21" - should be like android-123`
1 parent 17fe047 commit 3e4b5d0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/platforms/AndroidPlatform.hx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ class AndroidPlatform extends PlatformTarget
163163
{
164164
var minSDKVer = project.config.getInt("android.minimum-sdk-version", 21);
165165
//PLATFORM define needed for older ndk and gcc toolchain
166-
var haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer', "-D", 'PLATFORM=$minSDKVer'];
167-
var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer', '-DPLATFORM=$minSDKVer'];
166+
var haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer', "-D", 'PLATFORM=android-$minSDKVer'];
167+
var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer', '-DPLATFORM=android-$minSDKVer'];
168168
var path = sourceSet + "/jniLibs/armeabi";
169169
var suffix = ".so";
170170

@@ -377,7 +377,7 @@ class AndroidPlatform extends PlatformTarget
377377
var minSDKVer = 21;
378378
var platformNumberDefine = '-DPLATFORM_NUMBER=$minSDKVer';
379379
// Required for older ndk and gcc toolchain
380-
var platformDefine = '-DPLATFORM=$minSDKVer';
380+
var platformDefine = '-DPLATFORM=android-$minSDKVer';
381381

382382
if (armv5) commands.push(["-Dandroid", platformDefine]);
383383
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", platformDefine, platformNumberDefine]);

0 commit comments

Comments
 (0)