[Libreoffice-commits] .: solenv/inc
Jesús Corrius
jcorrius at kemper.freedesktop.org
Fri Nov 5 16:00:39 PDT 2010
solenv/inc/wntmsci11.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 01cc4e1b49dc910fbfa4376e0e786aafe86c4111
Author: Jesús Corrius <jesus at softcatala.org>
Date: Fri Nov 5 23:59:56 2010 +0100
Fix condition in MS C/C++ x64 patch
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
old mode 100644
new mode 100755
index 78c9d38..b9faf3a
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -88,7 +88,7 @@ CFLAGS+=-GS
CFLAGS+=-c -nologo -Gs $(NOLOGO)
-.IF "$(cl_x64)" != ""
+.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
@@ -228,7 +228,7 @@ _VC_MANIFEST_BASENAME=__VC80
_VC_MANIFEST_BASENAME=__VC90
.ENDIF
-.IF "$(cl_x64)" != ""
+.IF "$(cl_x64)" == ""
LINK=link /MACHINE:IX86
.ELSE
LINK=link /MACHINE:X64
@@ -242,7 +242,7 @@ LINKFLAGS=/MAP /OPT:NOREF
.ENDIF
# excetion handling protection
-.IF "$(cl_x64)" != ""
+.IF "$(cl_x64)" == ""
LINKFLAGS+=-safeseh
.ENDIF
@@ -342,7 +342,7 @@ LIBMGR=lib $(NOLOGO)
IMPLIB=lib
LIBFLAGS=
-.IF "$(cl_x64)" != ""
+.IF "$(cl_x64)" == ""
IMPLIBFLAGS=-machine:IX86
.ELSE
IMPLIBFLAGS=-machine:X64
More information about the Libreoffice-commits
mailing list