From c093758b4688fb5bae2cc7727b6c9b52b824043e Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 12 Jan 2023 15:49:16 +0100
Subject: Move tools opt to ctor.h and rename tool_chain to toolchain for
 consistency.

---
 src/tools.h | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'src/tools.h')

diff --git a/src/tools.h b/src/tools.h
index bedb708..e6c2264 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -8,28 +8,6 @@
 
 #include "ctor.h"
 
-enum class opt
-{
-	//                                  gcc/clang
-	output,                          //  -o
-	debug,                           //  -g
-	strip,                           //  -s
-	warn_all,                        //  -Wall
-	warnings_as_errors,              //  -Werror
-	generate_dep_tree,               //  -MMD
-	no_link,                         //  -c
-	include_path,                    //  -I<arg>
-	library_path,                    //  -L<arg>
-	link,                            //  -l<arg>
-	cpp_std,                         //  -std=<arg>
-	build_shared,                    //  -shared
-	threads,                         //  -pthread
-	optimization,                    //  -O<arg>
-	position_independent_code,       //  -fPIC
-	position_independent_executable, //  -fPIE
-	custom,                          // entire option taken verbatim from <arg>
-};
-
 //! Get tool-chain type from compiler path string
 ctor::toolchain getToolChain(const std::string& compiler);
 
@@ -39,11 +17,11 @@ ctor::toolchain getToolChain(ctor::output_system system);
 //! Get tool argument(s) for specific option type matching the supplied
 //! tool-chain
 std::vector<std::string> getOption(ctor::toolchain toolchain,
-                                   opt option,
+                                   ctor::opt option,
                                    const std::string& arg = {});
 
 //! Get opt enum value and argument from string,
 //! ie. { opt::InludePath, "foo/bar" } from "-Ifoo/bar"
 //! Returns { opt::Custom, flag } if unknown.
-std::pair<opt, std::string> getOption(const std::string& flag,
-                                      ctor::toolchain toolchain = ctor::toolchain::gcc);
+std::pair<ctor::opt, std::string> getOption(const std::string& flag,
+                                            ctor::toolchain toolchain = ctor::toolchain::gcc);
-- 
cgit v1.2.3