From 6ed1e2d5d2ee4b0f720a609e2c788ee746e10e57 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Wed, 8 May 2013 22:38:50 +0200 Subject: [PATCH] [settings] - fix the load of darwin specific settings.xml - TARGET_LINUX is not defined on TARGET_DARWIN --- xbmc/settings/Settings.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index 7b484511c7a05..4d2aa0ced320b 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -551,7 +551,16 @@ bool CSettings::InitializeDefinitions() #elif defined(TARGET_LINUX) if (CFile::Exists(SETTINGS_XML_FOLDER "linux.xml") && !Initialize(SETTINGS_XML_FOLDER "linux.xml")) CLog::Log(LOGFATAL, "Unable to load linux-specific settings definitions"); -#if defined(TARGET_DARWIN) +#elif defined(TARGET_ANDROID) + if (CFile::Exists(SETTINGS_XML_FOLDER "android.xml") && !Initialize(SETTINGS_XML_FOLDER "android.xml")) + CLog::Log(LOGFATAL, "Unable to load android-specific settings definitions"); +#elif defined(TARGET_RASPBERRY_PI) + if (CFile::Exists(SETTINGS_XML_FOLDER "rbp.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp.xml")) + CLog::Log(LOGFATAL, "Unable to load rbp-specific settings definitions"); +#elif defined(TARGET_FREEBSD) + if (CFile::Exists(SETTINGS_XML_FOLDER "freebsd.xml") && !Initialize(SETTINGS_XML_FOLDER "freebsd.xml")) + CLog::Log(LOGFATAL, "Unable to load freebsd-specific settings definitions"); +#elif defined(TARGET_DARWIN) if (CFile::Exists(SETTINGS_XML_FOLDER "darwin.xml") && !Initialize(SETTINGS_XML_FOLDER "darwin.xml")) CLog::Log(LOGFATAL, "Unable to load darwin-specific settings definitions"); #if defined(TARGET_DARWIN_OSX) @@ -565,16 +574,6 @@ bool CSettings::InitializeDefinitions() CLog::Log(LOGFATAL, "Unable to load atv2-specific settings definitions"); #endif #endif -#elif defined(TARGET_ANDROID) - if (CFile::Exists(SETTINGS_XML_FOLDER "android.xml") && !Initialize(SETTINGS_XML_FOLDER "android.xml")) - CLog::Log(LOGFATAL, "Unable to load android-specific settings definitions"); -#elif defined(TARGET_RASPBERRY_PI) - if (CFile::Exists(SETTINGS_XML_FOLDER "rbp.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp.xml")) - CLog::Log(LOGFATAL, "Unable to load rbp-specific settings definitions"); -#elif defined(TARGET_FREEBSD) - if (CFile::Exists(SETTINGS_XML_FOLDER "freebsd.xml") && !Initialize(SETTINGS_XML_FOLDER "freebsd.xml")) - CLog::Log(LOGFATAL, "Unable to load freebsd-specific settings definitions"); -#endif #endif if (CFile::Exists(SETTINGS_XML_FOLDER "appliance.xml") && !Initialize(SETTINGS_XML_FOLDER "appliance.xml")) CLog::Log(LOGFATAL, "Unable to load appliance-specific settings definitions");