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

Use safe name for registering statics, use 'lime_legacy_' for legacy prims to avoid conflicting names

Browse Source
This commit is contained in:
Joshua Granick
2015-04-07 12:03:16 -07:00
parent 01fc807722
commit 6a6d37f734
10 changed files with 456 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ extern "C" const char *hxRunLibrary ();
extern "C" void hxcpp_set_top_of_stack ();
::foreach ndlls::::if (registerStatics)::
extern "C" int ::name::_register_prims ();::end::::end::
extern "C" int ::nameSafe::_register_prims ();::end::::end::
#ifdef HX_WINDOWS
@@ -20,7 +20,7 @@ extern "C" int main(int argc, char *argv[]) {
hxcpp_set_top_of_stack ();
::foreach ndlls::::if (registerStatics)::
::name::_register_prims ();::end::::end::
::nameSafe::_register_prims ();::end::::end::
const char *err = NULL;
err = hxRunLibrary ();

4
templates/emscripten/cpp/Main.cpp
View File

@@ -12,7 +12,7 @@ extern "C" void hxcpp_set_top_of_stack ();
extern "C" int zlib_register_prims ();
extern "C" int lime_openal_register_prims ();
::foreach ndlls::::if (registerStatics)::extern "C" int ::name::_register_prims ();::end::
::foreach ndlls::::if (registerStatics)::extern "C" int ::nameSafe::_register_prims ();::end::
::end::
@@ -22,7 +22,7 @@ extern "C" int main (int argc, char *argv[]) {
zlib_register_prims ();
lime_openal_register_prims ();
::foreach ndlls::::if (registerStatics)::::name::_register_prims ();::end::
::foreach ndlls::::if (registerStatics)::::nameSafe::_register_prims ();::end::
::end::
const char *err = NULL;

4
templates/iphone/PROJ/Classes/Main.mm
View File

@@ -12,7 +12,7 @@ extern "C" void hxcpp_set_top_of_stack ();
extern "C" int zlib_register_prims ();
extern "C" int lime_openal_register_prims ();
::foreach ndlls::::if (registerStatics)::extern "C" int ::name::_register_prims ();::end::
::foreach ndlls::::if (registerStatics)::extern "C" int ::nameSafe::_register_prims ();::end::
::end::
@@ -22,7 +22,7 @@ extern "C" int SDL_main (int argc, char *argv[]) {
zlib_register_prims ();
lime_openal_register_prims ();
::foreach ndlls::::if (registerStatics)::::name::_register_prims ();::end::
::foreach ndlls::::if (registerStatics)::::nameSafe::_register_prims ();::end::
::end::
const char *err = NULL;