From 4ae4f772c1f06ab994e8ba94417c74be9578ded6 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Tue, 20 Dec 2011 23:37:08 +0000 Subject: [PATCH] + port kiwix-index to windows --- src/indexer/Makefile.mvsc | 2 +- src/indexer/kiwix-index.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/indexer/Makefile.mvsc b/src/indexer/Makefile.mvsc index 0311b33..ee6b928 100644 --- a/src/indexer/Makefile.mvsc +++ b/src/indexer/Makefile.mvsc @@ -29,4 +29,4 @@ objs: $(CC) $(CFLAGS) kiwix-index.cpp ../common/kiwix/xapian/myhtmlparse.cc ../common/kiwix/xapian/htmlparse.cc ../common/unaccent.cpp ../common/kiwix/indexer.cpp ../common/kiwix/xapianIndexer.cpp kiwix-index.exe: objs - $(LD) -OUT:"kiwix-index.exe" -NOLOGO $(LDFLAGS) -DLL -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib argtable2.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 *.obj + $(LD) -OUT:"kiwix-index.exe" -NOLOGO $(LDFLAGS) -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib argtable2.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 *.obj diff --git a/src/indexer/kiwix-index.cpp b/src/indexer/kiwix-index.cpp index 08be412..e8f06a3 100644 --- a/src/indexer/kiwix-index.cpp +++ b/src/indexer/kiwix-index.cpp @@ -17,9 +17,14 @@ * MA 02110-1301, USA. */ -#include #include +#include + +#ifdef _WIN32 +#include +#else #include +#endif enum supportedBackend { XAPIAN, CLUCENE }; @@ -89,7 +94,9 @@ int main(int argc, char **argv) { /* Try to prepare the indexing */ try { if (backend == CLUCENE) { +#ifndef _WIN32 indexer = new kiwix::CluceneIndexer(zimFilePath, indexPath); +#endif } else { indexer = new kiwix::XapianIndexer(zimFilePath, indexPath); }