diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-28 13:21:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-29 08:16:31 +0300 |
| commit | 4671e25d99bb2ad0f4f8f68c25fcc1bfce9e79b8 (patch) | |
| tree | d24cb643497867e9ac2b5057e2d6c9e145e209bf /solenv | |
| parent | 0919d45d514642ed6cc62fe20227a99295a09d40 (diff) | |
No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine
Change-Id: I59f4d5ad275af62c997723908754112c062a31be
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/wntmsc.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 4e8b7bea18c3..ef6e58978020 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -29,7 +29,7 @@ JAVAFLAGSDEBUG=-g -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" ASM=ml AFLAGS=/c /Cp /coff /safeseh .ELSE @@ -89,7 +89,7 @@ CFLAGS+=-GS CFLAGS+=-c -nologo -Gs $(NOLOGO) -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS .ELSE CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS @@ -119,7 +119,7 @@ CFLAGS+= -Z7 CFLAGSEXCEPTIONS=-EHa CFLAGS_NO_EXCEPTIONS= -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" # enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL .ENDIF @@ -204,7 +204,7 @@ _VC_MANIFEST_BASENAME=__VC80 _VC_MANIFEST_BASENAME=__VC90 .ENDIF -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197 .ELSE LINK=link /MACHINE:X64 @@ -217,7 +217,7 @@ LINKFLAGS=/MAP /OPT:NOREF .ENDIF # excetion handling protection -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" LINKFLAGS+=-safeseh .ENDIF @@ -301,7 +301,7 @@ LIBMGR=lib $(NOLOGO) IMPLIB=lib LIBFLAGS= -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" IMPLIBFLAGS=-machine:IX86 .ELSE IMPLIBFLAGS=-machine:X64 |