oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Update Windows build environment

Browse Source 
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.
This commit is contained in:
Asanka Herath
2010-05-26 12:16:14 -04:00
parent 3e2b840565
commit 0d17cbefee
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
windows/NTMakefile.w32
View File

@@ -53,6 +53,8 @@ SRC=$(MAKEDIR)
SRC=$(MAKEDIR)\.. SRC=$(MAKEDIR)\..
!elseif exist($(MAKEDIR)\..\..\windows\NTMakefile.w32) !elseif exist($(MAKEDIR)\..\..\windows\NTMakefile.w32)
SRC=$(MAKEDIR)\..\.. SRC=$(MAKEDIR)\..\..
!elseif exist($(MAKEDIR)\..\..\..\windows\NTMakefile.w32)
SRC=$(MAKEDIR)\..\..\..
!else !else
! error Cant determine source directory ! error Cant determine source directory
!endif !endif
@@ -62,8 +64,8 @@ SRC=$(MAKEDIR)\..\..
#---------------------------------------------------------------- #----------------------------------------------------------------
# Directory macros # Directory macros
DESTDIR=$(SRC)\out32\dest_$(OUTDIR) DESTDIR=$(SRC)\out\dest_$(OUTDIR)
OBJDIR =$(SRC)\out32\obj_$(OUTDIR) OBJDIR =$(SRC)\out\obj_$(OUTDIR)
INCDIR =$(DESTDIR)\inc INCDIR =$(DESTDIR)\inc
LIBDIR =$(DESTDIR)\lib LIBDIR =$(DESTDIR)\lib
@@ -146,7 +148,7 @@ pthreadinc= -I$(PTHREAD_INC)
cincdirs=$(cincdirs) -I$(INCDIR) -I$(INCDIR)\krb5 $(pthreadinc) cincdirs=$(cincdirs) -I$(INCDIR) -I$(INCDIR)\krb5 $(pthreadinc)
cdefines=$(cdefines) -DHAVE_CONFIG_H 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" !if "$(CPU)"=="i386"
libmach=/machine:X86 libmach=/machine:X86