[Libreoffice-commits] .: 4 commits - configure.in set_soenv.in solenv/inc stlport/STLport-4.5-0119.patch
Tor Lillqvist
tml at kemper.freedesktop.org
Sun Jan 16 11:11:09 PST 2011
configure.in | 41 ++--
set_soenv.in | 107 ++++-------
solenv/inc/settings.mk | 12 -
solenv/inc/tg_compv.mk | 4
solenv/inc/wnt.mk | 13 -
solenv/inc/wntmsc.mk | 384 +++++++++++++++++++++++++++++++++++++++
solenv/inc/wntmsci10.mk | 335 ----------------------------------
solenv/inc/wntmsci11.mk | 397 -----------------------------------------
stlport/STLport-4.5-0119.patch | 22 ++
9 files changed, 482 insertions(+), 833 deletions(-)
New commits:
commit eed506911ae8c34fd561f4a068782f06d4f2c500
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Jan 16 21:04:44 2011 +0200
Just use name wntmsc.mk for the MSVC .mk file
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index 4635fc1..8b65c5f 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -31,8 +31,9 @@
# --- Compiler ---
.IF "$(OS)$(COM)" == "WNTMSC"
-# for wntmsci12 (MSVC 2005) and wntmsci13 (MSVC 2010), 32- and 64-bit
-.INCLUDE : wntmsci11.mk
+# for wntmsci12, wntmscx12, wntmsci13 and wntmscx13
+# (MSVC 2008 and MSVC 2010, 32- and 64-bit)
+.INCLUDE : wntmsc.mk
.ENDIF # "$(OS)$(COM)" == "WNTMSC"
.IF "$(COM)$(OS)$(CPU)" == "GCCWNTI"
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
new file mode 100644
index 0000000..12e7ae9
--- /dev/null
+++ b/solenv/inc/wntmsc.mk
@@ -0,0 +1,384 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
+
+SOLAR_JAVA*=TRUE
+FULL_DESK=TRUE
+JAVAFLAGSDEBUG=-g
+
+# SOLAR JAva Unterstuetzung nur fuer wntmsci
+
+ASM=ml
+AFLAGS=/c /Cp /coff /safeseh
+
+# 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
+ARCH_FLAGS*=
+
+CC*:=cl
+.IF "$(bndchk)" != ""
+CXX*=nmcl
+.ELSE
+.IF "$(truetime)" != ""
+CXX*=nmcl /NMttOn
+.ELSE
+CXX*:=cl
+.ENDIF
+.ENDIF # "$(bndchk)" != ""
+
+.IF "$(stoponerror)" != ""
+CXX+= /NMstoponerror
+.ENDIF
+
+.IF "$(nmpass)" != ""
+CXX+= /NMpass
+.ENDIF
+
+.IF "$(ttinlines)" != ""
+CXX+= /NMttInlines
+.ENDIF
+
+.IF "$(ttnolines)" != ""
+CXX+= /NMttNoLines
+.ENDIF
+
+.IF "$(VERBOSE)" != "TRUE"
+NOLOGO*=-nologo
+.ENDIF
+
+.IF "$(VERBOSE)" != "TRUE"
+COMPILE_ECHO_SWITCH=-n
+COMPILE_ECHO_FILE=
+.ENDIF
+
+# Flags for COMEX == 11
+
+# disable "warning C4675: resolved overload was found by argument-dependent
+# lookup":
+# -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
+CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
+
+# Stack buffer overrun detection.
+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
+.ENDIF # "$(product)" != ""
+
+# flags to enable build with symbols; required for crashdump feature
+#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
+CFLAGSENABLESYMBOLS=-Z7 -Yd
+
+.IF "$(bndchk)" != ""
+.IF "$(debug)" == ""
+CFLAGS+= -Z7
+.ENDIF
+.ENDIF
+
+.IF "$(truetime)" != ""
+.IF "$(debug)" == ""
+CFLAGS+= -Z7
+.ENDIF
+.ENDIF
+
+.IF "$(FULL_DESK)"!=""
+CDEFS+=-DFULL_DESK
+RSCDEFS+=-DFULL_DESK
+.ENDIF
+
+CFLAGSEXCEPTIONS=-EHa
+CFLAGS_NO_EXCEPTIONS=
+
+# enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods
+CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
+
+# with the current debug switches PCH won't work
+# anyway. so keep the existing .pch intact and don't
+# touch it
+.IF "$(debug)"!=""
+ENABLE_PCH:=
+.ENDIF "$(debug)"!=""
+
+CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
+.IF "$(CALL_CDECL)"=="TRUE"
+CFLAGSCALL=-Gd
+.ELSE # "$(CALL_CDECL)"=="TRUE"
+CFLAGSCALL=-Gz
+.ENDIF # "$(CALL_CDECL)"=="TRUE"
+
+CFLAGSCC=$(ARCH_FLAGS)
+.IF "$(DYNAMIC_CRT)"!=""
+CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
+CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
+.IF "$(NO_DYNAMIC_OBJ)"==""
+CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
+CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
+.ELSE
+CDEFSOBJMT+=-DWIN32 -D_MT
+CDEFSOBJMT+=-DWIN32 -D_MT
+.ENDIF # "$(NO_DYNAMIC_OBJ)"==""
+.ELSE
+CDEFSSLOMT+=-DWIN32 -D_MT
+CDEFSSLOMT+=-DWIN32 -D_MT
+CDEFSOBJMT+=-DWIN32 -D_MT
+CDEFSOBJMT+=-DWIN32 -D_MT
+.ENDIF # "$(DYNAMIC_CRT)"!=""
+
+CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
+CFLAGSDEBUG=-Zi -Fd$(MISC)/$(@:b).pdb
+CFLAGSDBGUTIL=
+.IF "$(VC_STANDARD)"==""
+CFLAGSOPT=-Oxs -Oy-
+CFLAGSNOOPT=-Od
+.ELSE # "$(VC_STANDARD)"==""
+CFLAGSOPT=
+CFLAGSNOOPT=
+.ENDIF # "$(VC_STANDARD)"==""
+CFLAGSOUTOBJ=-Fo
+
+# For C and C++, certain warnings are disabled globally, as they result in
+# spurious warnings and are hard or impossible to workaround:
+# - "warning C4061: enumerate in switch of enum is not explicitly handled by a
+# case label",
+# - "warning C4127: conditional expression is constant",
+# - "warning C4191: unsafe conversion from function type to function type",
+# - "warning C4217: member template functions cannot be used for copy-assignment
+# or copy-construction",
+# - "warning C4250: 'class1' : inherits 'class2::member' via dominance",
+# - "warning C4355: 'this' used in base member initializer list",
+# - "warning C4511: copy constructor could not be generated",
+# - "warning C4512: assignment operator could not be generated",
+# - "warning C4514: unreferenced inline function has been removed",
+# - "warning C4611: interaction between '_setjmp' and C++ object destruction is
+# non-portable",
+# - "warning C4625: copy constructor could not be generated because a base class
+# copy constructor is inaccessible",
+# - "warning C4626: assignment operator could not be generated because a base
+# class assignment operator is inaccessible",
+# - "warning C4675: resolved overload was found by argument-dependent lookup",
+# - "warning C4710: function not inlined",
+# - "warning C4711: function selected for automatic inline expansion",
+# - "warning C4820: padding added after member".
+# - "warning C4503: 'identifier' : decorated name length exceeded, name was truncated"
+# (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx)
+# - "warning C4180: qualifier applied to function type has no meaning; ignored"
+# (frequently seen with a recent boost)
+# For C, certain warnings from system headers (stdlib.h etc.) have to be
+# disabled globally (for C++, this is not necessary, as the system headers are
+# wrapped by STLport):
+# - "warning C4255: no function prototype given: converting
+# '()' to '(void)'".
+# - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
+
+CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -wd4275 \
+ -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
+ -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
+ -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
+ -wd4180
+CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
+CFLAGSWALLCC=$(CFLAGSWARNCC)
+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
+CFLAGSWERRCC=-WX
+
+# Once all modules on this platform compile without warnings, set
+# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
+# settings.mk):
+MODULES_WITH_WARNINGS :=
+
+CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
+.IF "$(COMEX)" == "11"
+_VC_MANIFEST_BASENAME=__VC80
+.ELSE
+_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:"
+.IF "$(PRODUCT)"!="full"
+.ELSE
+LINKFLAGS=/MAP /OPT:NOREF
+.ENDIF
+
+# excetion handling protection
+.IF "$(CL_X64)" == ""
+LINKFLAGS+=-safeseh
+.ENDIF
+
+# enable DEP
+LINKFLAGS+=-nxcompat
+
+# enable ASLR
+LINKFLAGS+=-dynamicbase
+
+.IF "$(linkinc)" != ""
+LINKFLAGS+=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
+MAPFILE=
+_VC_MANIFEST_INC=1
+.ELSE # "$(linkinc)" != ""
+_VC_MANIFEST_INC=0
+.IF "$(PRODUCT)"!="full"
+LINKFLAGS+= -NODEFAULTLIB -DEBUG
+.ELSE # "$(PRODUCT)"!="full"
+LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
+.ENDIF # "$(PRODUCT)"!="full"
+MAPFILE=-out:$$@
+.ENDIF # "$(linkinc)" != ""
+
+.IF "$(bndchk)" != ""
+LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
+LINKFLAGS=-NODEFAULTLIB -DEBUG
+.ENDIF
+
+.IF "$(truetime)" != ""
+LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
+LINKFLAGS=-NODEFAULTLIB -DEBUG
+.ENDIF
+
+.IF "$(COMEX)" == "11"
+LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS,4.0
+LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS,4.0 /DLL
+.ELSE
+LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS
+LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS /DLL
+.ENDIF # "$(COMEX)" == "11"
+LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000
+LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
+LINKFLAGSTACK=/STACK:
+LINKFLAGSPROF=/DEBUG:mapped,partial /DEBUGTYPE:coff cap.lib
+LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB
+LINKFLAGSDEBUG=-DEBUG
+LINKFLAGSOPT=
+
+UWINAPILIB*=uwinapi.lib
+.IF "$(DYNAMIC_CRT)"!=""
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBCMT=msvcrtd.lib
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBCMT=msvcrt.lib
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ELSE # "$(DYNAMIC_CRT)"!=""
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBCMT=libcmtd.lib
+CDEFS+=-D_DEBUG
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBCMT=libcmt.lib
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(DYNAMIC_CRT)"!=""
+
+STDOBJVCL=$(L)/salmain.obj
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=stlport_vc71_stldebug.lib
+LIBSTLPORTST=stlport_vc71_stldebug_static.lib
+.ELSE
+LIBSTLPORT=stlport_vc71.lib
+LIBSTLPORTST=stlport_vc71_static.lib
+.ENDIF
+
+LIBMGR=lib $(NOLOGO)
+IMPLIB=lib
+LIBFLAGS=
+
+.IF "$(CL_X64)" == ""
+IMPLIBFLAGS=-machine:IX86
+.ELSE
+IMPLIBFLAGS=-machine:X64
+.ENDIF
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=rc
+RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
+RCLINK=rc
+RCLINKFLAGS=
+RCSETVERSION=
+
+MT=mt.exe
+MTFLAGS=$(NOLOGO)
+
+
+DLLPOSTFIX=mi
+PCHPOST=.pch
+
+CSC*=$(FLIPCMD) csc
+VBC*=vbc
+
+ADVAPI32LIB=advapi32.lib
+SHELL32LIB=shell32.lib
+GDI32LIB=gdi32.lib
+OLE32LIB=ole32.lib
+OLEAUT32LIB=oleaut32.lib
+UUIDLIB=uuid.lib
+WINSPOOLLIB=winspool.lib
+IMM32LIB=imm32.lib
+VERSIONLIB=version.lib
+WINMMLIB=winmm.lib
+WSOCK32LIB=wsock32.lib
+MPRLIB=mpr.lib
+WS2_32LIB=ws2_32.lib
+KERNEL32LIB=kernel32.lib
+USER32LIB=user32.lib
+COMDLG32LIB=comdlg32.lib
+COMCTL32LIB=comctl32.lib
+CRYPT32LIB=crypt32.lib
+GDIPLUSLIB=gdiplus.lib
+DBGHELPLIB=dbghelp.lib
+MSILIB=msi.lib
+DDRAWLIB=ddraw.lib
+SHLWAPILIB=shlwapi.lib
+URLMONLIB=urlmon.lib
+WININETLIB=wininet.lib
+OLDNAMESLIB=oldnames.lib
+MSIMG32LIB=msimg32.lib
+PROPSYSLIB=propsys.lib
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
deleted file mode 100755
index 991a8f7..0000000
--- a/solenv/inc/wntmsci10.mk
+++ /dev/null
@@ -1,335 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSCI10
-
-SOLAR_JAVA*=TRUE
-FULL_DESK=TRUE
-JAVAFLAGSDEBUG=-g
-
-# SOLAR JAva Unterstuetzung nur fuer wntmsci
-
-ASM=ml
-AFLAGS=/c /Cp /coff /safeseh
-
-# 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
-ARCH_FLAGS*=
-
-CC*:=cl
-.IF "$(bndchk)" != ""
-CXX*=nmcl
-.ELSE
-.IF "$(truetime)" != ""
-CXX*=nmcl /NMttOn
-.ELSE
-CXX*:=cl
-.ENDIF
-.ENDIF # "$(bndchk)" != ""
-
-.IF "$(stoponerror)" != ""
-CXX+= /NMstoponerror
-.ENDIF
-
-.IF "$(nmpass)" != ""
-CXX+= /NMpass
-.ENDIF
-
-.IF "$(ttinlines)" != ""
-CXX+= /NMttInlines
-.ENDIF
-
-.IF "$(ttnolines)" != ""
-CXX+= /NMttNoLines
-.ENDIF
-
-# Flags for COMEX == 10
-
-CFLAGS+=-Zm500 -Zc:forScope -GR
-CFLAGS+=-c -nologo -Gs $(NOLOGO)
-
-CDEFS+= -D_X86_=1
-
-.IF "$(product)" != ""
-CFLAGS+= -Gy
-.ENDIF # "$(product)" != ""
-
-# flags to enable build with symbols; required for crashdump feature
-#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
-# full debug for RE builds only due to size concerns
-.IF "$(UPDATER)"!=""
-CFLAGSENABLESYMBOLS=-Z7 -Yd
-.ELSE # "$(UPDATER)"!=""
-# -Zd got higher priority and overrides debug switches
-.IF "$(debug)"==""
-CFLAGSENABLESYMBOLS=-Zd
-.ENDIF # "$(debug)"==""
-.ENDIF # "$(UPDATER)"!=""
-
-.IF "$(bndchk)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-.IF "$(truetime)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-.IF "$(FULL_DESK)"!=""
-CDEFS+=-DFULL_DESK
-RSCDEFS+=-DFULL_DESK
-.ENDIF
-
-CFLAGSEXCEPTIONS=-GX
-CFLAGS_NO_EXCEPTIONS=
-
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-.IF "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gd
-.ELSE # "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gz
-.ENDIF # "$(CALL_CDECL)"=="TRUE"
-
-CFLAGSCC=$(ARCH_FLAGS)
-.IF "$(DYNAMIC_CRT)"!=""
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-.IF "$(NO_DYNAMIC_OBJ)"==""
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-.ELSE
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF
-.ELSE
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF
-CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
-CFLAGSDEBUG=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
-CFLAGSDBGUTIL=
-.IF "$(VC_STANDARD)"==""
-CFLAGSOPT=-Oxs -Oy-
-CFLAGSNOOPT=-Od
-.ELSE # "$(VC_STANDARD)"==""
-CFLAGSOPT=
-CFLAGSNOOPT=
-.ENDIF # "$(VC_STANDARD)"==""
-CFLAGSOUTOBJ=-Fo
-
-# For C and C++, certain warnings are disabled globally, as they result in
-# spurious warnings and are hard or impossible to workaround:
-# - "warning C4061: enumerate in switch of enum is not explicitly handled by a
-# case label",
-# - "warning C4063: case 'identifier' is not a valid value for switch of enum
-# 'enumeration'",
-# - "warning C4127: conditional expression is constant",
-# - "warning C4191: unsafe conversion from function type to function type",
-# - "warning C4217: member template functions cannot be used for copy-assignment
-# or copy-construction",
-# - "warning C4250: 'class1' : inherits 'class2::member' via dominance",
-# - "warning C4292: compiler limit : terminating debug information emission",
-# - "warning C4344: behavior change: use of explicit template arguments results
-# in call to 'function",
-# - "warning C4347: behavior change: 'overload A' is called instead of
-# 'overload B'",
-# - "warning C4355: 'this' used in base member initializer list",
-# - "warning C4503: 'identifier': decorated name length exceeded, name was
-# truncated" (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx),
-# - "warning C4511: copy constructor could not be generated",
-# - "warning C4512: assignment operator could not be generated",
-# - "warning C4514: unreferenced inline function has been removed",
-# - "warning C4611: interaction between '_setjmp' and C++ object destruction is
-# non-portable",
-# - "warning C4619: warning Cnnnn unknown",
-# - "warning C4625: copy constructor could not be generated because a base class
-# copy constructor is inaccessible",
-# - "warning C4626: assignment operator could not be generated because a base
-# class assignment operator is inaccessible",
-# - "warning C4675: resolved overload was found by argument-dependent lookup",
-# - "warning C4686: possible change in behavior, change in UDT return calling
-# convention",
-# - "warning C4710: function not inlined",
-# - "warning C4711: function selected for automatic inline expansion",
-# - "warning C4820: padding added after member".
-# For C, certain warnings from system headers (stdlib.h etc.) have to be
-# disabled globally (for C++, this is not necessary, as the system headers are
-# wrapped by STLport):
-# - "warning C4255: no function prototype given: converting '()' to '(void)'".
-CFLAGSWARNCXX=-Wall -wd4061 -wd4063 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 \
- -wd4275 -wd4290 -wd4292 -wd4294 -wd4344 -wd4347 -wd4355 -wd4503 -wd4511 \
- -wd4512 -wd4514 -wd4611 -wd4619 -wd4625 -wd4626 -wd4640 -wd4675 -wd4686 \
- -wd4710 -wd4711 -wd4786 -wd4800 -wd4820
-CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-WX
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
- lingucomponent
-
-CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
-
-COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_"
-
-LINK=link $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
-.IF "$(PRODUCT)"!="full"
-.ELSE
-LINKFLAGS=/MAP /OPT:NOREF
-.ENDIF
-
-.IF "$(linkinc)" != ""
-LINKFLAGS=-NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv -INCREMENTAL:YES
-MAPFILE=
-.ELSE # "$(linkinc)" != ""
-.IF "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv
-.ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG:full
-.ENDIF # "$(PRODUCT)"!="full"
-MAPFILE=-out:$$@
-.ENDIF # "$(linkinc)" != ""
-
-.IF "$(bndchk)" != ""
-LINK=nmlink $(COMMENTFLAG) $(NOLOGO) -MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv
-.ENDIF
-
-.IF "$(truetime)" != ""
-LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=/NODEFAULTLIB /DEBUG:full /DEBUGTYPE:cv
-.ENDIF
-
-LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS,4.0
-LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS,4.0 /DLL
-LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000
-LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
-LINKFLAGSTACK=/STACK:
-LINKFLAGSPROF=-DEBUG:mapped,partial -DEBUGTYPE:coff cap.lib
-LINKFLAGSWST=-DEBUG:mapped,partial -DEBUGTYPE:coff wst.lib -NODEFAULTLIB
-LINKFLAGSDEBUG=-DEBUG:full -DEBUGTYPE:cv
-LINKFLAGSOPT=
-
-UWINAPILIB*=uwinapi.lib
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrtd.lib
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
-
-.IF "$(USE_STLP_DEBUG)" != ""
-CFLAGS+=-MTd
-LIBSTLPORT=stlport_vc71_stldebug.lib
-LIBSTLPORTST=stlport_vc71_stldebug_static.lib
-.ELSE
-LIBSTLPORT=stlport_vc71.lib
-LIBSTLPORTST=stlport_vc71_static.lib
-.ENDIF
-
-ATL_INCLUDE*=$(COMPATH)/atlmfc/include
-ATL_LIB*=$(COMPATH)/atlmfc/lib
-
-LIBMGR=lib $(NOLOGO)
-IMPLIB=lib
-LIBFLAGS=
-
-IMPLIBFLAGS=-machine:IX86
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=rc
-RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
-RCLINK=rc
-RCLINKFLAGS=
-RCSETVERSION=
-
-
-DLLPOSTFIX=mi
-PCHPOST=.pch
-
-CSC*=$(FLIPCMD) csc
-VBC*=vbc
-
-ADVAPI32LIB=advapi32.lib
-SHELL32LIB=shell32.lib
-GDI32LIB=gdi32.lib
-OLE32LIB=ole32.lib
-OLEAUT32LIB=oleaut32.lib
-UUIDLIB=uuid.lib
-WINSPOOLLIB=winspool.lib
-IMM32LIB=imm32.lib
-VERSIONLIB=version.lib
-WINMMLIB=winmm.lib
-WSOCK32LIB=wsock32.lib
-MPRLIB=mpr.lib
-WS2_32LIB=ws2_32.lib
-KERNEL32LIB=kernel32.lib
-USER32LIB=user32.lib
-COMDLG32LIB=comdlg32.lib
-COMCTL32LIB=comctl32.lib
-CRYPT32LIB=crypt32.lib
-GDIPLUSLIB=gdiplus.lib
-DBGHELPLIB=dbghelp.lib
-MSILIB=msi.lib
-DDRAWLIB=ddraw.lib
-SHLWAPILIB=shlwapi.lib
-URLMONLIB=urlmon.lib
-WININETLIB=wininet.lib
-OLDNAMESLIB=oldnames.lib
-MSIMG32LIB=msimg32.lib
-
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
deleted file mode 100755
index fbeba1a..0000000
--- a/solenv/inc/wntmsci11.mk
+++ /dev/null
@@ -1,387 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
-# yes, despite the "11" in this file name, note that we don't actually
-# support the WNTMSCI11 (MSVC 2005) compiler any more
-
-SOLAR_JAVA*=TRUE
-FULL_DESK=TRUE
-JAVAFLAGSDEBUG=-g
-
-# SOLAR JAva Unterstuetzung nur fuer wntmsci
-
-ASM=ml
-AFLAGS=/c /Cp /coff /safeseh
-
-# 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
-ARCH_FLAGS*=
-
-CC*:=cl
-.IF "$(bndchk)" != ""
-CXX*=nmcl
-.ELSE
-.IF "$(truetime)" != ""
-CXX*=nmcl /NMttOn
-.ELSE
-CXX*:=cl
-.ENDIF
-.ENDIF # "$(bndchk)" != ""
-
-.IF "$(stoponerror)" != ""
-CXX+= /NMstoponerror
-.ENDIF
-
-.IF "$(nmpass)" != ""
-CXX+= /NMpass
-.ENDIF
-
-.IF "$(ttinlines)" != ""
-CXX+= /NMttInlines
-.ENDIF
-
-.IF "$(ttnolines)" != ""
-CXX+= /NMttNoLines
-.ENDIF
-
-.IF "$(VERBOSE)" != "TRUE"
-NOLOGO*=-nologo
-.ENDIF
-
-.IF "$(VERBOSE)" != "TRUE"
-COMPILE_ECHO_SWITCH=-n
-COMPILE_ECHO_FILE=
-.ENDIF
-
-# Flags for COMEX == 11
-
-# disable "warning C4675: resolved overload was found by argument-dependent
-# lookup":
-# -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
-CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
-
-# Stack buffer overrun detection.
-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
-.ENDIF # "$(product)" != ""
-
-# flags to enable build with symbols; required for crashdump feature
-#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
-CFLAGSENABLESYMBOLS=-Z7 -Yd
-
-.IF "$(bndchk)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-.IF "$(truetime)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-.IF "$(FULL_DESK)"!=""
-CDEFS+=-DFULL_DESK
-RSCDEFS+=-DFULL_DESK
-.ENDIF
-
-CFLAGSEXCEPTIONS=-EHa
-CFLAGS_NO_EXCEPTIONS=
-
-# enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods
-CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
-
-# with the current debug switches PCH won't work
-# anyway. so keep the existing .pch intact and don't
-# touch it
-.IF "$(debug)"!=""
-ENABLE_PCH:=
-.ENDIF "$(debug)"!=""
-
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-.IF "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gd
-.ELSE # "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gz
-.ENDIF # "$(CALL_CDECL)"=="TRUE"
-
-CFLAGSCC=$(ARCH_FLAGS)
-.IF "$(DYNAMIC_CRT)"!=""
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-.IF "$(NO_DYNAMIC_OBJ)"==""
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-.ELSE
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF # "$(NO_DYNAMIC_OBJ)"==""
-.ELSE
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
-CFLAGSDEBUG=-Zi -Fd$(MISC)/$(@:b).pdb
-CFLAGSDBGUTIL=
-.IF "$(VC_STANDARD)"==""
-CFLAGSOPT=-Oxs -Oy-
-CFLAGSNOOPT=-Od
-.ELSE # "$(VC_STANDARD)"==""
-CFLAGSOPT=
-CFLAGSNOOPT=
-.ENDIF # "$(VC_STANDARD)"==""
-CFLAGSOUTOBJ=-Fo
-
-# For C and C++, certain warnings are disabled globally, as they result in
-# spurious warnings and are hard or impossible to workaround:
-# - "warning C4061: enumerate in switch of enum is not explicitly handled by a
-# case label",
-# - "warning C4127: conditional expression is constant",
-# - "warning C4191: unsafe conversion from function type to function type",
-# - "warning C4217: member template functions cannot be used for copy-assignment
-# or copy-construction",
-# - "warning C4250: 'class1' : inherits 'class2::member' via dominance",
-# - "warning C4355: 'this' used in base member initializer list",
-# - "warning C4511: copy constructor could not be generated",
-# - "warning C4512: assignment operator could not be generated",
-# - "warning C4514: unreferenced inline function has been removed",
-# - "warning C4611: interaction between '_setjmp' and C++ object destruction is
-# non-portable",
-# - "warning C4625: copy constructor could not be generated because a base class
-# copy constructor is inaccessible",
-# - "warning C4626: assignment operator could not be generated because a base
-# class assignment operator is inaccessible",
-# - "warning C4675: resolved overload was found by argument-dependent lookup",
-# - "warning C4710: function not inlined",
-# - "warning C4711: function selected for automatic inline expansion",
-# - "warning C4820: padding added after member".
-# - "warning C4503: 'identifier' : decorated name length exceeded, name was truncated"
-# (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx)
-# - "warning C4180: qualifier applied to function type has no meaning; ignored"
-# (frequently seen with a recent boost)
-# For C, certain warnings from system headers (stdlib.h etc.) have to be
-# disabled globally (for C++, this is not necessary, as the system headers are
-# wrapped by STLport):
-# - "warning C4255: no function prototype given: converting
-# '()' to '(void)'".
-# - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
-
-CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -wd4275 \
- -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
- -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
- -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
- -wd4180
-CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-WX
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS :=
-
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
-.IF "$(COMEX)" == "11"
-_VC_MANIFEST_BASENAME=__VC80
-.ELSE
-_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:"
-.IF "$(PRODUCT)"!="full"
-.ELSE
-LINKFLAGS=/MAP /OPT:NOREF
-.ENDIF
-
-# excetion handling protection
-.IF "$(CL_X64)" == ""
-LINKFLAGS+=-safeseh
-.ENDIF
-
-# enable DEP
-LINKFLAGS+=-nxcompat
-
-# enable ASLR
-LINKFLAGS+=-dynamicbase
-
-.IF "$(linkinc)" != ""
-LINKFLAGS+=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
-MAPFILE=
-_VC_MANIFEST_INC=1
-.ELSE # "$(linkinc)" != ""
-_VC_MANIFEST_INC=0
-.IF "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -DEBUG
-.ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
-.ENDIF # "$(PRODUCT)"!="full"
-MAPFILE=-out:$$@
-.ENDIF # "$(linkinc)" != ""
-
-.IF "$(bndchk)" != ""
-LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG
-.ENDIF
-
-.IF "$(truetime)" != ""
-LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG
-.ENDIF
-
-.IF "$(COMEX)" == "11"
-LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS,4.0
-LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS,4.0 /DLL
-.ELSE
-LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS
-LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS /DLL
-.ENDIF # "$(COMEX)" == "11"
-LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000
-LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
-LINKFLAGSTACK=/STACK:
-LINKFLAGSPROF=/DEBUG:mapped,partial /DEBUGTYPE:coff cap.lib
-LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB
-LINKFLAGSDEBUG=-DEBUG
-LINKFLAGSOPT=
-
-UWINAPILIB*=uwinapi.lib
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrtd.lib
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
-CDEFS+=-D_DEBUG
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=stlport_vc71_stldebug.lib
-LIBSTLPORTST=stlport_vc71_stldebug_static.lib
-.ELSE
-LIBSTLPORT=stlport_vc71.lib
-LIBSTLPORTST=stlport_vc71_static.lib
-.ENDIF
-
-LIBMGR=lib $(NOLOGO)
-IMPLIB=lib
-LIBFLAGS=
-
-.IF "$(CL_X64)" == ""
-IMPLIBFLAGS=-machine:IX86
-.ELSE
-IMPLIBFLAGS=-machine:X64
-.ENDIF
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=rc
-RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
-RCLINK=rc
-RCLINKFLAGS=
-RCSETVERSION=
-
-MT=mt.exe
-MTFLAGS=$(NOLOGO)
-
-
-DLLPOSTFIX=mi
-PCHPOST=.pch
-
-CSC*=$(FLIPCMD) csc
-VBC*=vbc
-
-ADVAPI32LIB=advapi32.lib
-SHELL32LIB=shell32.lib
-GDI32LIB=gdi32.lib
-OLE32LIB=ole32.lib
-OLEAUT32LIB=oleaut32.lib
-UUIDLIB=uuid.lib
-WINSPOOLLIB=winspool.lib
-IMM32LIB=imm32.lib
-VERSIONLIB=version.lib
-WINMMLIB=winmm.lib
-WSOCK32LIB=wsock32.lib
-MPRLIB=mpr.lib
-WS2_32LIB=ws2_32.lib
-KERNEL32LIB=kernel32.lib
-USER32LIB=user32.lib
-COMDLG32LIB=comdlg32.lib
-COMCTL32LIB=comctl32.lib
-CRYPT32LIB=crypt32.lib
-GDIPLUSLIB=gdiplus.lib
-DBGHELPLIB=dbghelp.lib
-MSILIB=msi.lib
-DDRAWLIB=ddraw.lib
-SHLWAPILIB=shlwapi.lib
-URLMONLIB=urlmon.lib
-WININETLIB=wininet.lib
-OLDNAMESLIB=oldnames.lib
-MSIMG32LIB=msimg32.lib
-PROPSYSLIB=propsys.lib
-
commit 3ab15354d8ccc8cfce88ff8708f05e0f4e64ea4d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Jan 16 20:53:17 2011 +0200
Cleanups and improvements on the nascent support for 64-bit Windows build
* solenc/inc/settings.mk: Drop MSVC 2003 section.
* solenc/inc/tg_compv.mk: Set COMNAME appropriately for 64-bit build.
* solenc/inc/wnt.mk: Drop unsupported compiler version sections.
* solenc/inc/wntmsci11.mk: Look for the CL_X64 make variable, not
cl_x64. Drop duplicate definitions already put in the environment by
set_soenv.in.
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 3a58ea7..b2bcd30 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1026,18 +1026,6 @@ AUGMENT_LIBRARY_PATH_LOCAL = : && \
$(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))
.END
-# remove if .Net 2003 support has expired
-.IF "$(debug)"!=""
-.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI"
-.IF "$(COMEX)" == "10"
-.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)"!=""
-MAXPROCESS!:=1
-.EXPORT : MAXPROCESS
-.ENDIF # "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)"!=""
-.ENDIF # "$(COMEX)" == "10"
-.ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI"
-.ENDIF # "$(debug)"!=""
-
# for multiprocess building in external modules
# allow seperate handling
EXTMAXPROCESS*=$(MAXPROCESS)
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index c68ae5a..a9fc920 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -68,9 +68,11 @@ CCVER:=$(shell @-$(CXX) $(CFLAGSVERSION_CMD))
CCNUMVER:=$(shell @-$(CXX) $(CFLAGSNUMVERSION_CMD))
.IF "$(COM)"=="MSC"
-.IF "$(CCNUMVER)">="001200000000"
COMID=MSC
+.IF "$(CPU)"=="I"
COMNAME=msci
+.ELSE
+COMNAME=mscx
.ENDIF
.ENDIF
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index f369bd1..4635fc1 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -30,14 +30,10 @@
# --- Compiler ---
-.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI"
-.IF "$(COMEX)" == "10"
-.INCLUDE : wntmsci10.mk
-.ELSE
-# for wntmsci11 (.Net 2005) and wntmsci12 (.Net 2008)
+.IF "$(OS)$(COM)" == "WNTMSC"
+# for wntmsci12 (MSVC 2005) and wntmsci13 (MSVC 2010), 32- and 64-bit
.INCLUDE : wntmsci11.mk
-.ENDIF # "$(COMEX)" == "10"
-.ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI"
+.ENDIF # "$(OS)$(COM)" == "WNTMSC"
.IF "$(COM)$(OS)$(CPU)" == "GCCWNTI"
.INCLUDE : wntgcci.mk
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index aff5000..fbeba1a 100755
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -25,7 +25,9 @@
#
#*************************************************************************
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSCI11 and WNTMSCI12
+# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
+# yes, despite the "11" in this file name, note that we don't actually
+# support the WNTMSCI11 (MSVC 2005) compiler any more
SOLAR_JAVA*=TRUE
FULL_DESK=TRUE
@@ -88,7 +90,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
@@ -227,7 +229,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
@@ -241,7 +243,7 @@ LINKFLAGS=/MAP /OPT:NOREF
.ENDIF
# excetion handling protection
-.IF "$(cl_x64)" == ""
+.IF "$(CL_X64)" == ""
LINKFLAGS+=-safeseh
.ENDIF
@@ -325,23 +327,11 @@ LIBSTLPORT=stlport_vc71.lib
LIBSTLPORTST=stlport_vc71_static.lib
.ENDIF
-.IF "$(PROF_EDITION)" == ""
-ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl
-ATL_LIB*=$(COMPATH)/atlmfc/lib
-MFC_INCLUDE*=$(COMPATH)/PlatformSDK/include/mfc
-MFC_LIB*=$(COMPATH)/atlmfc/lib
-.ELSE
-ATL_INCLUDE*=$(COMPATH)/atlmfc/include
-ATL_LIB*=$(COMPATH)/atlmfc/lib
-MFC_INCLUDE*=$(COMPATH)/atlmfc/include
-MFC_LIB*=$(COMPATH)/atlmfc/lib
-.ENDIF
-
LIBMGR=lib $(NOLOGO)
IMPLIB=lib
LIBFLAGS=
-.IF "$(cl_x64)" == ""
+.IF "$(CL_X64)" == ""
IMPLIBFLAGS=-machine:IX86
.ELSE
IMPLIBFLAGS=-machine:X64
commit 299ddd26d120d0c86a226f156b50aba91bf24cc9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Jan 16 20:48:21 2011 +0200
Make 64-bit Windows build work in stlport
* stlport/STLport-4.5-0119.patch Add a few bits to our patch
file. Don't use the /machine:I386 /debugtype:cv linker flags, the
defaults are what we want for both 32- and 64-bit. Make the weird
Interlocked* stuff build on a 64-bit build too.
diff --git a/stlport/STLport-4.5-0119.patch b/stlport/STLport-4.5-0119.patch
index db2c62b..bb17a11 100644
--- a/stlport/STLport-4.5-0119.patch
+++ b/stlport/STLport-4.5-0119.patch
@@ -38,7 +38,7 @@
MKDIR=-mkdir
LINK_OUT=/out:
-@@ -51,7 +51,7 @@
+@@ -51,15 +51,15 @@
#
# FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
@@ -47,6 +47,15 @@
FLAGS_COMMON_static = $(FLAGS_COMMON) /FD /D "_STLP_NO_FORCE_INSTANTIATE"
FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
+ FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+ # FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+ FLAGS_NDEBUG=/O2 /DNDEBUG $(EXTRA_NDEBUG_FLAGS)
+
+-LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv
++LDFLAGS_COMMON=/nologo
+ LDFLAGS_DEBUG=/debug
+ LDFLAGS_RELEASE=/opt:ref
+
--- misc/STLport-4.5-0119/stlport/config/_epilog.h Thu Sep 6 00:11:36 2001
+++ misc/build/STLport-4.5-0119/stlport/config/_epilog.h Mon Jun 2 10:32:02 2008
@@ -4,6 +4,7 @@
@@ -1326,3 +1335,14 @@
explicit _DBG_vector(size_type __n)
: _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
+--- misc/build/STLport-4.5-0119/stlport/stl/_threads.h
++++ misc/build/STLport-4.5-0119/stlport/stl/_threads.h
+@@ -99,7 +99,7 @@
+ # else
+ // This section serves as a replacement for windows.h header for Visual C++
+ extern "C" {
+-# if (defined(_M_MRX000) || defined(_M_ALPHA) \
++# if (defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_AMD64) \
+ || (defined(_M_PPC) && (_MSC_VER >= 1000))) && !defined(RC_INVOKED)
+ # define InterlockedIncrement _InterlockedIncrement
+ # define InterlockedDecrement _InterlockedDecrement
commit 1610cb28f92f89d9ebc43b4c5d2a96a2d9e7f806
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Jan 16 20:45:18 2011 +0200
Cleanups and hacks on the start of support for 64-bit Windows build
* configure.in: Look for the x64 assembler ml64.exe when building 64-bit
binaries, not ml.exe. Use the 64-bit tools in VC/bin/amd64, not
the 32-bit cross-compiling tools in VC/bin/x86_amd64. We can
currently build 64-bit only on a 64-bit OS anyway, for instance
because of the unit tests.
* set_soenv.in: Set CPUNAME, CPU and OUTPATH appropriately for
64-bit build. We end up with "wntsmcx12" for 64-bit MSVC 2008
build. Drop sections for no longer supported MSVC versions. Don't
talk about ".NET 2005" etc, ".NET" was part of the MS suite product
name only in the 2003 version. Add Emacs and vim mode lines.
diff --git a/configure.in b/configure.in
index bb8302f..4fa3a81 100755
--- a/configure.in
+++ b/configure.in
@@ -1223,9 +1223,9 @@ AC_ARG_WITH(unix-wrapper,
AC_ARG_WITH(asm-home,
AS_HELP_STRING([--with-asm-home],
- [For Windows users, please supply the path for the ml.exe assembler.])
+ [For Windows, please supply the path for the ml.exe or ml64.exe assembler.])
[
- Usage: --with-asm-home=<path to ml.exe directory>
+ Usage: --with-asm-home=<path to assembler directory>
],
,)
@@ -2141,12 +2141,12 @@ if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation path])
if test -z "$with_cl_home"; then
vctest=`./oowintool --msvc-productdir`;
- if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+ if test $CL_X64 = ""; then
if test -x "$vctest/bin/cl.exe"; then
with_cl_home=$vctest;
fi
else
- if test -x "$vctest/bin/x86_amd64/cl.exe"; then
+ if test -x "$vctest/bin/amd64/cl.exe"; then
with_cl_home=$vctest;
fi
fi
@@ -2194,15 +2194,15 @@ if test "$_os" = "WINNT"; then
PATH="$MSPDB_PATH:$PATH"
AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
- if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+ if test $CL_X64 = ""; then
if test -x "$with_cl_home/bin/cl.exe"; then
CC="$with_cl_home/bin/cl.exe"
fi
- else
- if test -x "$with_cl_home/bin/x86_amd64/cl.exe"; then
- CC="$with_cl_home/bin/x86_amd64/cl.exe"
+ else
+ if test -x "$with_cl_home/bin/amd64/cl.exe"; then
+ CC="$with_cl_home/bin/amd64/cl.exe"
fi
- fi
+ fi
if test -z "$CC"; then
AC_PATH_PROG(CC, cl.exe)
fi
@@ -2213,7 +2213,7 @@ if test "$_os" = "WINNT"; then
CC=`cygpath -u "$CC"`
# Remove /cl.exe from CC case insensitive
AC_MSG_RESULT([found ($CC)])
- if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+ if test $CL_X64 = ""; then
COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
else
if test -n "$with_cl_home"; then
@@ -6051,21 +6051,28 @@ fi
AC_SUBST(CYGWIN_PATH)
dnl ***************************************
-dnl testing ml.exe assembler path
+dnl testing assembler path
dnl ***************************************
+if test $CL_X64 = ""; then
+ assembler=ml.exe
+ assembler_bin=bin
+else
+ assembler=ml64.exe
+ assembler_bin=bin/amd64
+fi
if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
- AC_MSG_CHECKING([ml.exe assembler path])
+ AC_MSG_CHECKING([$assembler assembler path])
if test -n "$with_asm_home"; then
with_asm_home=`cygpath -u "$with_asm_home"`
fi
- if test ! -x "$with_asm_home/ml.exe"; then
- AC_PATH_PROG(ML_EXE, ml.exe)
+ if test ! -x "$with_asm_home/$assembler"; then
+ AC_PATH_PROG(ML_EXE, $assembler)
if test -z "$ML_EXE"; then
- if test -x "$with_cl_home/bin/ml.exe"; then
- with_asm_home=$with_cl_home/bin
+ if test -x "$with_cl_home/$assembler_bin/$assembler"; then
+ with_asm_home=$with_cl_home/$assembler_bin
AC_MSG_RESULT([found ($with_asm_home)])
else
- AC_MSG_ERROR([Configure did not find ml.exe assembler.])
+ AC_MSG_ERROR([Configure did not find $assembler assembler.])
fi
else
with_asm_home="ASM_IN_PATH"
diff --git a/set_soenv.in b/set_soenv.in
index feeb83d..0533441 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -683,7 +683,9 @@ elsif ( $platform =~ m/cygwin/ )
$FRAME_HOME = PathFormat('@FRAME_HOME@');
$USE_NEW_SDK = "TRUE";
$CPUNAME = "INTEL";
+ $CPUNAME = "X86_64" if $CL_X64;
$CPU = "I";
+ $CPU = "X" if $CL_X64;
$GUI = "WNT";
$GUIBASE = "WIN";
$GVER = "NT351";
@@ -693,7 +695,7 @@ elsif ( $platform =~ m/cygwin/ )
$use_shl_versions = "TRUE";
$wps = ';'; # Windows style path seperator
if ( $MINGW eq "yes" )
- { # At the moment this implies the use of tcsh
+ { # At the moment this implies the use of tcsh, wtf?
print "Setting Windows NT cygwin MinGW specific values... ";
$FLIPCMD = "slfl.pl";
$PATH_SEPERATOR = ';';
@@ -711,42 +713,35 @@ elsif ( $platform =~ m/cygwin/ )
$COMPATH = PathFormat('@COMPATH@');
$COM = "MSC";
$OUTPATH = "wntmsci at COMEX@";
+ $OUTPATH = "wntmscx at COMEX@" if $CL_X64;
$INPATH = $OUTPATH.$PROEXT;
$COMEX = '@COMEX@';
- if ( "@COMEX@" eq "10" ) { # .NET 2003 needs M1310
- $CVER = "M1310";
- $ATL_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
- $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
- $MFC_LIB = "";
- $MFC_INCLUDE = "";
- } elsif ( "@COMEX@" ge "11" ) { # .NET 2005 needs M1400
- if ( "@COMEX@" eq "11" ) {
- $CVER = "M1400";
- } elsif ( "@COMEX@" eq "12" ) {
- $CVER = "M1500";
+ if ( "@COMEX@" eq "12" ) {
+ $CVER = "M1500";
} elsif ( "@COMEX@" eq "13" ) {
$CVER = "M1600";
+ } else { # Unsupported
+ die "Unsupported compiler version.\n";
+ }
+ if ( "@DISABLE_ACTIVEX@" ) {
+ $ATL_LIB = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
+ $ATL_INCLUDE = $PSDK_HOME.$ds."include".$ds."atl";
+ $MFC_LIB = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
+ $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
+ } else {
$ATL_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
$ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
- } else { # Unsupported
- die "Unsupported value for COMEX variable.\n";
- }
- if ( "@DISABLE_ACTIVEX@" ) {
- $ATL_LIB = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
- $ATL_INCLUDE = $PSDK_HOME.$ds."include".$ds."atl";
- $MFC_LIB = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
- $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
- } else {
- $ATL_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
- $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
- $MFC_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
- $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
- }
+ $MFC_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
+ $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
+ }
+ if ($CL_X64) {
+ $ATL_LIB .= $ds."amd64";
+ $MFC_LIB .= $ds."amd64";
}
- print "Setting W32 build with bash shell specific values... ";
- # No speacial treatment for CC an CXX anymore.
- $FLIPCMD = "slfl.pl";
- $PATH_SEPERATOR = ';';
+ print "Setting Windows build specific values... ";
+ # No speacial treatment for CC an CXX anymore.
+ $FLIPCMD = "slfl.pl";
+ $PATH_SEPERATOR = ';';
}
}
elsif ( $platform =~ m/os2/ )
@@ -1115,12 +1110,6 @@ if ($platform =~ m/cygwin|os2/)
$ILIB .= $wps.$FRAME_HOME.$LIB;
if ( '@ENABLE_DIRECTX@' ne "" ) {
$ILIB .= $wps.$DIRECTXSDK_LIB;
- if ( '@COMEX@' eq "10" ) {
- # .NET2003 provides and compiles against DirectX 5 libraries and is
- # hereby still Win9x compatible.
- $ILIB .= $wps.'$COMPATH'.$ds.'PlatformSDK'.$LIB;
- $USE_DIRECTX5 = "YES";
- }
}
# ILIB needs to use '\' directory seperators;
$ILIB = WinPath( $ILIB, ";" );
@@ -1202,32 +1191,31 @@ elsif ($platform =~ m/cygwin/)
# Add path to compiler
$tmppath = CygFormat($COMPATH).$BIN;
+ $tmppath .= $ds."amd64" if $CL_X64;
$tmppath =~ s/^\/\//\//;
$PATH .= $ps.$tmppath;
if ( $COM eq "MSC" ) {
$tmppath = CygFormat($MSPDB_PATH);
- # for .NET to find mspdb71.dll (needed by CL.EXE C/C++ Compiler)
- if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
- $PATH .= $ps.$tmppath;
- }
- if ( ( $COMEX ge "10" ) ) {
- # .NET needs midl.exe
- $tmppath = CygFormat($MIDL_PATH);
- if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
- $PATH .= $ps.$tmppath;
- }
- # .NET needs csc.exe
- $tmppath = CygFormat($CSC_PATH);
- if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
- $PATH .= $ps.$tmppath;
- }
- # Native installer needs some files if the Windows Installer SDK
- $tmppath = CygFormat($PSDK_HOME);
- if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
- $PATH .= $ps.$tmppath.$BIN;
- }
- }
+ # for MSVC to find mspdb71.dll
+ if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+ $PATH .= $ps.$tmppath;
+ }
+ # need midl.exe
+ $tmppath = CygFormat($MIDL_PATH);
+ if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+ $PATH .= $ps.$tmppath;
+ }
+ # needs csc.exe
+ $tmppath = CygFormat($CSC_PATH);
+ if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+ $PATH .= $ps.$tmppath;
+ }
+ # Installer needs some files if the Windows Installer SDK
+ $tmppath = CygFormat($PSDK_HOME);
+ if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
+ $PATH .= $ps.$tmppath.$BIN;
+ }
} else { # Mingw is different
# Native installer needs some files if the Windows Installer SDK
$tmppath = CygFormat($PSDK_HOME);
@@ -1504,11 +1492,6 @@ elsif ($platform =~ m/cygwin/)
$I.'$COMPATH'.$ds."include";
if ( '@ENABLE_DIRECTX@' ne "" ) {
$SOLARINC .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
- if ( '@COMEX@' eq "10" ) {
- # .NET2003 provides and compiles against DirectX 5 libraries and is
- # hereby still Win9x compatible.
- $SOLARINC .= $I.'$COMPATH'.$ds.'PlatformSDK'.$ds."include";
- }
}
}
elsif ( $COM eq "GCC" )
More information about the Libreoffice-commits
mailing list