diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-06-05 15:59:16 +0000 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-06-05 15:59:16 +0000 |
| commit | 289d22725eaedab3c3568ca41e11b347b6f69d8d (patch) | |
| tree | e32ed5e8b6c1bb59f4dca8f9358bf3c1774c1e5b | |
| parent | 0eab74c7716691805d9efc9560e7ada7341744ff (diff) | |
Various fixes and tweaks to the lua-interface light version.
| -rw-r--r-- | Makefile.mingw32 | 7 | ||||
| -rw-r--r-- | src/lua-interface.cpp | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index acb8e28..31077aa 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -200,6 +200,7 @@ xmllib.lua \ httplib.lua \ dblib.lua \ LuaSmtp.cc \ +lua-plugin.cc \ WHOLE_SOURCES = $(BALTISOT_SOURCES) $(LUA_SOURCES) $(LUAINTERFACE_SOURCES) @@ -228,15 +229,15 @@ lua-interface.exe: $(LUAINTERFACE_OBJECTS) lua-interface-light.exe: lua-interface-light.dll $(LUAINTERFACE_OBJECTS) $(LD) -o lua-interface-light.exe $(LUAINTERFACE_OBJECTS) ./lua-interface.a $(LDFLAGS) $(LIBS) -lua-interface-light.dll: $(LUAINTERFACE_DLL_OBJECTS) lua-interface-light.o lua-plugin.o - $(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll lua-interface-light.o lua-plugin.o $(LUAINTERFACE_DLL_OBJECTS) $(LIBS) $(LDFLAGS) +lua-interface-light.dll: $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_LIGHT_OBJECTS) + $(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_LIGHT_OBJECTS) $(LIBS) $(LDFLAGS) touch lua-interface-light.dll lua-interface-light.o: lua-interface.cpp $(CC) $(CPPFLAGS) -c -o lua-interface-light.o src/lua-interface.cpp -DLUA_INTERFACE_LIGHT clean: - rm -f lua-interface.dll lua-interface.exe luac.exe *.o *.dep *.a *.def + rm -f lua-interface.dll lua-interface.exe lua-interface-light.exe luac.exe *.o *.dep *.a *.def %.dep : %.c $(CC) $(CPPFLAGS) -M -MF $@ $< diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp index 0fef98a..d538be7 100644 --- a/src/lua-interface.cpp +++ b/src/lua-interface.cpp @@ -86,6 +86,9 @@ extern void luacd_init(Lua * L) WEAK; #ifdef LUA_INTERFACE_LIGHT #define MODULES_BUILT_IN +#define LIGHT "-light" +#else +#define LIGHT #endif #ifdef _WIN32 @@ -554,7 +557,7 @@ Lua * start_full_lua(void) { void showbanner() { printm(M_BARE, -"Lua-Interface version " VERSION " (c) 2003-2008 Nicolas \"Pixel\" Noble\n" +"Lua-Interface" LIGHT " version " VERSION " (c) 2003-2009 Nicolas \"Pixel\" Noble\n" LUA_RELEASE " " LUA_COPYRIGHT "\n" #ifdef WIP "Special version Work In Progress, compiled the " __DATE__ " at " __TIME__ "\n" @@ -706,7 +709,7 @@ static void * interactive_prompt(void * __L) { } void autoload_exports(Lua * L) { -#if not defined(NO_SMART_MODULES) or defined(MODULES_BUILT_IN) +#if !defined(NO_SMART_MODULES) || defined(MODULES_BUILT_IN) if (lualibs_init) lualibs_init(L); if (luahandle_init) |