iOS fixes

This commit is contained in:
Joshua Granick
2014-04-10 18:24:29 -07:00
parent de6d25bdbf
commit 618eee5e72
2 changed files with 13 additions and 9 deletions

View File

@@ -18,6 +18,8 @@
<ndll name="libfreetype" register="false" if="emscripten" />
<dependency name="MediaPlayer.framework" if="ios" />
<ndll name="curl_ssl" register="false" if="ios" />
<ndll name="png" register="false" if="ios" />
<ndll name="jpeg" register="false" if="ios" />

View File

@@ -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;
}