[Xapian-devel] msvc trunk breakage

[Mark Hammond]

Hi all,
  I'm running out of time tonight, but I thought I would fire off this patch
to the MSVC makefiles, which should get things building again (assuming you
have a built zlib static library hanging around).  I'll try and get to
Olly's (private) request regarding buildbot and cygwin as I get time over
the next few days.

Cheers,

Mark
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 8352)
+++ Makefile	(working copy)
@@ -15,8 +15,6 @@
 CHECK: ALL DOTEST
 
 MAKEALL:
-   cd ..\getopt
-   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    cd ..\common
    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    cd ..\api
Index: win32_common.mak
===================================================================
--- win32_common.mak	(revision 8352)
+++ win32_common.mak	(working copy)
@@ -16,6 +16,7 @@
 
 LIBCOMMON_OBJS= \
 	$(INTDIR)\utils.obj \
+	$(INTDIR)\getopt.obj \
 	$(INTDIR)\omdebug.obj \
 	$(INTDIR)\omstringstream.obj \
 	$(INTDIR)\serialise-double.obj \
@@ -50,6 +51,11 @@
    $(CPP_PROJ) $**
 <<
 
+"$(INTDIR)\getopt.obj" : ".\getopt.cc"
+	$(CPP) @<< 
+   $(CPP_PROJ) $**
+<<
+
 "$(INTDIR)\omdebug.obj" : ".\omdebug.cc"
 	$(CPP) @<< 
    $(CPP_PROJ) $**
Index: win32_api.mak
===================================================================
--- win32_api.mak	(revision 8352)
+++ win32_api.mak	(working copy)
@@ -19,6 +19,7 @@
 LIBAPI_OBJS= \
              $(INTDIR)\error.obj \
              $(INTDIR)\errorhandler.obj \
+             $(INTDIR)\expanddecider.obj \
              $(INTDIR)\omenquire.obj  \
              $(INTDIR)\omquery.obj  \
              $(INTDIR)\omqueryinternal.obj  \
@@ -62,6 +63,11 @@
    $(CPP_PROJ) $**
 <<
 
+"$(INTDIR)\expanddecider.obj" : ".\expanddecider.cc"
+        $(CPP) @<<
+   $(CPP_PROJ) $**
+<<
+
 "$(INTDIR)\omenquire.obj" : ".\omenquire.cc"
         $(CPP) @<<
    $(CPP_PROJ) $**
Index: config.mak
===================================================================
--- config.mak	(revision 8352)
+++ config.mak	(working copy)
@@ -93,6 +93,8 @@
 SWIG_FLAGS= -Werror -noproxy
 # ------------end SWIG settings-------------
 
+# ------------ Misc external libraries we depend on -------------
+ZLIB_DIR=c:\src\zlib-1.2.3
 
 #--------------------------------------
 # Visual C++ Compiler and linker programs, and flags for these
@@ -102,7 +104,9 @@
 LINK32=link.exe
 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib \
- wsock32.lib Ws2_32.lib  odbccp32.lib /subsystem:console /debug /nologo
+ wsock32.lib Ws2_32.lib  odbccp32.lib /subsystem:console /debug /nologo \
+ $(ZLIB_DIR)\zlib.lib
+ 
 CPP=cl.exe
 RSC=rc.exe
 MANIFEST=mt.exe /manifest
@@ -124,11 +128,11 @@
 CPPFLAGS_COMMON=/nologo /c /Zi /I.. /I..\include /I..\common /W3 /EHsc \
 /D "WIN32" /D "__WIN32__" /D "_WINDOWS" \
 /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP" /D "_USE_32BIT_TIME_T" \
-/D_CRT_SECURE_NO_DEPRECATE
+/D_CRT_SECURE_NO_DEPRECATE \
+/I $(ZLIB_DIR)
 
 # The various parts of Xapian
 XAPIAN_LIBS = \
- "$(OUTLIBDIR)\libgetopt.lib"  \
  "$(OUTLIBDIR)\libcommon.lib"  \
  "$(OUTLIBDIR)\libbtreecheck.lib"  \
  "$(OUTLIBDIR)\libtest.lib"  \