diff options
| -rw-r--r-- | Makefile.mingw32 | 18 | ||||
| -rw-r--r-- | src/plugin-luaconfigfiles.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luaftgl.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luagl.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luahandle.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luahttp.cc | 8 | ||||
| -rw-r--r-- | src/plugin-lualibs.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luaocci.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luaregex.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luasql.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luatask.cc | 8 | ||||
| -rw-r--r-- | src/plugin-luaxml.cc | 8 |
12 files changed, 87 insertions, 19 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 26d4018..3195896 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -4,14 +4,15 @@ LD = i586-mingw32msvc-g++ STRIP = i586-mingw32msvc-strip INCLUDES = \ --I ../Mesa-7.0.2/include \ +-I ../Mesa-7.0.3-win32/include \ -I../mogltk/include \ -I../Baltisot/include \ -I../Baltisot/lib/zlib/include \ -I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \ -I ../tinyxml \ -I /usr/include/mysql \ --I /usr/include/FTGL -I /usr/include/freetype2 \ +-I ../ftgl-win32/include -I ../freetype-win32/include/freetype2 \ +-I ../Mesa-win32/include \ -I /usr/include/oracle/11.1.0.1/client/ \ -I ../Baltisot/MSVC/regex \ @@ -87,18 +88,19 @@ tasklib.lua \ ajaxlib.lua \ htmllib.lua \ xmllib.lua \ +httplib.lua \ GL_SOURCES = \ plugin-luagl.cc \ LuaGL.cc \ -GL_LIBS = ../Mesa-7.0.2/lib/libGLU.a ../Mesa-7.0.2/lib/libOSMesa.a +GL_LIBS = ../Mesa-7.0.3-win32/lib/libGLU.a ../Mesa-7.0.3-win32/lib/libOSMesa.a FTGL_SOURCES = \ plugin-luaftgl.cc \ LuaFTGL.cc \ -FTGL_LIBS = -lfreetype -lftgl +FTGL_LIBS = ../ftgl-win32/lib/ftgl-mingw32.a ../freetype-win32/lib/libfreetype.dll.a WHOLE_SOURCES = \ $(CONFIGFILES_SOURCES) \ @@ -108,12 +110,12 @@ $(TASK_SOURCES) \ $(HANDLE_SOURCES) \ $(HTTP_SOURCES) \ $(REGEX_SOURCES) \ +$(GL_SOURCES) \ +$(FTGL_SOURCES) \ #$(OCCI_SOURCES) \ #$(SQL_SOURCES) \ -#$(GL_SOURCES) \ -#$(FTGL_SOURCES) \ MODULES_LIST = \ luaconfigfiles.dll \ @@ -123,12 +125,12 @@ luatask.dll \ luahandle.dll \ luahttp.dll \ luaregex.dll \ +luagl.dll \ +luaftgl.dll \ #luaocci.dll \ #luasql.dll \ -#luagl.dll \ -#luaftgl.dll \ ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES) $(LUA_LIB)))) ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES)))) diff --git a/src/plugin-luaconfigfiles.cc b/src/plugin-luaconfigfiles.cc index 9df08ab..196fed1 100644 --- a/src/plugin-luaconfigfiles.cc +++ b/src/plugin-luaconfigfiles.cc @@ -1,12 +1,18 @@ #include <LuaConfigFile.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaConfigFile::pushstatics(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luaftgl.cc b/src/plugin-luaftgl.cc index 6cb0f0a..83f26f1 100644 --- a/src/plugin-luaftgl.cc +++ b/src/plugin-luaftgl.cc @@ -1,12 +1,18 @@ #include <LuaFTGL.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaFTFont::pushstatics(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luagl.cc b/src/plugin-luagl.cc index 34bdc2d..b319a85 100644 --- a/src/plugin-luagl.cc +++ b/src/plugin-luagl.cc @@ -1,5 +1,11 @@ #include <LuaGL.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { luaopen_opengl(L); L->pop(); @@ -7,7 +13,7 @@ static void _init_plugin(Lua * L) { extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luahandle.cc b/src/plugin-luahandle.cc index a1cf4ea..7e6b675 100644 --- a/src/plugin-luahandle.cc +++ b/src/plugin-luahandle.cc @@ -1,5 +1,11 @@ #include <LuaHandle.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaInput::pushconstruct(L); LuaOutput::pushconstruct(L); @@ -9,7 +15,7 @@ static void _init_plugin(Lua * L) { extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luahttp.cc b/src/plugin-luahttp.cc index ae7ee34..ef3a5f4 100644 --- a/src/plugin-luahttp.cc +++ b/src/plugin-luahttp.cc @@ -1,12 +1,18 @@ #include <LuaHttp.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaHttpResponse::pushstatics(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-lualibs.cc b/src/plugin-lualibs.cc index 8233f7d..36b866d 100644 --- a/src/plugin-lualibs.cc +++ b/src/plugin-lualibs.cc @@ -1,12 +1,18 @@ #include <loadlualibs.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LoadLuaLibs(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luaocci.cc b/src/plugin-luaocci.cc index 841c6be..0cade24 100644 --- a/src/plugin-luaocci.cc +++ b/src/plugin-luaocci.cc @@ -1,12 +1,18 @@ #include <LuaOCCI.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaOCCI_pushstatics(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luaregex.cc b/src/plugin-luaregex.cc index 5f3a59e..13be506 100644 --- a/src/plugin-luaregex.cc +++ b/src/plugin-luaregex.cc @@ -1,12 +1,18 @@ #include <LuaRegex.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaRegex::pushstatics(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luasql.cc b/src/plugin-luasql.cc index 4f94d78..19588fe 100644 --- a/src/plugin-luasql.cc +++ b/src/plugin-luasql.cc @@ -1,12 +1,18 @@ #include <LuaSQL.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaSQLConnection::pushstatics(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luatask.cc b/src/plugin-luatask.cc index dce08f0..3fc2b3f 100644 --- a/src/plugin-luatask.cc +++ b/src/plugin-luatask.cc @@ -1,12 +1,18 @@ #include <LuaTask.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { LuaTaskMan::pushstatics(L); } extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } diff --git a/src/plugin-luaxml.cc b/src/plugin-luaxml.cc index 0e3ad06..b6ad423 100644 --- a/src/plugin-luaxml.cc +++ b/src/plugin-luaxml.cc @@ -1,5 +1,11 @@ #include <LuaXML.h> +#ifndef WIN32 +#define WEAK __attribute__ ((weak)) +#else +#define WEAK +#endif + static void _init_plugin(Lua * L) { luaopen_xml(L); L->pop(); @@ -7,7 +13,7 @@ static void _init_plugin(Lua * L) { extern "C" { -__attribute__ ((weak)) void init_plugin(Lua * L) { +WEAK void init_plugin(Lua * L) { _init_plugin(L); } |