kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HXCPP fix

Browse Source
This commit is contained in:
Joshua Granick
2014-04-10 13:20:50 -07:00
parent 401ea3307b
commit aab783bef0
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include.xml
View File

@@ -8,6 +8,9 @@
<section unless="display">
<haxelib name="hxcpp" if="cpp" />
<ndll name="std" haxelib="hxcpp" if="cpp" />
<ndll name="regexp" haxelib="hxcpp" if="cpp" />
<ndll name="zlib" haxelib="hxcpp" if="cpp" />
<ndll name="openal" register="false" if="android" />

BIN
run.n vendored
View File

Binary file not shown.

14
script/src/RunScript.hx
View File

@@ -121,10 +121,10 @@ class RunScript {
var directories = [ PathHelper.combine (path, "obj") ];
var files = [ PathHelper.combine (path, "all_objs"), PathHelper.combine (path, "vc100.pdb"), PathHelper.combine (path, "vc110.pdb") ];
if (PathHelper.getHaxelib (new Haxelib ("lime-wiiu")) != "") {
if (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")) != "") {
directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime-wiiu")), "project/obj"));
directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime-wiiu")), "project/all_objs"));
directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")), "project/obj"));
directories.push (PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu")), "project/all_objs"));
}
@@ -231,7 +231,7 @@ class RunScript {
if (target == "wiiu" && path == PathHelper.combine (limeDirectory, "project")) {
path = PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime-wiiu"), true), "project");
path = PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("openfl-wiiu"), true), "project");
}
@@ -597,19 +597,19 @@ class RunScript {
if (buildSharedLibs) {
runCommand (sharedLibsPath, "neko", [ "build.n", "wiiu" ].concat (defines));
//runCommand (sharedLibsPath, "neko", [ "build.n", "wiiu" ].concat (defines));
}
if (!flags.exists ("debug")) {
runCommand (path, "haxelib", [ "run", buildLib, 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 ("openfl-wiiu")) ].concat (defines));
}
if (!flags.exists ("release")) {
runCommand (path, "haxelib", [ "run", buildLib, 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 ("openfl-wiiu")) ].concat (defines));
}