diff --git a/include.xml b/include.xml index 524abcc75..d37a372ce 100644 --- a/include.xml +++ b/include.xml @@ -18,6 +18,8 @@ + + diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp index abc4f7404..e7859b7a5 100644 --- a/project/src/ExternalInterface.cpp +++ b/project/src/ExternalInterface.cpp @@ -6,18 +6,18 @@ #ifdef STATIC_LINK #define DEFINE_LIME_PRIM_MULT(func) value nme_##func(value *arg, int args); \ -int __reg_lime_##func = hx_register_prim("nme_" #func "__MULT",(void *)(&nme_##func)); \ +int __reg_lime_##func = hx_register_prim("lime_" #func "__MULT",(void *)(&nme_##func)); \ #define DEFINE_LIME_PRIM(func,nargs) \ -int __reg_lime_##func = hx_register_prim("nme_" #func "__" #nargs,(void *)(&nme_##func)); \ +int __reg_lime_##func = hx_register_prim("lime_" #func "__" #nargs,(void *)(&nme_##func)); \ #define DEFINE_LIME_PRIM_MULT_NATIVE(func,ext) \ -int __reg_lime_##func = hx_register_prim("nme_" #func "__" MULT,(void *)(&nme_##func)) + \ - hx_register_prim("nme_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; +int __reg_lime_##func = hx_register_prim("lime_" #func "__" MULT,(void *)(&nme_##func)) + \ + hx_register_prim("lime_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; #define DEFINE_LIME_PRIM_NATIVE(func,nargs,ext) \ -int __reg_lime_##func = hx_register_prim("nme_" #func "__" #nargs,(void *)(&nme_##func)) + \ - hx_register_prim("nme_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; +int __reg_lime_##func = hx_register_prim("lime_" #func "__" #nargs,(void *)(&nme_##func)) + \ + hx_register_prim("lime_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; #else @@ -552,8 +552,10 @@ namespace nme { } -extern "C" +extern "C" int nme_register_prims(); + +extern "C" int lime_register_prims() { - int nme_register_prims(); - #define lime_register_prims nme_register_prims + nme_register_prims(); + return 0; } \ No newline at end of file