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

2015-04-07 12:03:16 -07:00
parent 01fc807722
commit 6a6d37f734
10 changed files with 456 additions and 445 deletions
--- a/legacy/templates/emscripten/cpp/Main.cpp
+++ b/legacy/templates/emscripten/cpp/Main.cpp
@@ -12,7 +12,7 @@ extern "C" void hxcpp_set_top_of_stack();
 	
 ::foreach ndlls::
 ::if (registerStatics)::
-     extern "C" int ::name::_register_prims();
+     extern "C" int ::nameSafe::_register_prims();
 ::end::
 ::end::
 	
@@ -23,7 +23,7 @@ extern "C" int main(int argc, char *argv[])

   	::foreach ndlls::
     ::if (registerStatics)::
-      ::name::_register_prims();
+      ::nameSafe::_register_prims();
     ::end::
   	::end::