Просмотр исходного кода

Do not pass ConfigSettings around

Daniele Bartolini 11 лет назад
Родитель
Сommit
076005278a

+ 4 - 4
engine/compilers/bundle_compiler.cpp

@@ -135,12 +135,12 @@ void BundleCompiler::scan(const char* cur_dir, Vector<DynamicString>& files)
 
 namespace bundle_compiler
 {
-	bool main(const ConfigSettings& cs)
+	bool main(bool do_compile, bool do_continue, Platform::Enum platform)
 	{
-		if (cs.do_compile)
+		if (do_compile)
 		{
-			bool ok = bundle_compiler_globals::compiler()->compile_all(cs.platform);
-			if (!ok || !cs.do_continue)
+			bool ok = bundle_compiler_globals::compiler()->compile_all(platform);
+			if (!ok || !do_continue)
 			{
 				return false;
 			}

+ 1 - 1
engine/compilers/bundle_compiler.h

@@ -55,7 +55,7 @@ private:
 
 namespace bundle_compiler
 {
-	bool main(const ConfigSettings& cls);
+	bool main(bool do_compile, bool do_continue, Platform::Enum platform);
 } // namespace bundle_compiler
 
 namespace bundle_compiler_globals

+ 1 - 1
engine/main/main_linux.cpp

@@ -445,7 +445,7 @@ int main(int argc, char** argv)
 	bool do_continue = true;
 	int exitcode = EXIT_SUCCESS;
 
-	do_continue = bundle_compiler::main(cs);
+	do_continue = bundle_compiler::main(cs.do_compile, cs.do_continue, cs.platform);
 
 	if (do_continue)
 	{

+ 1 - 1
engine/main/main_windows.cpp

@@ -362,7 +362,7 @@ int main(int argc, char** argv)
 	bool do_continue = true;
 	int exitcode = EXIT_SUCCESS;
 
-	do_continue = bundle_compiler::main(cls);
+	do_continue = bundle_compiler::main(cs.do_compile, cs.do_continue, cs.platform);
 
 	if (do_continue)
 	{