diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2014-10-08 15:39:00 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2014-10-08 15:39:00 +0200 |
| commit | 0b58dfebe6070ace895fdc3970020b2d01799269 (patch) | |
| tree | fb996026d43655afe8da3ba51de7f7274f38039f | |
| parent | 7280e10e8bfa507953d8c823abd502db98c514fa (diff) | |
| download | crawler-0b58dfebe6070ace895fdc3970020b2d01799269.tar.gz crawler-0b58dfebe6070ace895fdc3970020b2d01799269.tar.bz2 | |
compilation fix lua (how did it ever work!)
| -rw-r--r-- | lua/src/luaconf.h | 4 | ||||
| -rwxr-xr-x | src/crawl/crawl.cpp | 2 | ||||
| -rw-r--r-- | src/modules/processor/robotstxt/GNUmakefile | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lua/src/luaconf.h b/lua/src/luaconf.h index 3f650d6..f876db7 100644 --- a/lua/src/luaconf.h +++ b/lua/src/luaconf.h @@ -142,11 +142,15 @@ */ #if defined(LUA_BUILD_AS_DLL) || defined(SHARED) /* { */ +#ifdef _WIN32 #if defined(LUA_CORE) || defined(LUA_LIB) /* { */ #define LUA_API __declspec(dllexport) #else /* }{ */ #define LUA_API __declspec(dllimport) #endif /* } */ +#else +#define LUA_API extern +#endif #else /* }{ */ diff --git a/src/crawl/crawl.cpp b/src/crawl/crawl.cpp index 82cb690..14a02dd 100755 --- a/src/crawl/crawl.cpp +++ b/src/crawl/crawl.cpp @@ -90,7 +90,7 @@ int main( int /* argc */, char *argv[] ) normalizerModules.push_back( ".\\modules\\urlnormalizer\\simpleurl\\mod_urlnormalizer_simple.dll" ); normalizerModules.push_back( ".\\modules\\urlnormalizer\\googleurl\\mod_urlnormalizer_googleurl.dll" ); #endif - ModuleLoader<URLNormalizer> urlNormalizers( normalizerModules ); + ModuleLoader<URLNormalizer> urlNormalizers( normalizerModules, CLOSE_DEFERRED, (void *)&luaVm ); vector<string> filterModules; #ifndef _WIN32 diff --git a/src/modules/processor/robotstxt/GNUmakefile b/src/modules/processor/robotstxt/GNUmakefile index cbfe420..c8ffd4e 100644 --- a/src/modules/processor/robotstxt/GNUmakefile +++ b/src/modules/processor/robotstxt/GNUmakefile @@ -6,6 +6,7 @@ SUBDIRS = INCLUDE_DIRS = \ -I. -I$(TOPDIR)/src \ + -I$(TOPDIR)/include \ -I$(TOPDIR)/include/logger \ -I$(TOPDIR)/include/util \ -I$(TOPDIR)/include/module \ |