diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2012-09-07 12:55:19 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2012-09-07 12:55:19 +0200 |
| commit | dcbeb3ab19da5393877b1ef4db2ac26d8a5787c0 (patch) | |
| tree | 3cd7187cd034b05ec8652c6a97c8a320b75def39 /src | |
| parent | 056883923550ab5455d0a4d106b3af5002689b2f (diff) | |
| download | crawler-dcbeb3ab19da5393877b1ef4db2ac26d8a5787c0.tar.gz crawler-dcbeb3ab19da5393877b1ef4db2ac26d8a5787c0.tar.bz2 | |
fixed all tests on Windows, still issues with static libcrawl
Diffstat (limited to 'src')
| -rwxr-xr-x | src/libcrawler/Makefile.W32 | 19 | ||||
| -rwxr-xr-x | src/modules/processor/htmllinkextract/Makefile.W32 | 3 | ||||
| -rwxr-xr-x | src/modules/urlnormalizer/simpleurl/Makefile.W32 | 4 |
3 files changed, 20 insertions, 6 deletions
diff --git a/src/libcrawler/Makefile.W32 b/src/libcrawler/Makefile.W32 index 9a734ce..7408a4f 100755 --- a/src/libcrawler/Makefile.W32 +++ b/src/libcrawler/Makefile.W32 @@ -20,24 +20,37 @@ INCLUDE_LIBS = \ $(TOPDIR)\src\logger\logger.lib CPP_OBJS = \ + win32\errormsg.obj \ + win32\stringutils.obj \ + URL.obj \ + MIMEType.obj \ + SpoolRewindInputStream.obj + +DYNAMIC_CPP_OBJS = \ win32\errormsg.dllobj \ win32\stringutils.dllobj \ URL.dllobj \ MIMEType.dllobj \ SpoolRewindInputStream.dllobj + +STATIC_LIB = \ + crawlerstatic.lib DYNAMIC_LIB = \ crawler.dll !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk -$(DYNAMIC_LIB): $(CPP_OBJS) +$(DYNAMIC_LIB): $(DYNAMIC_CPP_OBJS) $(LINK) /nologo /dll /out:$@ $(LDFLAGS) $(LIBS) $? -local_all: $(DYNAMIC_LIB) +$(STATIC_LIB): $(CPP_OBJS) + $(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $(LIBS) $? + +local_all: $(DYNAMIC_LIB) $(STATIC_LIB) local_clean: - @-erase $(DYNAMIC_LIB) 2>NUL + @-erase $(DYNAMIC_LIB) $(STATIC_LIB) 2>NUL @-erase win32\*.obj win32\*.dllobj 2>NUL local_distclean: diff --git a/src/modules/processor/htmllinkextract/Makefile.W32 b/src/modules/processor/htmllinkextract/Makefile.W32 index 1a53fec..1a34965 100755 --- a/src/modules/processor/htmllinkextract/Makefile.W32 +++ b/src/modules/processor/htmllinkextract/Makefile.W32 @@ -20,7 +20,8 @@ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ $(TOPDIR)\streamhtmlparser\streamhtmlparser.lib \ - $(TOPDIR)\src\libcrawler\crawler.lib + $(TOPDIR)\src\libcrawler\crawler.lib \ + $(TOPDIR)\src\logger\logger.lib DYNAMIC_MODULE = \ mod_processor_htmllinkextract.dll diff --git a/src/modules/urlnormalizer/simpleurl/Makefile.W32 b/src/modules/urlnormalizer/simpleurl/Makefile.W32 index 2a26e9c..641b656 100755 --- a/src/modules/urlnormalizer/simpleurl/Makefile.W32 +++ b/src/modules/urlnormalizer/simpleurl/Makefile.W32 @@ -23,7 +23,7 @@ DYNAMIC_MODULE = \ mod_urlnormalizer_simple.dll STATIC_LIB = \ - simpleurlnormalizer.lib + simpleurlnormalizerstatic.lib CPP_OBJS = \ SimpleURLNormalizer.obj @@ -34,7 +34,7 @@ SHARED_CPP_OBJS = \ !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk $(STATIC_LIB): $(CPP_OBJS) - $(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $? + $(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $(LIBS) $? $(DYNAMIC_MODULE): $(SHARED_CPP_OBJS) $(LINK) /dll /nologo /out:$@ $(LDFLAGS) $(LIBS) $? |