From 2dc707e529d2df4f5b5a4ad304519a94f319cbd1 Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Sun, 25 Jul 2010 20:22:10 +0000
Subject: [PATCH] Utilize HAIKU_DISTRO_COMPATIBILITY for the boot splash.
 Currently only '--distro-compatibility official' will result in the HAIKU
 logo being displayed. When 'default' or 'compatible', only the icons will
 display. Due to issues with generate_boot_screen, the "development" logo is
 not utilized.

Relates to #6183 and #6255


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37740 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/system/boot/platform/generic/video_splash.cpp | 6 +++++-
 src/system/kernel/boot_splash.cpp                 | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/system/boot/platform/generic/video_splash.cpp b/src/system/boot/platform/generic/video_splash.cpp
index 5b7db9ec21..d5918e8a51 100644
--- a/src/system/boot/platform/generic/video_splash.cpp
+++ b/src/system/boot/platform/generic/video_splash.cpp
@@ -11,8 +11,12 @@
 #include <boot/platform.h>
 #include <boot/menu.h>
 #include <boot/kernel_args.h>
-#include <boot/images.h>
 #include <boot/platform/generic/video.h>
+#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
+#include <boot/images.h>
+#else
+#include <boot/images-sans-tm.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/system/kernel/boot_splash.cpp b/src/system/kernel/boot_splash.cpp
index d4a117b164..9501ebec25 100644
--- a/src/system/kernel/boot_splash.cpp
+++ b/src/system/kernel/boot_splash.cpp
@@ -15,7 +15,11 @@
 #include <KernelExport.h>
 
 #define __BOOTSPLASH_KERNEL__
+#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
 #include <boot/images.h>
+#else
+#include <boot/images-sans-tm.h>
+#endif
 
 
 #include <boot_item.h>