Libretro: Fixed long compilation/linking times

Core/GameDatabase.cpp

@@ -62,24 +62,29 @@ void GameDatabase::LoadGameDb(vector<string> data)
 	MessageManager::Log("[DB] Initialized - " + std::to_string(_gameDatabase.size()) + " games in DB");
 }
 
+void GameDatabase::LoadGameDb(std::istream &db)
+{
+	vector<string> dbData;
+	while(db.good()) {
+		string lineContent;
+		std::getline(db, lineContent);
+		if(lineContent[lineContent.size() - 1] == '\r') {
+			lineContent = lineContent.substr(0, lineContent.size() - 1);
+		}
+		if(lineContent.empty() || lineContent[0] == '#') {
+			continue;
+		}
+		dbData.push_back(lineContent);
+	}
+	LoadGameDb(dbData);
+}
+
 void GameDatabase::InitDatabase()
 {
 	if(_gameDatabase.size() == 0) {
 		string dbPath = FolderUtilities::CombinePath(FolderUtilities::GetHomeFolder(), "MesenDB.txt");
 		ifstream db(dbPath, ios::in | ios::binary);
-		vector<string> dbData;
+		LoadGameDb(db);
-		while(db.good()) {
-			string lineContent;
-			std::getline(db, lineContent);
-			if(lineContent[lineContent.size() - 1] == '\r') {
-				lineContent = lineContent.substr(0, lineContent.size() - 1);
-			}
-			if(lineContent.empty() || lineContent[0] == '#') {
-				continue;
-			}
-			dbData.push_back(lineContent);
-		}
-		LoadGameDb(dbData);
 	}
 }
 

Core/GameDatabase.h

@@ -20,9 +20,10 @@ private:
 
 	static void InitDatabase();
 	static void UpdateRomData(GameInfo &info, RomData &romData);
+	static void LoadGameDb(vector<string> data);
 
 public:
-	static void LoadGameDb(vector<string> data);
+	static void LoadGameDb(std::istream & db);
 	
 	static void SetGameDatabaseState(bool enabled);
 	static bool IsEnabled();

Libretro/libretro.cpp

@@ -46,10 +46,8 @@ static int32_t _saveStateSize = -1;
 static struct retro_memory_descriptor _descriptors[3];
 static struct retro_memory_map _memoryMap;
 
-//Include game database as an array of strings (need an automated way to generate the include file)
+//Include game database as a byte array (representing the MesenDB.txt file)
-static vector<string> gameDb = {
 #include "MesenDB.inc"
-};
 
 static std::shared_ptr<Console> _console;
 static std::unique_ptr<LibretroRenderer> _renderer;
@@ -111,8 +109,6 @@ extern "C" {
 			logCallback = nullptr;
 		}
 
-		GameDatabase::LoadGameDb(gameDb);
-
 		_console.reset(new Console());
 		_console->Init();
 
@@ -121,6 +117,10 @@ extern "C" {
 		_keyManager.reset(new LibretroKeyManager(_console));
 		_messageManager.reset(new LibretroMessageManager(logCallback, retroEnv));
 
+		std::stringstream databaseData;
+		databaseData.write((const char*)MesenDatabase, sizeof(MesenDatabase));
+		GameDatabase::LoadGameDb(databaseData);
+
 		_console->GetSettings()->SetFlags(EmulationFlags::FdsAutoLoadDisk);
 		_console->GetSettings()->SetFlags(EmulationFlags::AutoConfigureInput);
 		_console->GetSettings()->SetSampleRate(96000);