diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-03-04 14:36:08 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-04-21 18:18:44 +0200 |
| commit | de030cd7a234fd9191364647deb1a4836ca992cb (patch) | |
| tree | 8ac04e8ec53eb01b15bde0d0b079602feafbb1d9 /solenv | |
| parent | 489414f2395b6c8008ebcda7c37a150fd4ed7ad5 (diff) | |
gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued.
Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/com_MSC_defs.mk | 17 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 9 |
3 files changed, 10 insertions, 20 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2c718ac544f9..1f3caec82141 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -178,8 +178,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(LIBRARY_X64)), \ -LIBPATH:$(COMPATH)/lib/$(if $(filter 140,$(VCVER)),amd64,x64) \ -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \ - $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64) \ - $(if $(filter-out 120,$(VCVER)),-LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/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)) \ $(T_LDFLAGS) \ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \ diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 6dbb38127975..f79432793999 100755 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -151,11 +151,13 @@ gb_CFLAGS := \ -wd4512 \ -wd4706 \ -wd4800 \ + -wd4267 \ ifneq ($(COM_IS_CLANG),TRUE) +# clang-cl doesn't suport -Wv:18 for now gb_CFLAGS += \ - $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \ + -Wv:18 \ endif @@ -176,6 +178,7 @@ gb_CXXFLAGS := \ -wd4244 \ -wd4250 \ -wd4251 \ + -wd4267 \ -wd4275 \ -wd4290 \ -wd4351 \ @@ -188,12 +191,7 @@ gb_CXXFLAGS := \ -wd4706 \ -wd4800 \ -ifeq ($(CPUNAME),X86_64) - -gb_CXXFLAGS += \ - -wd4267 \ - -else +ifeq ($(CPUNAME),INTEL) gb_CXXFLAGS += \ -Zm500 \ @@ -206,7 +204,7 @@ endif ifneq ($(COM_IS_CLANG),TRUE) gb_CXXFLAGS += \ - $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \ + -Wv:18 \ endif @@ -276,7 +274,8 @@ gb_CXXCLRFLAGS := $(gb_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -EHa \ -clr \ -wd4339 \ - $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \ + -Wv:18 \ + -wd4267 \ ifeq ($(COM_IS_CLANG),TRUE) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 7be5eca7d4f8..e636de1c648d 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -35,15 +35,6 @@ gb_OSDEFS := \ -DNOMINMAX \ $(LFS_CFLAGS) \ - -gb_UWINAPI := - -ifeq ($(VCVER),120) - -gb_UWINAPI := uwinapi - -endif - gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ |