WIPmsvc-rebased

1 files changed, 10 insertions, 3 deletions

diff --git a/src/ctor.h b/src/ctor.h
index 0892364..3d963b3 100644
--- a/src/ctor.h
+++ b/src/ctor.h
@@ -59,6 +59,7 @@ enum class toolchain
 	none,
 	gcc,
 	clang,
+	msvc,
 };
 
 struct source
@@ -90,6 +91,9 @@ enum class cxx_opt
 	output,                          //  -o
 	debug,                           //  -g
 	warn_all,                        //  -Wall
+	warn_conversion,                 //  -Wconversion
+	warn_shadow,                     //  -Wshadow
+	warn_extra,                      //  -Wextra
 	warnings_as_errors,              //  -Werror
 	generate_dep_tree,               //  -MMD
 	no_link,                         //  -c
@@ -108,6 +112,9 @@ enum class c_opt
 	output,                          //  -o
 	debug,                           //  -g
 	warn_all,                        //  -Wall
+	warn_conversion,                 //  -Wconversion
+	warn_shadow,                     //  -Wshadow
+	warn_extra,                      //  -Wextra
 	warnings_as_errors,              //  -Werror
 	generate_dep_tree,               //  -MMD
 	no_link,                         //  -c
@@ -261,12 +268,12 @@ namespace cfg
 constexpr auto builddir = "builddir";
 
 constexpr auto host_cc = "host-cc";
-constexpr auto host_cxx = "host-cpp";
+constexpr auto host_cxx = "host-cxx";
 constexpr auto host_ar = "host-ar";
 constexpr auto host_ld = "host-ld";
 
 constexpr auto build_cc = "build-cc";
-constexpr auto build_cxx = "build-cpp";
+constexpr auto build_cxx = "build-cxx";
 constexpr auto build_ar = "build-ar";
 constexpr auto build_ld = "build-ld";
 
@@ -277,7 +284,7 @@ constexpr auto ctor_libdir = "ctor-libdir";
 struct configuration
 {
 	bool has(const std::string& key) const;
-	const std::string& get(const std::string& key, const std::string& default_value = {}) const;
+	std::string get(const std::string& key, const std::string& default_value = {}) const;
 
 	ctor::toolchain host_toolchain{ctor::toolchain::none};
 	ctor::arch host_arch{ctor::arch::unknown};