summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2014-10-14 13:13:39 +0200
committerAndreas Baumann <abaumann@yahoo.com>2014-10-14 13:13:39 +0200
commite99b97db40f81ed39fea2742568528ad03927aa2 (patch)
tree1b04e6ab6f49a3fcc76f2a06edcd356dd6e3ecf4
parentc757efa3ee6f395e3ada3088065c73eb953f6834 (diff)
downloadcrawler-e99b97db40f81ed39fea2742568528ad03927aa2.tar.gz
crawler-e99b97db40f81ed39fea2742568528ad03927aa2.tar.bz2
crawler works now with Lua also on Windows
-rw-r--r--include/crawler/libcrawler.hpp4
-rwxr-xr-xsrc/crawl/Makefile.W3211
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