aboutsummaryrefslogtreecommitdiff
path: root/mysql/types
diff options
context:
space:
mode:
Diffstat (limited to 'mysql/types')
-rw-r--r--mysql/types/driver.cxx4
-rw-r--r--mysql/types/makefile25
2 files changed, 16 insertions, 13 deletions
diff --git a/mysql/types/driver.cxx b/mysql/types/driver.cxx
index e0d6b42..2a6c94e 100644
--- a/mysql/types/driver.cxx
+++ b/mysql/types/driver.cxx
@@ -13,7 +13,7 @@
#include <odb/mysql/database.hxx>
#include <odb/mysql/transaction.hxx>
-#include <common.hxx>
+#include <common/common.hxx>
#include "test.hxx"
#include "test-odb.hxx"
@@ -42,7 +42,7 @@ main (int argc, char* argv[])
o.long_long_ = -123456;
o.ulong_long_ = 123456;
- o.float_ = 1.123;
+ o.float_ = 1.123F;
o.double_ = 1.123;
o.decimal_ = "123.456";
diff --git a/mysql/types/makefile b/mysql/types/makefile
index 859ef29..60ee402 100644
--- a/mysql/types/makefile
+++ b/mysql/types/makefile
@@ -10,20 +10,14 @@ odb_hdr := test.hxx
cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
cxx_od := $(cxx_obj:.o=.o.d)
-common.l := $(out_root)/libcommon/common.l
-common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options
+common.l := $(out_root)/libcommon/common/common.l
+common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
driver := $(out_base)/driver
dist := $(out_base)/.dist
test := $(out_base)/.test
clean := $(out_base)/.clean
-ifdef db_id
-ifneq ($(db_id),mysql)
-$(error trying to build a MySQL-specific test with $(db_id))
-endif
-endif
-
# Import.
#
$(call import,\
@@ -55,11 +49,18 @@ $(out_base)/: $(driver)
# Dist
#
-$(dist): data_dist := $(cxx_tun) $(odb_hdr) traits.hxx test.std
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
$(dist): export extra_headers := traits.hxx
+$(dist): data_dist := test.std
+$(dist): export name := $(notdir $(src_base))
+$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \
+$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters
$(dist):
- $(call dist-data,$(data_dist))
- $(call meta-automake,$(src_root)/mysql/template/Makefile.am)
+ $(call dist-data,$(sources) $(headers) $(extra_headers) $(data_dist))
+ $(call meta-automake,../template/Makefile.am)
+ $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj)
+ $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj)
# Test.
#
@@ -90,6 +91,8 @@ endif
# How to.
#
$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
$(call include,$(bld_root)/meta/automake.make)
$(call include,$(odb_rules))