mirror of
				https://github.com/RetroDECK/ES-DE.git
				synced 2025-04-10 19:15:13 +00:00 
			
		
		
		
	Support FreeImage as a static library
This commit is contained in:
		
							parent
							
								
									3c60235363
								
							
						
					
					
						commit
						7bd68501a1
					
				|  | @ -21,6 +21,7 @@ | ||||||
| #include "ScraperCmdLine.h" | #include "ScraperCmdLine.h" | ||||||
| #include <sstream> | #include <sstream> | ||||||
| #include <boost/locale.hpp> | #include <boost/locale.hpp> | ||||||
|  | #include <FreeImage.h> | ||||||
| 
 | 
 | ||||||
| #ifdef WIN32 | #ifdef WIN32 | ||||||
| #include <Windows.h> | #include <Windows.h> | ||||||
|  | @ -222,6 +223,11 @@ int main(int argc, char* argv[]) | ||||||
| 	} | 	} | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
|  | 	// call this ONLY when linking with FreeImage as a static library
 | ||||||
|  | #ifdef FREEIMAGE_LIB | ||||||
|  | 	FreeImage_Initialise(); | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
| 	//if ~/.emulationstation doesn't exist and cannot be created, bail
 | 	//if ~/.emulationstation doesn't exist and cannot be created, bail
 | ||||||
| 	if(!verifyHomeFolderExists()) | 	if(!verifyHomeFolderExists()) | ||||||
| 		return 1; | 		return 1; | ||||||
|  | @ -384,6 +390,11 @@ int main(int argc, char* argv[]) | ||||||
| 	CollectionSystemManager::deinit(); | 	CollectionSystemManager::deinit(); | ||||||
| 	SystemData::deleteSystems(); | 	SystemData::deleteSystems(); | ||||||
| 
 | 
 | ||||||
|  | 	// call this ONLY when linking with FreeImage as a static library
 | ||||||
|  | #ifdef FREEIMAGE_LIB | ||||||
|  | 	FreeImage_DeInitialise(); | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
| 	LOG(LogInfo) << "EmulationStation cleanly shutting down."; | 	LOG(LogInfo) << "EmulationStation cleanly shutting down."; | ||||||
| 
 | 
 | ||||||
| 	return 0; | 	return 0; | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Tomas Jakobsson
						Tomas Jakobsson