some fixes on Windows

9 files changed, 28 insertions, 14 deletions

diff --git a/src/crawl/Makefile.W32 b/src/crawl/Makefile.W32
index 6ab255c..237d189 100755
--- a/src/crawl/Makefile.W32
+++ b/src/crawl/Makefile.W32
@@ -10,19 +10,22 @@ INCLUDE_CXXFLAGS = \
 
 INCLUDE_DIRS = \
 	/I. \
+	/I$(TOPDIR)\include \
 	/I$(TOPDIR)\include\logger \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
 	/I$(TOPDIR)\include\crawler \
-	/I$(TOPDIR)\include\luaglue
-
+	/I$(TOPDIR)\include\luaglue \
+	/I$(TOPDIR)\lua\src
+	
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
 	$(TOPDIR)\src\libutil\util.lib \
 	$(TOPDIR)\src\liblogger\logger.lib \
 	$(TOPDIR)\src\libcrawler\crawler.lib \
-	$(TOPDIR)\src\libluaglue\luaglue.lib
+	$(TOPDIR)\src\libluaglue\luaglue.lib \
+	$(TOPDIR)\lua\src\lua52.lib
 
 CPP_OBJS = \
 
diff --git a/src/libluaglue/Makefile.W32 b/src/libluaglue/Makefile.W32
index 605835e..8b34ea8 100755
--- a/src/libluaglue/Makefile.W32
+++ b/src/libluaglue/Makefile.W32
@@ -6,16 +6,18 @@ SUBDIRS =
 
 INCLUDE_CXXFLAGS = \
 	/D_WIN32_WINNT=0x504 \
-	/DBUILDING_UTIL
+	/DBUILDING_LUAGLUE
 
 INCLUDE_DIRS = \
 	/I. \
-	/I$(TOPDIR)\include\util
+	/I$(TOPDIR)\include\luaglue \
+	/I$(TOPDIR)\lua\src
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-
+	$(TOPDIR)\lua\src\lua52.lib
+	
 CPP_OBJS = \
 	LuaVM.obj
 
diff --git a/src/libutil/Makefile.W32 b/src/libutil/Makefile.W32
index c4c8f83..dafcd1d 100755
--- a/src/libutil/Makefile.W32
+++ b/src/libutil/Makefile.W32
@@ -10,7 +10,7 @@ INCLUDE_CXXFLAGS = \
 
 INCLUDE_DIRS = \
 	/I. \
-	/I$(TOPDIR)\include\util
+	/I$(TOPDIR)\include
 
 INCLUDE_LDFLAGS = \
 
diff --git a/src/libutil/win32/errormsg.cpp b/src/libutil/win32/errormsg.cpp
index c0a65d8..1939aa6 100755
--- a/src/libutil/win32/errormsg.cpp
+++ b/src/libutil/win32/errormsg.cpp
@@ -1,4 +1,4 @@
-#include "win32/errormsg.hpp"
+#include "util/win32/errormsg.hpp"
 
 using namespace std;
 
diff --git a/src/libutil/win32/stringutils.cpp b/src/libutil/win32/stringutils.cpp
index 607735c..b6eab62 100755
--- a/src/libutil/win32/stringutils.cpp
+++ b/src/libutil/win32/stringutils.cpp
@@ -1,4 +1,4 @@
-#include "win32/stringutils.hpp"
+#include "util/win32/stringutils.hpp"
 
 using namespace std;
 
diff --git a/src/modules/fetcher/winhttp/Makefile.W32 b/src/modules/fetcher/winhttp/Makefile.W32
index b996b5d..ab00db5 100755
--- a/src/modules/fetcher/winhttp/Makefile.W32
+++ b/src/modules/fetcher/winhttp/Makefile.W32
@@ -10,6 +10,7 @@ INCLUDE_CXXFLAGS = \
 INCLUDE_DIRS = \
 	/I. \
 	/I$(TOPDIR)\src \
+	/I$(TOPDIR)\include \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
 	/I$(TOPDIR)\include\logger \
diff --git a/src/modules/processor/robotstxt/Makefile.W32 b/src/modules/processor/robotstxt/Makefile.W32
index ebf1e22..fb39242 100755
--- a/src/modules/processor/robotstxt/Makefile.W32
+++ b/src/modules/processor/robotstxt/Makefile.W32
@@ -10,11 +10,11 @@ INCLUDE_CXXFLAGS = \
 INCLUDE_DIRS = \
 	/I. \
 	/I$(TOPDIR)\src \
+	/I$(TOPDIR)\include \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
 	/I$(TOPDIR)\include\logger \
-	/I$(TOPDIR)\include\crawler \
-	/I$(TOPDIR)\streamhtmlparser
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
diff --git a/src/modules/processor/sitemap/Makefile.W32 b/src/modules/processor/sitemap/Makefile.W32
index 115b4c8..1f30297 100755
--- a/src/modules/processor/sitemap/Makefile.W32
+++ b/src/modules/processor/sitemap/Makefile.W32
@@ -13,7 +13,8 @@ INCLUDE_DIRS = \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
 	/I$(TOPDIR)\include\logger \
-	/I$(TOPDIR)\include\crawler
+	/I$(TOPDIR)\include\crawler \
+	/I$(TOPDIR)\textwolf\include
 
 INCLUDE_LDFLAGS = \
 
@@ -31,7 +32,7 @@ CPP_OBJS = \
 	SitemapProcessor.obj
 
 SHARED_CPP_OBJS = \
-	HTMLLinkExtractProcessor.dllobj
+	SitemapProcessor.dllobj
 
 !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk
 
diff --git a/src/modules/urlnormalizer/googleurl/Makefile.W32 b/src/modules/urlnormalizer/googleurl/Makefile.W32
index a906404..fb0a76b 100755
--- a/src/modules/urlnormalizer/googleurl/Makefile.W32
+++ b/src/modules/urlnormalizer/googleurl/Makefile.W32
@@ -19,8 +19,15 @@ INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
 	$(TOPDIR)\googleurl\googleurl.lib \
-	$(TOPDIR)\src\libcrawler\crawler.lib \
+	$(TOPDIR)\src\libcrawler\crawler.lib
+
+!IFDEF DEBUG
+INCLUDE_LIBS = $(INCLUDE_LIBS) \
+	"$(ICU_DIR)\lib\icuucd.lib"
+!ELSE
+INCLUDE_LIBS = $(INCLUDE_LIBS) \
 	"$(ICU_DIR)\lib\icuuc.lib"
+!ENDIF
 
 DYNAMIC_MODULE = \
 	mod_urlnormalizer_googleurl.dll