kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 19:38:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ continue the port effort to windows

Browse Source
This commit is contained in:
kelson42 2011-12-21 22:47:29 +00:00
parent 3bddc4889e
commit 53ed13a511
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/Makefile.mvsc
View File

@ -7,6 +7,10 @@ PUGIXML=../pugixml
ICU=../dependences/icu
CTPP2=../ctpp2
ARGTABLE=../dependences/argtable
HTTPD=../dependences/libmicrohttpd
XAPIAN=../dependences/xapian-core-1.2.3
PTHREAD=../dependences/pthread-win32
ZLIB=../dependences/zlib-1.2.3
# Include paths
ZIM_INCLUDE=${ZIM}/include
@ -14,6 +18,10 @@ PUGIXML_INCLUDE=${PUGIXML}
ICU_INCLUDE=${ICU}/include
CTPP2_INCLUDE=${CTPP2}/include
ARGTABLE_INCLUDE=${ARGTABLE}/src
HTTPD_INCLUDE=${HTTPD}/include
XAPIAN_INCLUDE=${XAPIAN}/include
PTHREAD_INCLUDE=${PTHREAD}/include
ZLIB_INCLUDE=${ZLIB}
# Lib paths
ZIM_LIB=${ZIM}/src
@ -21,15 +29,22 @@ PUGIXML_LIB=${PUGIXML}
ICU_LIB=${ICU}/lib
CTPP2_LIB=${CTPP2}/src
ARGTABLE_LIB=${ARGTABLE}/src
HTTPD_LIB=${HTTPD}/lib
XAPIAN_LIB=${XAPIAN}/win32/Release/libs
PTHREAD_LIB=${PTHREAD}/lib
ZLIB_INCLUDE=${ZLIB}
# Compiler and linker flags
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}"
CFLAGS=-D"XP_WIN" -D"XP_WIN32" -D"WIN32" -O2 -Oi -I"${XAPIAN_INCLUDE}" -I"${HTTPD_INCLUDE}" -I"${ZIM_INCLUDE}" -I"${PTHREAD_INCLUDE}" -I"${PUGIXML_INCLUDE}" -I${ARGTABLE_INCLUDE} -I$(ZLIB_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:"$(PTHREAD_LIB)" -LIBPATH:"$(CTPP2_LIB)" -LIBPATH:"${XAPIAN_LIB}" -LIBPATH:"${HTTPD_LIB}" -LIBPATH:"${ZIM_LIB}" -LIBPATH:"${PUGIXML_LIB}" -LIBPATH:"$(ZLIB_LIB)" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"${ARGTABLE_LIB}"
all: kiwix-serve.exe
argtableobjs:
$(CC) $(CFLAGS) -D"MHD_PLATFORM_H" -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" kiwix-serve.cpp
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 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
kiwix-serve.exe: argtableobjs objs
$(LD) -OUT:"kiwix-serve.exe" -NOLOGO $(LDFLAGS) -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib argtable2.lib pugixml.lib ctpp2.lib libcommon.lib libbackend.lib libbrass.lib Rpcrt4.lib libbrassbtreecheck.lib libbrassbtreecheck.lib libexpand.lib libflint.lib libflintbtreecheck.lib libchert.lib libweight.lib libinmemory.lib libmulti.lib libmatcher.lib libnet.lib liblanguages.lib libapi.lib libremote.lib libunicode.lib libqueryparser.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib pthreadVC2.lib zlib.lib *.obj

12
src/server/kiwix-serve.cpp
View File

@ -19,16 +19,21 @@
#ifdef _WIN32
#include <stdint4win.h>
#include <winsock2.h>
#include <ws2tcpip.h>
typedef SSIZE_T ssize_t;
typedef int off_t;
#else
#include <stdint.h>
#include <unistd.h>
#include <kiwix/cluceneSearcher.h>
#endif
#include <microhttpd.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <getopt.h>
#include <unistd.h>
#include <microhttpd.h>
#include <iostream>
#include <string>
#include <fstream>
@ -43,7 +48,6 @@
#include <zlib.h>
#include <kiwix/reader.h>
#include <kiwix/xapianSearcher.h>
#include <kiwix/cluceneSearcher.h>
#include <pathTools.h>
using namespace std;
@ -425,6 +429,7 @@ int main(int argc, char **argv) {
cerr << "Unable to open the search index '" << zimPath << "' with the XapianSearcher." << endl;
}
#ifndef _WIN32
/* Try with the CluceneSearcher */
if (!hasSearchIndex) {
try {
@ -435,6 +440,7 @@ int main(int argc, char **argv) {
exit(1);
}
}
#endif
/* searcher configuration */
if (hasSearchIndex) {