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

console: fix cairo for STATIC_LINK

Browse Source
This commit is contained in:
James Gray
2015-07-08 11:37:11 -05:00
parent 7a1a3a0916
commit 0f26f127c4
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project/Build.xml
View File

@@ -47,6 +47,7 @@
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/linux/" if="linux"/> <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/linux/" if="linux"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/windows/" if="windows"/> <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/windows/" if="windows"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/mac/" if="mac"/> <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/mac/" if="mac"/>
<compilerflag value="-DLIME_CAIRO" />
<compilerflag value="-DHAVE_CONFIG_H" /> <compilerflag value="-DHAVE_CONFIG_H" />
<compilerflag value="-DCAIRO_WIN32_STATIC_BUILD" if="windows" /> <compilerflag value="-DCAIRO_WIN32_STATIC_BUILD" if="windows" />
<compilerflag value="-DCAIRO_HAS_FT_FONT" /> <compilerflag value="-DCAIRO_HAS_FT_FONT" />

13
project/src/ExternalInterface.cpp
View File

@@ -1204,8 +1204,19 @@ namespace lime {
} }
extern "C" int lime_byte_array_register_prims ();
#ifdef LIME_CAIRO
extern "C" int lime_cairo_register_prims ();
#endif
// prevents elimination of translation units during static linking
extern "C" int lime_register_prims () { extern "C" int lime_register_prims () {
return 0; return 0
+ lime_byte_array_register_prims ()
#ifdef LIME_CAIRO
+ lime_cairo_register_prims ()
#endif
;
} }