Skip to content
This repository
Browse code

[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 authored May 08, 2013

Showing 1 changed file with 10 additions and 11 deletions. Show diff stats Hide diff stats

  1. 21  xbmc/settings/Settings.cpp
21  xbmc/settings/Settings.cpp
@@ -551,7 +551,16 @@ bool CSettings::InitializeDefinitions()
551 551
 #elif defined(TARGET_LINUX)
552 552
   if (CFile::Exists(SETTINGS_XML_FOLDER "linux.xml") && !Initialize(SETTINGS_XML_FOLDER "linux.xml"))
553 553
     CLog::Log(LOGFATAL, "Unable to load linux-specific settings definitions");
554  
-#if defined(TARGET_DARWIN)
  554
+#elif defined(TARGET_ANDROID)
  555
+  if (CFile::Exists(SETTINGS_XML_FOLDER "android.xml") && !Initialize(SETTINGS_XML_FOLDER "android.xml"))
  556
+    CLog::Log(LOGFATAL, "Unable to load android-specific settings definitions");
  557
+#elif defined(TARGET_RASPBERRY_PI)
  558
+  if (CFile::Exists(SETTINGS_XML_FOLDER "rbp.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp.xml"))
  559
+    CLog::Log(LOGFATAL, "Unable to load rbp-specific settings definitions");
  560
+#elif defined(TARGET_FREEBSD)
  561
+  if (CFile::Exists(SETTINGS_XML_FOLDER "freebsd.xml") && !Initialize(SETTINGS_XML_FOLDER "freebsd.xml"))
  562
+    CLog::Log(LOGFATAL, "Unable to load freebsd-specific settings definitions");
  563
+#elif defined(TARGET_DARWIN)
555 564
   if (CFile::Exists(SETTINGS_XML_FOLDER "darwin.xml") && !Initialize(SETTINGS_XML_FOLDER "darwin.xml"))
556 565
     CLog::Log(LOGFATAL, "Unable to load darwin-specific settings definitions");
557 566
 #if defined(TARGET_DARWIN_OSX)
@@ -565,16 +574,6 @@ bool CSettings::InitializeDefinitions()
565 574
     CLog::Log(LOGFATAL, "Unable to load atv2-specific settings definitions");
566 575
 #endif
567 576
 #endif
568  
-#elif defined(TARGET_ANDROID)
569  
-  if (CFile::Exists(SETTINGS_XML_FOLDER "android.xml") && !Initialize(SETTINGS_XML_FOLDER "android.xml"))
570  
-    CLog::Log(LOGFATAL, "Unable to load android-specific settings definitions");
571  
-#elif defined(TARGET_RASPBERRY_PI)
572  
-  if (CFile::Exists(SETTINGS_XML_FOLDER "rbp.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp.xml"))
573  
-    CLog::Log(LOGFATAL, "Unable to load rbp-specific settings definitions");
574  
-#elif defined(TARGET_FREEBSD)
575  
-  if (CFile::Exists(SETTINGS_XML_FOLDER "freebsd.xml") && !Initialize(SETTINGS_XML_FOLDER "freebsd.xml"))
576  
-    CLog::Log(LOGFATAL, "Unable to load freebsd-specific settings definitions");
577  
-#endif
578 577
 #endif
579 578
   if (CFile::Exists(SETTINGS_XML_FOLDER "appliance.xml") && !Initialize(SETTINGS_XML_FOLDER "appliance.xml"))
580 579
     CLog::Log(LOGFATAL, "Unable to load appliance-specific settings definitions");

0 notes on commit 6ed1e2d

Please sign in to comment.
Something went wrong with that request. Please try again.