aboutsummaryrefslogtreecommitdiff
path: root/qt/oracle/makefile
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-06-03 18:28:36 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-06-03 18:28:36 +0200
commit419d6b8fd02a149dd9f05b3ffbf4a7676e6e8b34 (patch)
tree1ceccccbc0994e0f9151bac674604ba6c7103334 /qt/oracle/makefile
parent8253d9fdd049a87cd34c65b6d1a643bb091479a4 (diff)
Support for VC12 (2013), initial work
Diffstat (limited to 'qt/oracle/makefile')
-rw-r--r--qt/oracle/makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/qt/oracle/makefile b/qt/oracle/makefile
index efa2888..ae09691 100644
--- a/qt/oracle/makefile
+++ b/qt/oracle/makefile
@@ -17,7 +17,8 @@ $(dist): export extra_dist := test.bat \
$(name)-qt4-vc8.sln \
$(name)-qt4-vc9.sln $(name)-qt5-vc9.sln \
$(name)-qt4-vc10.sln $(name)-qt5-vc10.sln \
-$(name)-qt4-vc11.sln $(name)-qt5-vc11.sln
+$(name)-qt4-vc11.sln $(name)-qt5-vc11.sln \
+$(name)-qt4-vc12.sln $(name)-qt5-vc12.sln
$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests)))
$(call meta-automake)
$(call meta-vc8sln,$(name)-qt4-vc8.sln,,-qt4-vc8.vcproj)
@@ -27,6 +28,8 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests)))
$(call meta-vc10sln,$(name)-qt5-vc10.sln,,-qt5-vc10.vcxproj)
$(call meta-vc11sln,$(name)-qt4-vc11.sln,,-qt4-vc11.vcxproj)
$(call meta-vc11sln,$(name)-qt5-vc11.sln,,-qt5-vc11.vcxproj)
+ $(call meta-vc12sln,$(name)-qt4-vc12.sln,,-qt4-vc12.vcxproj)
+ $(call meta-vc12sln,$(name)-qt5-vc12.sln,,-qt5-vc12.vcxproj)
# Can't have Qt-version specific tests.
$(call meta-vctest,$(name)-qt4-vc10.sln,test.bat)
@@ -37,6 +40,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)