diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2014-06-03 18:28:36 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-06-03 18:28:36 +0200 |
| commit | 419d6b8fd02a149dd9f05b3ffbf4a7676e6e8b34 (patch) | |
| tree | 1ceccccbc0994e0f9151bac674604ba6c7103334 /qt/common/makefile | |
| parent | 8253d9fdd049a87cd34c65b6d1a643bb091479a4 (diff) | |
Support for VC12 (2013), initial work
Diffstat (limited to 'qt/common/makefile')
| -rw-r--r-- | qt/common/makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qt/common/makefile b/qt/common/makefile index d03d843..a12fdfa 100644 --- a/qt/common/makefile +++ b/qt/common/makefile @@ -23,7 +23,8 @@ $(dist): export extra_dist := test.bat \ $(call vc9slns,$(name)-qt4) \ $(call vc9slns,$(name)-qt4) $(call vc9slns,$(name)-qt5) \ $(call vc10slns,$(name)-qt4) $(call vc10slns,$(name)-qt5) \ -$(call vc11slns,$(name)-qt4) $(call vc11slns,$(name)-qt5) +$(call vc11slns,$(name)-qt4) $(call vc11slns,$(name)-qt5) \ +$(call vc12slns,$(name)-qt4) $(call vc12slns,$(name)-qt5) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) $(call meta-automake) $(call meta-vc8slns,$(name)-qt4,-qt4) @@ -33,6 +34,8 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) $(call meta-vc10slns,$(name)-qt5,-qt5) $(call meta-vc11slns,$(name)-qt4,-qt4) $(call meta-vc11slns,$(name)-qt5,-qt5) + $(call meta-vc12slns,$(name)-qt4,-qt4) + $(call meta-vc12slns,$(name)-qt5,-qt5) # Can't have Qt-version specific tests. $(call meta-vctest,$(name)-qt4-mysql-vc10.sln,test.bat) @@ -48,6 +51,7 @@ $(call include,$(bld_root)/meta/vc8sln.make) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) $(call include,$(bld_root)/meta/vc11sln.make) +$(call include,$(bld_root)/meta/vc12sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) |