[Libreoffice-commits] .: solenv/inc

[Jesús Corrius]

 solenv/inc/wntmsci11.mk |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 2668c46631c0a6661e841c807304d2e7dd3e9747
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Fri Nov 5 15:04:24 2010 +0100

    Add MS C/C++ compiler specific settings for x64

diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 1cbe41a..78c9d38 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -88,7 +88,11 @@ CFLAGS+=-GS
 
 CFLAGS+=-c -nologo -Gs $(NOLOGO)
 
+.IF "$(cl_x64)" != ""
 CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+.ELSE
+CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+.ENDIF
 
 .IF "$(product)" != ""
 CFLAGS+= -Gy
@@ -224,7 +228,11 @@ _VC_MANIFEST_BASENAME=__VC80
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
+.IF "$(cl_x64)" != ""
 LINK=link /MACHINE:IX86
+.ELSE
+LINK=link /MACHINE:X64
+.ENDIF
     # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with
     # a return value 1, which makes dmake think it failed
 LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
@@ -234,7 +242,9 @@ LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
 
 # excetion handling protection
+.IF "$(cl_x64)" != ""
 LINKFLAGS+=-safeseh
+.ENDIF
 
 # enable DEP
 LINKFLAGS+=-nxcompat
@@ -332,7 +342,11 @@ LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
 LIBFLAGS=
 
+.IF "$(cl_x64)" != ""
 IMPLIBFLAGS=-machine:IX86
+.ELSE
+IMPLIBFLAGS=-machine:X64
+.ENDIF
 
 MAPSYM=
 MAPSYMFLAGS=