+ imp. to port to windows

This commit is contained in:
kelson42 2011-12-12 16:06:57 +00:00
parent afb0ac6947
commit a194c21303
2 changed files with 12 additions and 4 deletions

View File

@ -4,24 +4,27 @@ LD=link.exe
# Global paths # Global paths
ZIM=../zimlib ZIM=../zimlib
PUGIXML=../pugixml PUGIXML=../pugixml
ICU=../dependences/icu/ ICU=../dependences/icu
CTPP2=../ctpp2 CTPP2=../ctpp2
ARGTABLE=../dependences/argtable
# Include paths # Include paths
ZIM_INCLUDE=${ZIM}/include ZIM_INCLUDE=${ZIM}/include
PUGIXML_INCLUDE=${PUGIXML} PUGIXML_INCLUDE=${PUGIXML}
ICU_INCLUDE=${ICU}/include ICU_INCLUDE=${ICU}/include
CTPP2_INCLUDE=${CTPP2}/include CTPP2_INCLUDE=${CTPP2}/include
ARGTABLE_INCLUDE=${ARGTABLE}/src
# Lib paths # Lib paths
ZIM_LIB=${ZIM}/src ZIM_LIB=${ZIM}/src
PUGIXML_LIB=${PUGIXML} PUGIXML_LIB=${PUGIXML}
ICU_LIB=${ICU}/lib ICU_LIB=${ICU}/lib
CTPP2_LIB=${CTPP2}/src CTPP2_LIB=${CTPP2}/src
ARGTABLE_LIB=${ARGTABLE}/src
# Compiler and linker flags # 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 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)" LDFLAGS=-nologo -LIBPATH:"$(CTPP2_LIB)" -LIBPATH:"${ZIM_LIB}" -LIBPATH:"${PUGIXML_LIB}" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"${ARGTABLE_LIB}"
all: kiwix-serve.exe 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 $(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 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

View File

@ -17,7 +17,12 @@
* MA 02110-1301, USA. * MA 02110-1301, USA.
*/ */
#ifdef _WIN32
#include <stdint4win.h>
#else
#include <stdint.h> #include <stdint.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>