Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #259 from tomaz82/FreeImage

Browse source 
Support FreeImage as a static library
This commit is contained in:
Jools Wills 2017-10-18 17:41:17 +01:00 committed by GitHub
parent 3c60235363 7bd68501a1
commit 3f515041df
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
es-app/src/main.cpp
View file

@ -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;