aboutsummaryrefslogtreecommitdiff
path: root/qt/common/makefile
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-02-07 12:32:10 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-02-07 12:32:10 +0200
commit14cc151f37a089784f8db162bb6f419ec8d1aecb (patch)
tree007f9310034cf9091ad6da9bbd9bd2af4588eac9 /qt/common/makefile
parentb81096a979f96175efc6cd5a8e05cab801dfcf81 (diff)
Add Qt5 VC project/solution files
Diffstat (limited to 'qt/common/makefile')
-rw-r--r--qt/common/makefile18
1 files changed, 12 insertions, 6 deletions
diff --git a/qt/common/makefile b/qt/common/makefile
index 2cadcee..6132c7b 100644
--- a/qt/common/makefile
+++ b/qt/common/makefile
@@ -24,14 +24,20 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
name := qt-common
$(dist): name := $(name)
$(dist): export dirs := $(tests)
-$(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \
-$(call vc10slns,$(name)) $(call vc11slns,$(name))
+$(dist): export extra_dist := test.bat \
+$(call vc9slns,$(name)-qt4) $(call vc9slns,$(name)-qt5) \
+$(call vc10slns,$(name)-qt4) $(call vc10slns,$(name)-qt5) \
+$(call vc11slns,$(name)-qt4) $(call vc11slns,$(name)-qt5)
$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
$(call meta-automake)
- $(call meta-vc9slns,$(name))
- $(call meta-vc10slns,$(name))
- $(call meta-vc11slns,$(name))
- $(call meta-vctest,$(name)-mysql-vc10.sln,test.bat)
+ $(call meta-vc9slns,$(name)-qt4,-qt4)
+ $(call meta-vc9slns,$(name)-qt5,-qt5)
+ $(call meta-vc10slns,$(name)-qt4,-qt4)
+ $(call meta-vc10slns,$(name)-qt5,-qt5)
+ $(call meta-vc11slns,$(name)-qt4,-qt4)
+ $(call meta-vc11slns,$(name)-qt5,-qt5)
+ # Can't have Qt-version specific tests.
+ $(call meta-vctest,$(name)-qt4-mysql-vc10.sln,test.bat)
$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests)))
$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests)))