Ticket #115: win32msvc.patch

File win32msvc.patch, 3.8 KB (added by Mark Hammond, 17 years ago)

as described

  • win32_net.mak

     
     1# Makefile for Microsoft Visual C++ 7.0 (or compatible)
     2
     3# Will build a Win32 static library libnet.lib
     4
     5!IF "$(OS)" == "Windows_NT"
     6NULL=
     7!ELSE
     8NULL=nul
     9!ENDIF
     10
     11!INCLUDE ..\win32\config.mak
     12
     13
     14CPP=cl.exe
     15RSC=rc.exe
     16
     17
     18OUTDIR=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
     19INTDIR=.\
     20
     21ALL : "$(OUTDIR)\libnet.lib"
     22
     23LIBNET_OBJS= \
     24#             $(INTDIR)\progclient.obj \
     25             $(INTDIR)\remoteconnection.obj  \
     26             $(INTDIR)\remoteserver.obj  \
     27             $(INTDIR)\serialise.obj  \
     28             $(INTDIR)\tcpclient.obj  \
     29             $(INTDIR)\tcpserver.obj  \
     30             $(NULL)
     31
     32
     33CLEAN :
     34        -@erase "$(OUTDIR)\libnet.lib"
     35        -@erase "*.pch" "*.pdb"
     36        -@erase $(LIBNET_OBJS)
     37
     38"$(OUTDIR)" :
     39    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
     40
     41CPP_PROJ=$(CPPFLAGS_EXTRA) \
     42 /Fo"$(INTDIR)\\" /Tp$(INPUTNAME)
     43CPP_OBJS=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)
     44CPP_SBRS=.
     45
     46LIB32=link.exe -lib
     47LIB32_FLAGS=/nologo  $(LIBFLAGS)
     48
     49
     50"$(OUTDIR)\libnet.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIBNET_OBJS)
     51    $(LIB32) @<<
     52  $(LIB32_FLAGS) /out:"$(OUTDIR)\libnet.lib" $(DEF_FLAGS) $(LIBNET_OBJS)
     53<<
     54
     55"$(INTDIR)\progclient.obj" : ".\progclient.cc"
     56        $(CPP) @<<
     57   $(CPP_PROJ) $**
     58<<
     59
     60"$(INTDIR)\remoteconnection.obj" : ".\remoteconnection.cc"
     61        $(CPP) @<<
     62   $(CPP_PROJ) $**
     63<<
     64
     65"$(INTDIR)\remoteserver.obj" : ".\remoteserver.cc"
     66        $(CPP) @<<
     67   $(CPP_PROJ) $**
     68<<
     69
     70"$(INTDIR)\serialise.obj" : ".\serialise.cc"
     71        $(CPP) @<<
     72   $(CPP_PROJ) $**
     73<<
     74
     75"$(INTDIR)\tcpclient.obj" : ".\tcpclient.cc"
     76        $(CPP) @<<
     77   $(CPP_PROJ) $**
     78<<
     79
     80"$(INTDIR)\tcpserver.obj" : ".\tcpserver.cc"
     81        $(CPP) @<<
     82   $(CPP_PROJ) $**
     83<<
     84
     85{.}.cc{$(INTDIR)}.obj:
     86        $(CPP) @<<
     87        $(CPP_PROJ) $<
     88<<
     89
     90{.}.cc{$(CPP_SBRS)}.sbr:
     91   $(CPP) @<<
     92   $(CPP_PROJ) $<
     93<<

  • win32_bindings_python.mak 

    Property changes on: win32_net.mak
___________________________________________________________________
Name: svn:eol-style
   + native
     
    2828 "$(OUTLIBDIR)\liblanguages.lib"  \
    2929 "$(OUTLIBDIR)\libapi.lib"  \
    3030 "$(OUTLIBDIR)\libqueryparser.lib" \
     31 "$(OUTLIBDIR)\libremote.lib" \
     32 "$(OUTLIBDIR)\libnet.lib" \
    3133 "$(PYTHON_LIB)"
    3234
    3335LIB_XAPIAN_OBJS= ".\xapian_wrap.obj"
    … …  
    6466
    6567CPP_PROJ=$(CPPFLAGS_EXTRA)  /GR \
    6668 /I "$(XAPIAN_CORE_REL_PYTHON)" /I "$(XAPIAN_CORE_REL_PYTHON)\include" \
    67  /I "$(PYTHON_INCLUDE)" /I"." \
     69 /I "$(PYTHON_INCLUDE)" /I "$(PYTHON_INCLUDE_2)" /I"." \
    6870 /Fo"$(INTDIR)\\" /Tp$(INPUTNAME)
    6971CPP_OBJS=$(XAPIAN_CORE_REL_PYTHON)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\
    7072CPP_SBRS=.

  • config.mak

     
    3939PYTHON_EXE=$(PYTHON_DIR)\python.exe
    4040#PYTHON_INCLUDE : Set this to the directory that contains python.h
    4141PYTHON_INCLUDE=$(PYTHON_DIR)\include
     42#A 'PC' directory is also included for people building from a source tree.
     43PYTHON_INCLUDE_2=$(PYTHON_DIR)\PC
    4244# PYTHON_LIB : Set this to the python library including path for linking with
    43 PYTHON_LIB=$(PYTHON_DIR)\libs\python25.lib
     45# Currently, a DEBUG xapian implies a DEBUG Python - in the future, it
     46# might be desirable to mix-and-match, but for now, we stay consistent.
     47!if "$(DEBUG)"=="1"
     48PYTHON_LIB=$(PYTHON_DIR)\PCBuild\python25_d.lib
     49!else
     50PYTHON_LIB=$(PYTHON_DIR)\PCBuild\python25.lib
     51!endif
    4452# -------------end Python settings-------------
    4553
    4654