Refactor code for registering build_configuration registrations.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/rebuild.h b/src/rebuild.h
index efa6d42..8e0c78a 100644
--- a/src/rebuild.h
+++ b/src/rebuild.h
@@ -5,26 +5,26 @@
 
 #include <vector>
 #include <array>
+#include <string>
+#include <functional>
 
 #include "ctor.h"
 
 struct BuildConfigurationEntry
 {
-	const char* file;
-	ctor::build_configurations (*cb)(const ctor::settings&);
+	std::string file;
+	std::function<ctor::build_configurations (const ctor::settings&)> cb;
 };
 
+std::vector<BuildConfigurationEntry>& getConfigFileList();
+
 struct ExternalConfigurationEntry
 {
-	const char* file;
-	ctor::external_configurations (*cb)(const ctor::settings&);
+	std::string file;
+	std::function<ctor::external_configurations (const ctor::settings&)> cb;
 };
 
-extern std::array<BuildConfigurationEntry, 1024> configFiles;
-extern std::size_t numConfigFiles;
-
-extern std::array<ExternalConfigurationEntry, 1024> externalConfigFiles;
-extern std::size_t numExternalConfigFiles;
+std::vector<ExternalConfigurationEntry>& getExternalConfigFileList();
 
 int reg(const char* location);
 int unreg(const char* location);