From e99b97db40f81ed39fea2742568528ad03927aa2 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 14 Oct 2014 13:13:39 +0200 Subject: crawler works now with Lua also on Windows --- include/crawler/libcrawler.hpp | 4 +++- src/crawl/Makefile.W32 | 11 +---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/include/crawler/libcrawler.hpp b/include/crawler/libcrawler.hpp index a615bc9..9e33cd4 100644 --- a/include/crawler/libcrawler.hpp +++ b/include/crawler/libcrawler.hpp @@ -1,6 +1,8 @@ #ifndef __LIBCRAWLER_H #define __LIBCRAWLER_H -void initialize_libcrawler( void *user_data ); +#include "CrawlerExportable.hpp" + +CRAWLER_DLL_VISIBLE void initialize_libcrawler( void *user_data ); #endif diff --git a/src/crawl/Makefile.W32 b/src/crawl/Makefile.W32 index 68c7e24..ab2dd23 100755 --- a/src/crawl/Makefile.W32 +++ b/src/crawl/Makefile.W32 @@ -10,9 +10,7 @@ INCLUDE_CXXFLAGS = \ !IFDEF WITH_LUA INCLUDE_CXXFLAGS = $(INCLUDE_CXXFLAGS) \ - /DWITH_LUA \ - $(TOLUA_CFLAGS) \ - /DTOLUA_API=__declspec(dllimport) + /DWITH_LUA !ENDIF INCLUDE_DIRS = \ @@ -24,12 +22,6 @@ INCLUDE_DIRS = \ /I$(TOPDIR)\include\crawler \ /I$(TOPDIR)\include\luaglue \ /I$(TOPDIR)\lua\src - -!IFDEF WITH_LUA -INCLUDE_DIRS = $(INCLUDE_DIRS) \ - $(TOLUA_INCLUDES) \ - /I$(TOPDIR)\src\libcrawler -!ENDIF INCLUDE_LDFLAGS = \ @@ -42,7 +34,6 @@ INCLUDE_LIBS = \ $(TOPDIR)\src\libutil\util.lib \ $(TOPDIR)\src\liblogger\logger.lib \ $(TOPDIR)\src\libcrawler\crawler.lib \ - $(TOPDIR)\src\libluaglue\luaglue.lib \ $(TOPDIR)\lua\src\lua52.lib !IFDEF WITH_LUA -- cgit v1.2.3-54-g00ecf