openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1825935 - /openoffice/trunk/main/solenv/inc/wntmscx.mk
Date Mon, 05 Mar 2018 20:03:34 GMT
Author: damjan
Date: Mon Mar  5 20:03:33 2018
New Revision: 1825935

URL: http://svn.apache.org/viewvc?rev=1825935&view=rev
Log:
Add a preliminary version of the main Win64 dmake file,
but don't use it yet.

Patch by: me


Added:
    openoffice/trunk/main/solenv/inc/wntmscx.mk
      - copied, changed from r1825802, openoffice/trunk/main/solenv/inc/wntmsci11.mk

Copied: openoffice/trunk/main/solenv/inc/wntmscx.mk (from r1825802, openoffice/trunk/main/solenv/inc/wntmsci11.mk)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/wntmscx.mk?p2=openoffice/trunk/main/solenv/inc/wntmscx.mk&p1=openoffice/trunk/main/solenv/inc/wntmsci11.mk&r1=1825802&r2=1825935&rev=1825935&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/trunk/main/solenv/inc/wntmscx.mk Mon Mar  5 20:03:33 2018
@@ -21,16 +21,16 @@
 
 
 
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSCI11 and WNTMSCI12
+# mk file for $(OS)$(COM)$(CPU) == WNTMSCX
 
 SOLAR_JAVA*=TRUE
 FULL_DESK=TRUE
 JAVAFLAGSDEBUG=-g
 
-# SOLAR JAva Unterstuetzung nur fuer wntmsci
+# SOLAR JAva Unterstuetzung nur fuer wntmscx
 
 ASM=ml
-AFLAGS=/c /Cp /coff /safeseh
+AFLAGS=/c /Cp /coff
 
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
@@ -84,7 +84,7 @@ CFLAGS+=-GS
 
 CFLAGS+=-c -nologo -Gs $(NOLOGO)
 
-CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 
 .IF "$(product)" != ""
 CFLAGS+= -Gy
@@ -225,7 +225,7 @@ _VC_MANIFEST_BASENAME=__VC80
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
-LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197
+LINK=link /MACHINE:X64 /IGNORE:4102 /IGNORE:4197
     # 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
 .IF "$(PRODUCT)"!="full"
@@ -233,8 +233,7 @@ LINK=link /MACHINE:IX86 /IGNORE:4102 /IG
 LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
 
-# excetion handling protection
-LINKFLAGS+=-safeseh
+# excetion handling protection isn't used on Win64
 
 # enable DEP
 LINKFLAGS+=-nxcompat
@@ -257,12 +256,12 @@ MAPFILE=-out:$$@
 .ENDIF # "$(linkinc)" != ""
 
 .IF "$(bndchk)" != ""
-LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
+LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:X64
 LINKFLAGS=-NODEFAULTLIB -DEBUG
 .ENDIF
 
 .IF "$(truetime)" != ""
-LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
+LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:X64
 LINKFLAGS=-NODEFAULTLIB -DEBUG
 .ENDIF
 
@@ -347,7 +346,7 @@ LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
 LIBFLAGS=
 
-IMPLIBFLAGS=-machine:IX86
+IMPLIBFLAGS=-machine:X64
 
 MAPSYM=
 MAPSYMFLAGS=



Mime
View raw message