From 0d17cbefee4c0adeb55e02764f077f21f84766d8 Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Wed, 26 May 2010 12:16:14 -0400
Subject: [PATCH] Update Windows build environment

We are building both 32-bit and 64-bit binaries.  The output directory
is no longer called out32.  Instead it's just called 'out'.  Also
support deeper directories.
---
 windows/NTMakefile.w32 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index 3da293f7f..cab7e805a 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -53,6 +53,8 @@ SRC=$(MAKEDIR)
 SRC=$(MAKEDIR)\..
 !elseif exist($(MAKEDIR)\..\..\windows\NTMakefile.w32)
 SRC=$(MAKEDIR)\..\..
+!elseif exist($(MAKEDIR)\..\..\..\windows\NTMakefile.w32)
+SRC=$(MAKEDIR)\..\..\..
 !else
 !  error Cant determine source directory
 !endif
@@ -62,8 +64,8 @@ SRC=$(MAKEDIR)\..\..
 #----------------------------------------------------------------
 # Directory macros
 
-DESTDIR=$(SRC)\out32\dest_$(OUTDIR)
-OBJDIR =$(SRC)\out32\obj_$(OUTDIR)
+DESTDIR=$(SRC)\out\dest_$(OUTDIR)
+OBJDIR =$(SRC)\out\obj_$(OUTDIR)
 
 INCDIR =$(DESTDIR)\inc
 LIBDIR =$(DESTDIR)\lib
@@ -146,7 +148,7 @@ pthreadinc= -I$(PTHREAD_INC)
 
 cincdirs=$(cincdirs) -I$(INCDIR) -I$(INCDIR)\krb5 $(pthreadinc)
 cdefines=$(cdefines) -DHAVE_CONFIG_H
-cwarn=$(cwarn) -D_CRT_SECURE_NO_WARNINGS -wd4996
+cwarn=$(cwarn) -D_CRT_SECURE_NO_WARNINGS -wd4996 -wd4127 -wd4244 -wd4100
 
 !if "$(CPU)"=="i386"
 libmach=/machine:X86