Don't require ARC on iOS rebuild

This commit is contained in:
Joshua Granick
2015-10-12 05:02:42 -07:00
parent 01b94b9395
commit df3b7ea924

View File

@@ -329,14 +329,26 @@ class IOSPlatform extends PlatformTarget {
var i386 = (command == "rebuild" || project.targetFlags.exists ("simulator")); var i386 = (command == "rebuild" || project.targetFlags.exists ("simulator"));
var x86_64 = (command == "rebuild" || project.targetFlags.exists ("simulator")); var x86_64 = (command == "rebuild" || project.targetFlags.exists ("simulator"));
var arc = (project.targetFlags.exists ("arc"));
var commands = []; var commands = [];
if (armv6) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DOBJC_ARC" ]); if (armv6) commands.push ([ "-Dios", "-DHXCPP_CPP11" ]);
if (armv7) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7", "-DOBJC_ARC" ]); if (armv7) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7" ]);
if (armv7s) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7S", "-DOBJC_ARC" ]); if (armv7s) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7S" ]);
if (arm64) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARM64", "-DOBJC_ARC" ]); if (arm64) commands.push ([ "-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARM64" ]);
if (i386) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_CPP11", "-DOBJC_ARC" ]); if (i386) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_CPP11" ]);
if (x86_64) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_M64", "-DHXCPP_CPP11", "-DOBJC_ARC" ]); if (x86_64) commands.push ([ "-Dios", "-Dsimulator", "-DHXCPP_M64", "-DHXCPP_CPP11" ]);
if (arc) {
for (command in commands) {
command.push ("-DOBJC_ARC");
}
}
CPPHelper.rebuild (project, commands); CPPHelper.rebuild (project, commands);