Rebuild using HXCPP instead of hxlibc

This commit is contained in:
Joshua Granick
2014-03-25 18:46:16 -07:00
parent 9cec475920
commit f0afe0a080
2 changed files with 42 additions and 41 deletions

BIN
run.n vendored

Binary file not shown.

View File

@@ -19,6 +19,7 @@ import helpers.PlatformHelper;
class RunScript {
private static var buildLib = "hxcpp";
private static var isLinux:Bool;
private static var isMac:Bool;
private static var isWindows:Bool;
@@ -249,18 +250,18 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dandroid" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dandroid" ].concat (defines));
synchronizeNDLL ("Android/liblime.so");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7" ].concat (defines));
synchronizeNDLL ("Android/liblime-v7.so");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dandroid", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dandroid", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Android/liblime-debug.so");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Android/liblime-debug-v7.so");
}
@@ -271,18 +272,18 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dblackberry" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dblackberry" ].concat (defines));
synchronizeNDLL ("BlackBerry/lime.so");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dblackberry", "-Dsimulator" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dblackberry", "-Dsimulator" ].concat (defines));
synchronizeNDLL ("BlackBerry/lime-x86.so");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dblackberry", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dblackberry", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("BlackBerry/lime-debug.so");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dblackberry", "-Dsimulator", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dblackberry", "-Dsimulator", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("BlackBerry/lime-debug-x86.so");
}
@@ -291,14 +292,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Demscripten" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Demscripten" ].concat (defines));
synchronizeNDLL ("Emscripten/lime.a");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Demscripten", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Demscripten", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Emscripten/lime-debug.a");
}
@@ -309,22 +310,22 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Diphoneos" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos" ].concat (defines));
synchronizeNDLL ("iPhone/liblime.iphoneos.a");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Diphoneos", "-DHXCPP_ARMV7" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_ARMV7" ].concat (defines));
synchronizeNDLL ("iPhone/liblime.iphoneos-v7.a");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Diphonesim" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphonesim" ].concat (defines));
synchronizeNDLL ("iPhone/liblime.iphonesim.a");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Diphoneos", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("iPhone/liblime-debug.iphoneos.a");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Diphoneos", "-DHXCPP_ARMV7", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphoneos", "-DHXCPP_ARMV7", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("iPhone/liblime-debug.iphoneos-v7.a");
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Diphonesim", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Diphonesim", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("iPhone/liblime-debug.iphonesim.a");
}
@@ -339,14 +340,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-DHXCPP_M64" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-DHXCPP_M64" ].concat (defines));
synchronizeNDLL ("Linux64/lime.ndll");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-DHXCPP_M64", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-DHXCPP_M64", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Linux64/lime-debug.ndll");
}
@@ -359,14 +360,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile ].concat (defines));
synchronizeNDLL ("Linux/lime.ndll");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Linux/lime-debug.ndll");
}
@@ -379,14 +380,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Drpi" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Drpi" ].concat (defines));
synchronizeNDLL ("RPi/lime.ndll");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Drpi", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Drpi", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("RPi/lime-debug.ndll");
}
@@ -401,14 +402,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile ].concat (defines));
synchronizeNDLL ("Mac/lime.ndll");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Mac/lime-debug.ndll");
}
@@ -419,14 +420,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-DHXCPP_M64" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-DHXCPP_M64" ].concat (defines));
synchronizeNDLL ("Mac64/lime.ndll");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-DHXCPP_M64", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-DHXCPP_M64", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Mac64/lime-debug.ndll");
}
@@ -437,15 +438,15 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dtizen" ].concat (defines));
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dtizen", "-Dsimulator" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dtizen" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dtizen", "-Dsimulator" ].concat (defines));
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dtizen", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dtizen", "-Dsimulator", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dtizen", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dtizen", "-Dsimulator", "-Dfulldebug" ].concat (defines));
}
@@ -455,14 +456,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dwebos" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dwebos" ].concat (defines));
synchronizeNDLL ("webOS/lime.so");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dwebos", "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dwebos", "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("webOS/lime-debug.so");
}
@@ -481,14 +482,14 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile ].concat (defines));
synchronizeNDLL ("Windows/lime.ndll");
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dfulldebug" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dfulldebug" ].concat (defines));
synchronizeNDLL ("Windows/lime-debug.ndll");
}
@@ -531,13 +532,13 @@ class RunScript {
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dnintendo", "-Dwiiu", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) + "/toolchain" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dnintendo", "-Dwiiu", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) + "/toolchain" ].concat (defines));
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", "hxlibc", buildFile, "-Dnintendo", "-Dwiiu", "-Dfulldebug", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) + "/toolchain" ].concat (defines));
runCommand (path, "haxelib", [ "run", buildLib, buildFile, "-Dnintendo", "-Dwiiu", "-Dfulldebug", "-Dtoolchain=wiiu", "-I" + PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) + "/toolchain" ].concat (defines));
}
@@ -1368,13 +1369,13 @@ class RunScript {
case "installer":
var hxlibcPath = PathHelper.getHaxelib (new Haxelib ("hxlibc"));
var hxlibcPath = PathHelper.getHaxelib (new Haxelib (buildLib));
var nmePath = PathHelper.getHaxelib (new Haxelib ("lime"));
var swfPath = PathHelper.getHaxelib (new Haxelib ("swf"));
var actuatePath = PathHelper.getHaxelib (new Haxelib ("actuate"));
var svgPath = PathHelper.getHaxelib (new Haxelib ("svg"));
var hxlibcVersion = getVersion ("hxlibc", true);
var hxlibcVersion = getVersion (buildLib, true);
var nmeVersion = getVersion ("lime", true);
var swfVersion = getVersion ("swf", true);
var actuateVersion = getVersion ("actuate", true);
@@ -1402,7 +1403,7 @@ class RunScript {
recursiveCopy (actuatePath, nmeDirectory + tempPath + "/resources/actuate/usr/lib/haxe/lib/actuate/" + actuateVersion, [ ".git", ".svn" ]);
recursiveCopy (svgPath, nmeDirectory + tempPath + "/resources/svg/usr/lib/haxe/lib/svg/" + svgVersion, [ ".git", ".svn" ]);
File.saveContent (nmeDirectory + tempPath + "/resources/hxlibc/usr/lib/haxe/lib/hxlibc/.current", getVersion ("hxlibc"));
File.saveContent (nmeDirectory + tempPath + "/resources/hxlibc/usr/lib/haxe/lib/hxlibc/.current", getVersion (buildLib));
File.saveContent (nmeDirectory + tempPath + "/resources/nme/usr/lib/haxe/lib/nme/.current", getVersion ("lime"));
File.saveContent (nmeDirectory + tempPath + "/resources/swf/usr/lib/haxe/lib/swf/.current", getVersion ("swf"));
File.saveContent (nmeDirectory + tempPath + "/resources/actuate/usr/lib/haxe/lib/actuate/.current", getVersion ("actuate"));
@@ -1432,13 +1433,13 @@ class RunScript {
recursiveCopy (actuatePath, nmeDirectory + tempPath + "/resources/actuate/" + actuateVersion, [ ".git", ".svn" ]);
recursiveCopy (svgPath, nmeDirectory + tempPath + "/resources/svg/" + svgVersion, [ ".git", ".svn" ]);
File.saveContent (nmeDirectory + tempPath + "/resources/hxlibc/.current", getVersion ("hxlibc"));
File.saveContent (nmeDirectory + tempPath + "/resources/hxlibc/.current", getVersion (buildLib));
File.saveContent (nmeDirectory + tempPath + "/resources/nme/.current", getVersion ("lime"));
File.saveContent (nmeDirectory + tempPath + "/resources/swf/.current", getVersion ("swf"));
File.saveContent (nmeDirectory + tempPath + "/resources/actuate/.current", getVersion ("actuate"));
File.saveContent (nmeDirectory + tempPath + "/resources/svg/.current", getVersion ("svg"));
var args = [ "/DVERSION=" + getVersion ("lime"), "/DVERSION_FOLDER=" + nmeVersion, "/DHAXE_VERSION=2.10", "/DNEKO_VERSION=1.8.2", "/DHXLIBC_VERSION=" + getVersion ("hxlibc"), "/DACTUATE_VERSION=" + getVersion ("actuate"), "/DSWF_VERSION=" + getVersion ("swf"), "/DSVG_VERSION=" + getVersion ("svg") ];
var args = [ "/DVERSION=" + getVersion ("lime"), "/DVERSION_FOLDER=" + nmeVersion, "/DHAXE_VERSION=2.10", "/DNEKO_VERSION=1.8.2", "/DHXLIBC_VERSION=" + getVersion (buildLib), "/DACTUATE_VERSION=" + getVersion ("actuate"), "/DSWF_VERSION=" + getVersion ("swf"), "/DSVG_VERSION=" + getVersion ("svg") ];
args.push ("/DOUTPUT_PATH=../NME-" + getVersion ("lime") + "-Windows.exe");
args.push ("Installer.nsi");