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

Fix static build (thanks JeriX)

Browse Source
This commit is contained in:
Joshua Granick
2015-05-07 13:16:36 -07:00
parent a28e267319
commit 4deb21be8c
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include.xml
View File

@@ -41,7 +41,7 @@
<ndll name="std" haxelib="hxcpp" if="cpp" />
<ndll name="regexp" haxelib="hxcpp" if="cpp" />
<ndll name="zlib" haxelib="hxcpp" if="cpp" unless="emscripten || ios" />
<ndll name="zlib" haxelib="hxcpp" if="cpp" unless="emscripten || ios || static_link" />
<ndll name="lime" if="included" />

2
project/Build.xml
View File

@@ -176,7 +176,7 @@
<compilerflag value="-DSTATIC_LINK" if="emscripten" />
<file name="${HXCPP}/project/libs/zlib/ZLib.cpp" if="emscripten || ios" />
<file name="${HXCPP}/project/libs/zlib/ZLib.cpp" if="emscripten || ios || static_link" />
</section>

2
project/src/ExternalInterface.cpp
View File

@@ -488,7 +488,7 @@ namespace lime {
value lime_image_data_util_fill_rect (value image, value rect, value color) {
Image _image = Image (image);
Rectangle _rect = Rectangle (rect);
Rectangle _rect = Rectangle (rect);
ImageDataUtil::FillRect (&_image, &_rect, val_number (color));
return alloc_null ();

2
templates/cpp/static/BuildMain.xml
View File

@@ -78,7 +78,7 @@
</section>
<lib name="ApplicationMain${DBG}${LIBEXT}" />
<lib name="libApplicationMain${DBG}${LIBEXT}" />
</target>

6
templates/cpp/static/Main.cpp
View File

@@ -7,6 +7,9 @@
extern "C" const char *hxRunLibrary ();
extern "C" void hxcpp_set_top_of_stack ();
extern "C" int zlib_register_prims ();
extern "C" int lime_cairo_register_prims ();
extern "C" int lime_openal_register_prims ();
::foreach ndlls::::if (registerStatics)::
extern "C" int ::nameSafe::_register_prims ();::end::::end::
@@ -19,6 +22,9 @@ extern "C" int main(int argc, char *argv[]) {
hxcpp_set_top_of_stack ();
zlib_register_prims ();
lime_cairo_register_prims ();
lime_openal_register_prims ();
::foreach ndlls::::if (registerStatics)::
::nameSafe::_register_prims ();::end::::end::