Ticket #129: bug-129.patch

File bug-129.patch, 6.1 KB (added by Mark Hammond, 17 years ago)

as described

  • config.mak

     
    102102LINK32=link.exe
    103103LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    104104 advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib \
    105  wsock32.lib Ws2_32.lib  odbccp32.lib /subsystem:console /debug
     105 wsock32.lib Ws2_32.lib  odbccp32.lib /subsystem:console /debug /nologo
    106106CPP=cl.exe
    107107RSC=rc.exe
    108108MANIFEST=mt.exe /manifest
    … …  
    121121# stackframe information, meaning basic debugging on release builds
    122122# is still possible (so long as the .pdb files are in place - it is
    123123# assumed these files will *not* ship with a default binary build)
    124 CPPFLAGS_COMMON=/c /Zi /I.. /I..\include /I..\common /W3 /EHsc \
     124CPPFLAGS_COMMON=/nologo /c /Zi /I.. /I..\include /I..\common /W3 /EHsc \
    125125/D "WIN32" /D "__WIN32__" /D "_WINDOWS" \
    126126/D "HAVE_VSNPRINTF" /D "HAVE_STRDUP" /D "_USE_32BIT_TIME_T" \
    127127/D_CRT_SECURE_NO_DEPRECATE

  • Makefile

     
    1818   cd ..\getopt
    1919   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2020   cd ..\common
    21    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     21   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2222   cd ..\api
    23    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     23   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2424   cd ..\backends
    25    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     25   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2626   cd ..\matcher
    27    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     27   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2828   cd ..\languages\compiler
    29    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     29   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3030   cd ..
    31    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     31   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3232   cd ..\queryparser
    33    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     33   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3434   cd ..\net
    35    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     35   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3636   cd ..\tests\harness
    37    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     37   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3838   cd ..\..\bin
    39    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     39   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    4040   cd ..\examples
    41    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     41   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    4242   cd ..\tests
    43    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)"
     43   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    4444
    4545DOTEST:
    46    nmake $(MAKEMACRO) CFG="$(CFG)" DEBUG="$(DEBUG)" DOTEST
     46   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" DOTEST
    4747   cd ..\win32
    4848
    4949CLEAN: COPYMAKFILES
    5050   cd ..\net
    51    nmake DEBUG="$(DEBUG)" CLEAN
     51   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    5252   cd ..\getopt
    53    nmake DEBUG="$(DEBUG)" CLEAN
     53   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    5454   cd ..\common
    55    nmake DEBUG="$(DEBUG)" CLEAN
     55   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    5656   cd ..\api
    57    nmake DEBUG="$(DEBUG)" CLEAN
     57   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    5858   cd ..\backends
    59    nmake DEBUG="$(DEBUG)" CLEAN
     59   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    6060   cd ..\matcher
    61    nmake DEBUG="$(DEBUG)" CLEAN
     61   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    6262   cd ..\languages\compiler
    63    nmake DEBUG="$(DEBUG)" CLEAN
     63   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    6464   cd ..
    65    nmake DEBUG="$(DEBUG)" CLEAN
     65   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    6666   cd ..\queryparser
    67    nmake DEBUG="$(DEBUG)" CLEAN
     67   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    6868   cd ..\tests\harness
    69    nmake DEBUG="$(DEBUG)" CLEAN
     69   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    7070   cd ..\..\bin
    71    nmake DEBUG="$(DEBUG)" CLEAN
     71   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    7272   cd ..\examples
    73    nmake DEBUG="$(DEBUG)" CLEAN
     73   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    7474   cd ..\tests
    75    nmake DEBUG="$(DEBUG)" CLEAN
     75   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    7676   cd ..\win32
    7777   -@erase ..\config.h
    7878   -@erase ..\include\xapian\version.h

  • win32_backends.mak

     
    2727        -@erase $(LIBBACKEND_OBJS)
    2828        -@erase $(CLEANFILES)
    2929        cd quartz
    30         nmake CLEAN DEBUG=$(DEBUG)
     30        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    3131        cd ..\flint
    32         nmake CLEAN DEBUG=$(DEBUG)
     32        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    3333        cd ..\inmemory
    34         nmake CLEAN DEBUG=$(DEBUG)
     34        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    3535        cd ..\multi
    36         nmake CLEAN DEBUG=$(DEBUG)
     36        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    3737        cd ..\remote
    38         nmake CLEAN DEBUG=$(DEBUG)
     38        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    3939        cd ..
    4040
    4141
    … …  
    7979
    8080"$(OUTDIR)\libquartz.lib":
    8181       cd quartz
    82        nmake $(MAKEMACRO) /$(NMAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
     82       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    8383       cd ..
    8484
    8585"$(OUTDIR)\libflint.lib":
    8686       cd flint
    87        nmake $(MAKEMACRO) /$(NMAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
     87       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    8888       cd ..
    8989
    9090"$(OUTDIR)\libinmemory.lib":
    9191       cd inmemory
    92        nmake $(MAKEMACRO) /$(NMAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
     92       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    9393       cd ..
    9494
    9595"$(OUTDIR)\libmulti.lib":
    9696       cd multi
    97        nmake $(MAKEMACRO) /$(NMAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
     97       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    9898       cd ..
    9999
    100100"$(OUTDIR)\libremote.lib":
    101101       cd remote
    102        nmake $(MAKEMACRO) /$(NMAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
     102       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    103103       cd ..