diff options
| author | Magnus Hagander <magnus@hagander.net> | 2007-07-25 11:37:25 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2007-07-25 11:37:25 +0000 |
| commit | 5cbb11928eef89df5993940eef6a35ceca5d67a3 (patch) | |
| tree | 12a3c22a75f6dd41ccce9f3dec759f2844bda106 /src | |
| parent | dff6797ce5e6ec6286192cee3f4ce9c99b7419d9 (diff) | |
| download | postgresql-5cbb11928eef89df5993940eef6a35ceca5d67a3.tar.gz postgresql-5cbb11928eef89df5993940eef6a35ceca5d67a3.zip | |
Fix standalone win32 makefile (MSVC6) for SSPI and GSSAPI.
Hiroshi Saito
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index cede59e242f..e4a22568fd6 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -1,4 +1,8 @@ +<<<<<<< win32.mak +# Makefile for Microsoft Visual C++ 8.0 +======= # Makefile for Microsoft Visual C++ 6.0-8.0 +>>>>>>> 1.45 # Will build a static library libpq(d).lib # and a dynamic library libpq(d).dll with import library libpq(d)dll.lib @@ -163,7 +167,7 @@ SSL_LIBS=ssleay32.lib libeay32.lib gdi32.lib !IFDEF USE_KFW CPP_PROJ=$(CPP_PROJ) /D KRB5 -KFW_LIBS=krb5_32.lib comerr32.lib +KFW_LIBS=krb5_32.lib comerr32.lib gssapi32.lib !ENDIF !IFDEF ENABLE_THREAD_SAFETY @@ -175,7 +179,7 @@ CPP_SBRS=. RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib $(SSL_LIBS) $(KFW_LIB) \ +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) \ /nologo /subsystem:windows /dll $(LOPT) /incremental:no \ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \ /out:"$(OUTDIR)\$(OUTFILENAME).dll"\ |