From e232b173a59d4ca042636c5f1e0577fd7e49a504 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Tue, 20 Dec 2011 22:51:04 +0000 Subject: [PATCH] + imp. of the windows makefile --- src/indexer/Makefile.mvsc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/indexer/Makefile.mvsc b/src/indexer/Makefile.mvsc index aa421a3..0311b33 100644 --- a/src/indexer/Makefile.mvsc +++ b/src/indexer/Makefile.mvsc @@ -20,8 +20,8 @@ XAPIAN_LIB=${XAPIAN}/win32/Release/libs ARGTABLE_LIB=${ARGTABLE}/src # Compiler and linker flags -CFLAGS=-D"XP_WIN" -D"XP_WIN32" -O2 -Oi -I"${XAPIAN_INCLUDE}" -I"${ZIM_INCLUDE}" -I${ARGTABLE_INCLUDE} -I$(ICU_INCLUDE) -I../common/ -I../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP -LDFLAGS=-nologo -LIBPATH:"${ZIM_LIB}" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"$(XAPIAN_LIB)" -LIBPATH:"${ARGTABLE_LIB}" +CFLAGS=-D"XP_WIN" -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" -D"XP_WIN32" -O2 -Oi -I"${XAPIAN_INCLUDE}" -I"${ZIM_INCLUDE}" -I${ARGTABLE_INCLUDE} -I$(ICU_INCLUDE) -I../common/ -I../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP +LDFLAGS=-nologo -LIBPATH:"${ZIM_LIB}" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"$(XAPIAN_LIB)" -LIBPATH:"${ARGTABLE_LIB}" all: kiwix-index.exe @@ -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-serve.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 kiwix-index.obj + $(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