diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2014-10-14 16:35:42 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2014-10-14 16:35:42 +0200 |
| commit | 546797ad5d99225c012034a7b901144c5d67064a (patch) | |
| tree | 0a61f42cef37fd910e998dff72873210cdee7806 | |
| parent | 0a2d48f6d86c48c1f643a28f6f4f9420a3cf58ad (diff) | |
| download | crawler-546797ad5d99225c012034a7b901144c5d67064a.tar.gz crawler-546797ad5d99225c012034a7b901144c5d67064a.tar.bz2 | |
fixed url normalizer tests on Windows (by linking them statically).
There is some improvement to make the WITH_MODULELOADER a make
property and not hard-coded in the makefiles!
| -rwxr-xr-x | src/modules/urlnormalizer/googleurl/Makefile.W32 | 2 | ||||
| -rwxr-xr-x | tests/url/Makefile.W32 | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/modules/urlnormalizer/googleurl/Makefile.W32 b/src/modules/urlnormalizer/googleurl/Makefile.W32 index 6934972..5c29d45 100755 --- a/src/modules/urlnormalizer/googleurl/Makefile.W32 +++ b/src/modules/urlnormalizer/googleurl/Makefile.W32 @@ -23,7 +23,7 @@ INCLUDE_DIRS = \ !IFDEF WITH_LUA INCLUDE_DIRS = $(INCLUDE_DIRS) \ - -I$(TOPDIR)\include\luaglue \ + /I$(TOPDIR)\include\luaglue \ $(TOLUA_INCLUDES) !ENDIF diff --git a/tests/url/Makefile.W32 b/tests/url/Makefile.W32 index b4d51b4..59ac325 100755 --- a/tests/url/Makefile.W32 +++ b/tests/url/Makefile.W32 @@ -5,8 +5,8 @@ SUBDIRS = !INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk INCLUDE_CXXFLAGS = \ - /D_WIN32_WINNT=0x504 \ - /DUSE_MODULELOADER /DSHARED + /D_WIN32_WINNT=0x504 /DSHARED +# /DUSE_MODULELOADER INCLUDE_DIRS = \ /I. \ @@ -25,7 +25,14 @@ INCLUDE_LIBS = \ $(TOPDIR)\src\libcrawler\crawler.lib \ $(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib \ $(TOPDIR)\src\modules\urlnormalizer\googleurl\googleurlnormalizer.lib \ - $(TOPDIR)\googleurl\googleurl.lib \ + $(TOPDIR)\googleurl\googleurl.lib + +!IFDEF WITH_LUA +INCLUDE_LIBS = $(INCLUDE_LIBS) \ + $(TOPDIR)\src\libluaglue\luaglue.lib \ + $(TOLUA_LIBS) \ + $(TOPDIR)\src\libcrawler\crawlerstatic.lib +!ENDIF !IFDEF DEBUG INCLUDE_LIBS = $(INCLUDE_LIBS) \ |