diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-11-23 23:53:55 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-02-15 08:23:53 +0000 |
| commit | b862cbdd345ec57c2595629ded6a3969e1e65d56 (patch) | |
| tree | f210409f37e7d8d452f49042beceaffd6b58afc5 /bridges | |
| parent | 60542769488cbf31339e86dc2688a064c6e07917 (diff) | |
Support MSVC 15.0
New compiler changes quite some stuff:
* Compiler detection done based on different registry key
* .NET SDK detection done based on different registry key
* Msbuild installation directory changed
* Merge modules installation directory changed
* SDK number in registry doesn't match the directory name:
(registry key: 10.0.14393, directory name: 10.0.14393.0)
* Compiler, include and library location directories changed
* Architecture specific directory changed: x64 instead of amd64
* Compiler own include directory must be added with -I option
* To force usage of SDK 10 (8.1 is selected per default) new
switch WindowsTargetPlatformVersion is passed to msbuild, to
avoid patching VC project files with this line:
<WindowsTargetPlatformVersion><SDK>/WindowsTargetPlatformVersion>
Known issues:
* Firebird is broken: http://paste.openstack.org/show/594333
Change-Id: I148d7932aff43bbbd07bd493504df974726234c2
Reviewed-on: https://gerrit.libreoffice.org/31279
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/inc/except.hxx | 2 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bridges/inc/except.hxx b/bridges/inc/except.hxx index 32e911321161..f1437f3ae273 100644 --- a/bridges/inc/except.hxx +++ b/bridges/inc/except.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_BRIDGES_INC_EXCEPT_HXX #define INCLUDED_BRIDGES_INC_EXCEPT_HXX -#if _MSC_VER >= 1900 // VC 2015 (and later?) +#if _MSC_VER >= 1900 // VC 2015/2017 (and later?) // extern "C" void** __cdecl __current_exception() // is defined in MSVS14.0/VC/crt/src/vcruntime/frame.cpp: // return &__vcrt_getptd()->_curexception; diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 8348014a61f5..5687c0d42e5d 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -803,7 +803,7 @@ int mscx_filterCppException( if (rethrow && pRecord == pPointers->ExceptionRecord) { pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >( -#if _MSC_VER >= 1900 // VC 2015 (and later?) +#if _MSC_VER >= 1900 // VC 2015/2017 (and later?) __current_exception() #else // Hack to get msvcrt internal _curexception field |