diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-28 09:16:57 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-07-28 09:20:09 +0300 |
| commit | e23fa8db9fa4e6367d7bfcd34289ea10388783fa (patch) | |
| tree | 33e5bdb42b276322e71edf0ca2210d44651a9eb4 /solenv | |
| parent | 34170ac810f4d8449af527564e661002f56a5ecb (diff) | |
Improvements for Windows build with only VS2013 installed
I thought it was possible now to build on Windows with Visual Studio
2013 as the only installed Visual Studio version, but no. I tried on a
fresh Windows 8.1 installation.
This commit fixes the configury a bit at least. (One needs to pass the
--with-visual-studio=2013 option. Otherwise configure gets confused by
the partial (?) VS2012 that seems to be installed, too, when
installing VS2013, and prefers that...)
The build fails at least in external/lcms2, but I'll leave sorting out
that for later.
Change-Id: I15942e4b088a3f0a62c3f7fa8f9b45f77beaff6f
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2b11ca36acfb..f619aa71f8af 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -170,7 +170,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(LIBRARY_X64)), \ -LIBPATH:$(COMPATH)/lib/amd64 \ -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \ - $(if $(filter 80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64)) \ + $(if $(filter 80 81,$(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))) \ |