diff options
| -rw-r--r-- | Makefile.mingw32 | 12 | ||||
| -rw-r--r-- | src/lua-interface.cpp | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 88e77f7..43aabd9 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -44,7 +44,6 @@ INCLUDES = \ -I../pthreads-w32-2-8-0-release/ \ -I../gnuwin32/include \ -I../tinyxml \ --I../lua-modules-iup/im/include -I../lua-modules-iup/cd/include -I../lua-modules-iup/iup/include \ HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_UCL @@ -56,11 +55,9 @@ 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 ../LuaJIT-win32/src/libluajit.a -IUP_LIBS = -lole32 -lcomctl32 -lgdi32 -lcomdlg32 - -vpath %.c ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex:../lua-modules-iup/src -vpath %.cc ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex:../lua-modules-iup/src -vpath %.cpp ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex:../lua-modules-iup/src +vpath %.c ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex +vpath %.cc ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex +vpath %.cpp ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.lua ../Baltisot/lib:../Baltisot/src:src LUAINTERFACE_SOURCES = \ @@ -149,7 +146,6 @@ plugin-luaregex.cc \ plugin-luasmtp.cc \ plugin-luatask.cc \ plugin-luaxml.cc \ -plugin-luaiup.cc \ LuaConfigFile.cc \ tinystr.cpp \ tinyxml.cpp \ @@ -204,7 +200,7 @@ lua-interface-light.exe: lua-interface-light.dll $(LUAINTERFACE_OBJECTS) lua-int $(LD) -o lua-interface-light.exe $(LUAINTERFACE_OBJECTS) ./lua-interface.a $(LDFLAGS) $(LIBS) lua-interface-res.o 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) ../lua-modules-iup-win32/luaiup.a $(IUP_LIBS) + $(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 diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp index d05b95a..a72b366 100644 --- a/src/lua-interface.cpp +++ b/src/lua-interface.cpp @@ -363,10 +363,10 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in 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 +#endif } else { LuaLoadPlugin(filename, L); } @@ -839,10 +839,10 @@ void autoload_exports(Lua * L) { luacd_init(L); if (luapsx_init) luapsx_init(L); -#endif if (luaiup_init) luaiup_init(L); #endif +#endif } virtual int startup() throw (GeneralException) { |