diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-17 12:29:13 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-17 13:10:26 +0300 |
| commit | e7f8b9f8f558e3d862d32a73d0d91f83d7d7be6b (patch) | |
| tree | f0644f6e14c338a676aa97eb4a0c623077eb6011 /solenv | |
| parent | 6ee5be0e1dc300120439c3579430d35e7d31131c (diff) | |
Bye bye VS2010
Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index c1ce1f1b32e1..2c6dc19abcfc 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -202,9 +202,9 @@ ifneq ($(ENABLE_LTO),) # the dbaccess dbu library. Let's try globally disabling C4702. # Might be fixed in VS2013 though? -# VCVER=100 for VS2010 and VCVER=110 for VS2012 +# VCVER=110 for VS2012 -ifneq ($(filter 100 110,$(VCVER)),) +ifneq ($(filter 110,$(VCVER)),) gb_CXXFLAGS += \ -wd4702 \ @@ -212,15 +212,6 @@ endif endif -# New warning(s) in Visual Studio 2010, let's try disabling these only -# for that specific compiler version, in case a later one will not -# need them disabled. -ifeq ($(VCVER),100) - -# (none currently) - -endif - ifeq ($(CPUNAME),X86_64) gb_CXXFLAGS += \ @@ -228,10 +219,8 @@ gb_CXXFLAGS += \ endif -ifneq ($(VCVER),100) # rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A gb_RCFLAGS += -nologo -endif # C4005: 'identifier' : macro redefinition |