diff options
| author | Nicolas Noble <pixel@Aoshi.local> | 2008-11-28 17:26:01 -0800 |
|---|---|---|
| committer | Nicolas Noble <pixel@Aoshi.local> | 2008-11-28 17:26:01 -0800 |
| commit | c9d980fd1e4cec1973ea3e7d54ae7057e9c29e08 (patch) | |
| tree | 5dab5b0781bc53e04f546e700cc822b1956e5d88 /src | |
| parent | f922b423225678f3f6431cc96b672e24e5cb9931 (diff) | |
Early port under Darwin x86-64
Diffstat (limited to 'src')
| -rw-r--r-- | src/lua-interface.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp index 172a365..79307a6 100644 --- a/src/lua-interface.cpp +++ b/src/lua-interface.cpp @@ -50,6 +50,7 @@ #include "lua-interface-hc.h" #ifndef _MSVC +// this seems ignored under apple's gcc... dammit. #define WEAK __attribute__ ((weak)) #else #define WEAK @@ -308,7 +309,9 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in break; case BASELUA_INTERFACE_LOADMODULE: filename = L->tostring(); - if ((filename == "luaconfigfiles") && (luaconfigfiles_init != NULL)) { + if (0) { +#if not defined(__APPLE__) or defined(MODULES_BUILT_IN) + } else if ((filename == "luaconfigfiles") && (luaconfigfiles_init != NULL)) { luaconfigfiles_init(L); #ifndef _MSVC } else if ((filename == "luaftgl") && (luaftgl_init != NULL)) { @@ -340,6 +343,7 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in } else if ((filename == "luaosmesa") && (luaosmesa_init != NULL)) { luaosmesa_init(L); #endif +#endif } else { LuaLoadPlugin(filename, L); } @@ -681,6 +685,7 @@ static void * interactive_prompt(void * __L) { } void autoload_exports(Lua * L) { +#if not defined(__APPLE__) or defined(MODULES_BUILT_IN) if (lualibs_init) lualibs_init(L); if (luahandle_init) @@ -709,6 +714,7 @@ void autoload_exports(Lua * L) { if (luaocci_init) luaocci_init(L); #endif +#endif } virtual int startup() throw (GeneralException) { |