Enabled ARC for iOS and tvOS targets

This commit is contained in:
Valerio Santinelli
2015-10-02 23:36:35 +02:00
parent 06487ad363
commit ced26d5c64
2 changed files with 11 additions and 10 deletions

View File

@@ -224,7 +224,8 @@ class IOSPlatform extends PlatformTarget {
context.OBJC_ARC = true;
}
LogHelper.info("OBJC_ARC:" + context.OBJC_ARC);
//context.ENABLE_BITCODE = (project.config.getFloat ("ios.deployment", 5.1) >= 6);
context.ENABLE_BITCODE = project.config.getBool ("ios.enable-bitcode", false);
context.IOS_COMPILER = project.config.getString ("ios.compiler", "clang");
@@ -331,12 +332,12 @@ class IOSPlatform extends PlatformTarget {
var commands = [];
if (armv6) commands.push ([ "-Dios", "-DHXCPP_CPP11" ]);
if (armv7) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7" ]);
if (armv7s) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7S" ]);
if (arm64) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARM64" ]);
if (i386) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_CPP11" ]);
if (x86_64) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_M64", "-DHXCPP_CPP11" ]);
if (armv6) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DOBJC_ARC" ]);
if (armv7) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7", "-DOBJC_ARC" ]);
if (armv7s) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7S", "-DOBJC_ARC" ]);
if (arm64) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARM64", "-DOBJC_ARC" ]);
if (i386) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_CPP11", "-DOBJC_ARC" ]);
if (x86_64) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_M64", "-DHXCPP_CPP11", "-DOBJC_ARC" ]);
CPPHelper.rebuild (project, commands);

View File

@@ -313,9 +313,9 @@ class TVOSPlatform extends PlatformTarget {
var commands = [];
if (arm64) commands.push ([ "-Dtvos", "-Dappletvos", "-DHXCPP_CPP11", "-DHXCPP_ARM64" ]);
if (i386) commands.push ([ "-Dtvos", "-Dappletvsim", "-Dsimulator", "-DHXCPP_CPP11" ]);
if (x86_64) commands.push ([ "-Dtvos", "-Dappletvsim", "-Dsimulator", "-DHXCPP_M64", "-DHXCPP_CPP11" ]);
if (arm64) commands.push ([ "-Dtvos", "-Dappletvos", "-DHXCPP_CPP11", "-DHXCPP_ARM64", "-DOBJC_ARC" ]);
if (i386) commands.push ([ "-Dtvos", "-Dappletvsim", "-Dsimulator", "-DHXCPP_CPP11", "-DOBJC_ARC" ]);
if (x86_64) commands.push ([ "-Dtvos", "-Dappletvsim", "-Dsimulator", "-DHXCPP_M64", "-DHXCPP_CPP11", "-DOBJC_ARC" ]);
CPPHelper.rebuild (project, commands);