[Libreoffice-commits] core.git: basic/CppunitTest_basic_macros.mk extensions/Library_so_activex_x64.mk external/coinmp external/cppunit external/lcms2 external/python3 solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 16 11:49:39 UTC 2019
basic/CppunitTest_basic_macros.mk | 2 +-
extensions/Library_so_activex_x64.mk | 6 ++----
external/coinmp/ExternalProject_coinmp.mk | 1 -
external/cppunit/ExternalProject_cppunit.mk | 1 -
external/lcms2/ExternalProject_lcms2.mk | 1 -
external/python3/ExternalProject_python3.mk | 1 -
solenv/gbuild/platform/com_MSC_class.mk | 2 +-
7 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit a0e326f5e109a1dc3402b4102ad730de6feeba96
Author: himajin100000 <himajin100000 at gmail.com>
AuthorDate: Wed Jan 16 16:34:36 2019 +0900
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Jan 16 12:49:14 2019 +0100
Minimum Supported Version is VS2017
Change-Id: Id771f1fe0d8c6702a52836f6229a944d259fed4c
Reviewed-on: https://gerrit.libreoffice.org/66424
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/basic/CppunitTest_basic_macros.mk b/basic/CppunitTest_basic_macros.mk
index db49876bb652..2ce70764e294 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \
oleaut32 \
- $(if $(filter 140 150,$(VCVER)),legacy_stdio_definitions) \
+ $(if $(filter 150,$(VCVER)),legacy_stdio_definitions) \
odbc32 \
odbccp32 \
))
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 64f644098a8f..047c1044f86e 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -50,9 +50,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
))
$(eval $(call gb_Library_add_libs,so_activex_x64,\
- $(if $(filter 140,$(VCVER)),\
- $(ATL_LIB)/amd64/atls.lib, \
- $(subst /x86,/x64,$(ATL_LIB)/atls.lib)) \
-))
+ $(subst /x86,/x64,$(ATL_LIB)/atls.lib)) \
+)
# vim:set noet sw=4 ts=4:
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index 07cb9e248bd6..4e77e37c4e08 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
- $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
,CoinMP/MSVisualStudio/v9)
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk
index 51e436b35cf4..1b3406f3d756 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -18,7 +18,6 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
- $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
&& msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index 51eb81acfc68..c8418a4d219c 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -18,7 +18,6 @@ ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
MSBuild.exe lcms2_DLL.vcxproj \
- $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 7e9952ac6cc7..6dba1481766f 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -37,7 +37,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
/maxcpucount \
- $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
,PCBuild)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 333c8b4d80bc..26ce2a51300b 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -176,7 +176,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(PE_X86)), -MACHINE:X86) \
$(if $(filter YES,$(LIBRARY_X64)), \
- -LIBPATH:$(COMPATH)/lib/$(if $(filter 140,$(VCVER)),amd64,x64) \
+ -LIBPATH:$(COMPATH)/lib/x64 \
-LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
-LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64 \
$(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64)) \
More information about the Libreoffice-commits
mailing list