From a194c21303ac046c895e394aa1b1e0979e32c913 Mon Sep 17 00:00:00 2001
From: kelson42 <kelson42@users.sourceforge.net>
Date: Mon, 12 Dec 2011 16:06:57 +0000
Subject: [PATCH] + imp. to port to windows

---
 src/server/Makefile.mvsc   | 11 +++++++----
 src/server/kiwix-serve.cpp |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/server/Makefile.mvsc b/src/server/Makefile.mvsc
index 921734c..77be686 100644
--- a/src/server/Makefile.mvsc
+++ b/src/server/Makefile.mvsc
@@ -4,24 +4,27 @@ LD=link.exe
 # Global paths
 ZIM=../zimlib
 PUGIXML=../pugixml
-ICU=../dependences/icu/
+ICU=../dependences/icu
 CTPP2=../ctpp2
+ARGTABLE=../dependences/argtable
 
 # Include paths
 ZIM_INCLUDE=${ZIM}/include
 PUGIXML_INCLUDE=${PUGIXML}
 ICU_INCLUDE=${ICU}/include
 CTPP2_INCLUDE=${CTPP2}/include
+ARGTABLE_INCLUDE=${ARGTABLE}/src
 
 # Lib paths
 ZIM_LIB=${ZIM}/src
 PUGIXML_LIB=${PUGIXML}
 ICU_LIB=${ICU}/lib
 CTPP2_LIB=${CTPP2}/src
+ARGTABLE_LIB=${ARGTABLE}/src
 
 # Compiler and linker flags
-CFLAGS=-D"XP_WIN" -D"XP_WIN32" -O2 -Oi -I"${ZIM_INCLUDE}" -I"${PUGIXML_INCLUDE}" -I$(ICU_INCLUDE) -I{CTPP2_INCLUDE} -I../../common/ -I../../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP
-LDFLAGS=-nologo -LIBPATH:"$(CTPP2_LIB)" -LIBPATH:"${ZIM_LIB}" -LIBPATH:"${PUGIXML_LIB}" -LIBPATH:"$(ICU_LIB)"
+CFLAGS=-D"XP_WIN" -D"XP_WIN32" -O2 -Oi -I"${ZIM_INCLUDE}" -I"${PUGIXML_INCLUDE}" -I${ARGTABLE_INCLUDE} -I$(ICU_INCLUDE) -I${CTPP2_INCLUDE} -I../../common/ -I../../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP
+LDFLAGS=-nologo -LIBPATH:"$(CTPP2_LIB)" -LIBPATH:"${ZIM_LIB}" -LIBPATH:"${PUGIXML_LIB}" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"${ARGTABLE_LIB}" 
 
 all: kiwix-serve.exe
 
@@ -29,4 +32,4 @@ objs:
 	$(CC) $(CFLAGS) kiwix-serve.cpp ../common/kiwix/reader.cpp ../common/kiwix/searcher.cpp ../common/kiwix/xapianSearcher.cpp ../common/unaccent.cpp ../common/splitString.cpp 
 
 kiwix-serve.exe: objs
-	$(LD) -OUT:"kiwix-serve.exe" -NOLOGO $(LDFLAGS) -DLL -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib pugixml.lib ctpp2.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib kiwix-serve.obj
+	$(LD) -OUT:"kiwix-serve.exe" -NOLOGO $(LDFLAGS) -DLL -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib argtable2.lib pugixml.lib ctpp2.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib kiwix-serve.obj
diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index bdfc4d9..d55f8e7 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -17,7 +17,12 @@
  * MA 02110-1301, USA.
  */
 
+#ifdef _WIN32
+#include <stdint4win.h>
+#else
 #include <stdint.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>