Ticket #116: pylib.2.patch

xapian-maintainer-tools/win32msvc/win32_bindings_python.mak

@@ -30 +30 @@
  "$(OUTLIBDIR)\libqueryparser.lib" \
  "$(OUTLIBDIR)\libremote.lib" \
  "$(OUTLIBDIR)\libnet.lib" \
- "$(PYTHON_LIB)"
+ $(NULL)
 
 LIB_XAPIAN_OBJS= ".\xapian_wrap.obj" 
 
@@ -71 +71 @@
 CPP_OBJS=$(XAPIAN_CORE_REL_PYTHON)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\
 CPP_SBRS=.
 
-ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_DEPENDENCIES)
+ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_DEPENDENCIES) "/LIBPATH:$(PYTHON_LIB_DIR)"
 
 modern/xapian_wrap.cc modern/xapian_wrap.h modern/xapian.py: ../xapian.i util.i extra.i except.i 
         -erase /Q modern

xapian-maintainer-tools/win32msvc/config.mak

@@ -4 +4 @@
 # www.lemurconsulting.com
 #
 # Modify this file to set any extra Xapian build flags
+#
+# HINT: Instead of modifying this file, consider passing new values
+# on the command-line.  For example:
+#  % nmake -f win32.mak PERL_DIR=c:\perl\bin SWIG=c:\something\swig.exe
+# Would override the variables without requiring you change anything...
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
@@ -43 +48 @@
 #A 'PC' directory is also included for people building from a source tree.
 PYTHON_INCLUDE_2=$(PYTHON_DIR)\PC
 
- # PYTHON_LIB : Set this to the python library including path for linking with
-# Currently, a DEBUG xapian implies a DEBUG Python - in the future, it
-# might be desirable to mix-and-match, but for now, we stay consistent.
-!if "$(DEBUG)"=="1"
-PYTHON_LIB=$(PYTHON_DIR)\PCBuild\python25_d.lib
-!else
-PYTHON_LIB=$(PYTHON_DIR)\PCBuild\python25.lib
-!endif
+# PYTHON_LIB_DIR : Set this to the directory containing python*.lib
+# It should only be necessary to change this for source builds of Python,
+# where the files are in 'PCBuild' rather than 'libs' (this magically works
+# as Python uses a #pragma to reference the library base name - which
+# includes any version numbers and debug suffixes ('_d'))
+PYTHON_LIB_DIR=$(PYTHON_DIR)\libs
 # -------------end Python settings-------------