Jelajahi Sumber

Read crown.config _after_ the resource compilation process

Daniele Bartolini 12 tahun lalu
induk
melakukan
eb2e6fa94d
2 mengubah file dengan 3 tambahan dan 2 penghapusan
  1. 1 1
      engine/os/linux/main.cpp
  2. 2 1
      engine/os/win/main.cpp

+ 1 - 1
engine/os/linux/main.cpp

@@ -143,7 +143,6 @@ public:
 	void init(int argc, char** argv)
 	{
 		parse_command_line(argc, argv);
-		read_configuration();
 		check_preferred_settings();
 
 		#if defined(CROWN_DEBUG) || defined(CROWN_DEVELOPMENT)
@@ -165,6 +164,7 @@ public:
 			}
 		#endif
 
+		read_configuration();
 	}
 
 	//-----------------------------------------------------------------------------

+ 2 - 1
engine/os/win/main.cpp

@@ -150,7 +150,6 @@ public:
 	void init(int argc, char** argv)
 	{
 		parse_command_line(argc, argv);
-		read_configuration();
 		check_preferred_settings();
 
 		#if defined(CROWN_DEBUG) || defined(CROWN_DEVELOPMENT)
@@ -171,6 +170,8 @@ public:
 				}
 			}
 		#endif
+
+		read_configuration();
 	}
 
 	//-----------------------------------------------------------------------------