diff options
| -rw-r--r-- | Makefile.mingw32 | 4 | ||||
| -rw-r--r-- | src/lua-interface.cpp | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index e910231..9ef4853 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -47,6 +47,8 @@ LDFLAGS += $(LDFLAGS_BASIC) -Wl,--enable-auto-image-base -Wl,--export-dynamic -- LIBS += -L../gnuwin32/lib ../libreadline-static.a -lz.dll -lucl.dll -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a +IUP_LIBS = -lole32 -lcomctl32 -lgdi32 -lcomdlg32 + vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex @@ -244,7 +246,7 @@ 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) $(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) + $(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) ../lua-modules-iup-win32/luaiup.a $(IUP_LIBS) touch lua-interface-light.dll lua-interface-light.o: lua-interface.cpp diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp index e85eab1..b697e9c 100644 --- a/src/lua-interface.cpp +++ b/src/lua-interface.cpp @@ -77,6 +77,8 @@ extern void luatask_init(Lua * L) WEAK; extern void luaxml_init(Lua * L) WEAK; extern void luaosmesa_init(Lua * L) WEAK; extern void luacd_init(Lua * L) WEAK; +extern void luapsx_init(Lua * L) WEAK; +extern void luaiup_init(Lua * L) WEAK; } @@ -417,7 +419,11 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in #endif } else if ((filename == "luacd") && (luacd_init != NULL)) { luacd_init(L); + } else if ((filename == "luapsx") && (luapsx_init != NULL)) { + luapsx_init(L); #endif + } else if ((filename == "luaiup") && (luaiup_init != NULL)) { + luaiup_init(L); #endif } else { LuaLoadPlugin(filename, L); @@ -803,7 +809,11 @@ void autoload_exports(Lua * L) { #endif if (luacd_init) luacd_init(L); + if (luapsx_init) + luapsx_init(L); #endif + if (luaiup_init) + luaiup_init(L); #endif } |