From c6b69a2050752a1f96127460557ad2927c6676a9 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Mon, 2 Jun 2014 19:13:47 +0300
Subject: [PATCH] Remove unused cruft from Windows build files.

---
 installer/Make.bat | 4 ----
 win32.mak          | 4 ----
 win64.mak          | 8 ++------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/installer/Make.bat b/installer/Make.bat
index e82ba56..fc9dbea 100755
--- a/installer/Make.bat
+++ b/installer/Make.bat
@@ -4,15 +4,12 @@
 
 setlocal
 SET X86PROGRAMFILES=%ProgramFiles%
-SET X86COMMONFILES=%CommonProgramFiles%
 
 if "%PROCESSOR_ARCHITECTURE%" == "x86" GOTO SET_LINKFILES
 SET X86PROGRAMFILES=%ProgramFiles(x86)%
-SET X86COMMONFILES=%CommonProgramFiles(x86)%
 
 :SET_LINKFILES
 :: echo X86PROGRAMFILES=%X86PROGRAMFILES%
-:: echo X86COMMONFILES=%X86COMMONFILES%
 ::
 :: When you reference PG server's libpq related dlls, set the
 :: version to the variable PGVERSION (default 9.3) and call
@@ -71,7 +68,6 @@ IF ERRORLEVEL 1 GOTO ERR_HANDLER
 echo.
 echo Building psqlODBC installer database...
 
-::SET PROGRAMCOM="%X86COMMONFILES%/Merge Modules"
 candle -nologo -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPRODUCTCODE="%PRODUCTCODE%" psqlodbc.wxs
 IF ERRORLEVEL 1 GOTO ERR_HANDLER
 
diff --git a/win32.mak b/win32.mak
index 0b1a2d3..ab7ad50 100644
--- a/win32.mak
+++ b/win32.mak
@@ -259,17 +259,13 @@ CPP_PROJ=$(CPP_PROJ) $(CUSTOMCLOPT) $(VC_FLAGS) $(INC_OPT) /D "WIN32" /D "_WINDO
    $(CPP_PROJ) /c $<
 <<
 
-MTL=midl.exe
 RSC=rc.exe
 BSC32=bscmake.exe
-MTL_PROJ=/nologo /mktyplib203 /win32
 RSC_PROJ=/l 0x809 /fo"$(INTDIR)\psqlodbc.res"
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc"
 !IF  "$(CFG)" == "Release"
-MTL_PROJ=$(MTL_PROC) /D "NDEBUG"
 RSC_PROJ=$(RSC_PROJ) /d "NDEBUG"
 !ELSE
-MTL_PROJ=$(MTL_PROJ) /D "_DEBUG"
 RSC_PROJ=$(RSC_PROJ) /d "_DEBUG"
 !ENDIF
 BSC32_SBRS= \
diff --git a/win64.mak b/win64.mak
index 143916d..df5ff3d 100755
--- a/win64.mak
+++ b/win64.mak
@@ -116,10 +116,10 @@ ADD_DEFINES=$(ADD_DEFINES) /D RESET_CRYPTO_CALLBACKS
 !ENDIF
 !ENDIF
 !IF "$(USE_SSPI)" == "yes"
-VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:secur32.dll /Delayload:crypt32.dll
+VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:secur32.dll /DelayLoad:crypt32.dll
 !ENDIF
 !IF "$(USE_GSS)" == "yes"
-VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /Delayload:gssapi64.dll
+VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:gssapi64.dll
 !ENDIF
 VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:$(DTCDLL) /DELAY:UNLOAD
 !ENDIF
@@ -265,17 +265,13 @@ CPP_PROJ=$(CPP_PROJ) /Gm /ZI /Od /D "_DEBUG" /GZ
    $(CPP_PROJ) /c $<
 <<
 
-MTL=midl.exe
 RSC=rc.exe
 BSC32=bscmake.exe
-MTL_PROJ=/nologo /mktyplib203 /win32
 RSC_PROJ=/l 0x809 /fo"$(INTDIR)\psqlodbc.res"
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc"
 !IF  "$(CFG)" == "Release"
-MTL_PROJ=$(MTL_PROJ) /D "NDEBUG"
 RSC_PROJ=$(RSC_PROJ) /d "NDEBUG"
 !ELSE
-MTL_PROJ=$(MTL_PROJ) /D "_DEBUG"
 RSC_PROJ=$(RSC_PROJ) /d "_DEBUG"
 !ENDIF
 BSC32_SBRS= \
-- 
2.39.5