Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[settings] - fix the load of darwin specific settings.xml - TARGET_LI…

…NUX is not defined on TARGET_DARWIN
  • Loading branch information...
commit 6ed1e2d5d2ee4b0f720a609e2c788ee746e10e57 1 parent 0333be6
Memphiz Memphiz authored
Showing with 10 additions and 11 deletions.
  1. +10 −11 xbmc/settings/Settings.cpp
21 xbmc/settings/Settings.cpp
View
@@ -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");
Please sign in to comment.
Something went wrong with that request. Please try again.