From e2e255105bc4e9dc35045f81e42f500cfbd562e2 Mon Sep 17 00:00:00 2001
From: kohait <kohait@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 5 Jul 2011 07:45:58 +0000
Subject: [PATCH] rainbow: linux compile

git-svn-id: svn://ultimatepp.org/upp/trunk@3608 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 rainbow/LinuxFb/Proc.cpp                   | 2 +-
 rainbow/{Framebuffer => LinuxFb}/vkcodes.h | 0
 rainbow/SDLFb/SDLFb.h                      | 4 ++++
 rainbow/UWord/UWord.upp                    | 7 +++++--
 rainbow/UWord/init                         | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)
 rename rainbow/{Framebuffer => LinuxFb}/vkcodes.h (100%)

diff --git a/rainbow/LinuxFb/Proc.cpp b/rainbow/LinuxFb/Proc.cpp
index 1f2d405ae..450fcc65f 100644
--- a/rainbow/LinuxFb/Proc.cpp
+++ b/rainbow/LinuxFb/Proc.cpp
@@ -110,7 +110,7 @@ void FBInit(const String& fbdevice)
 	Ctrl::SetFramebufferSize(Size(vinfo.xres, vinfo.yres));
 }
 
-void FBDeInit();
+void FBDeInit()
 {
 	munmap(fbp, screensize);
 	close(fbfd);
diff --git a/rainbow/Framebuffer/vkcodes.h b/rainbow/LinuxFb/vkcodes.h
similarity index 100%
rename from rainbow/Framebuffer/vkcodes.h
rename to rainbow/LinuxFb/vkcodes.h
diff --git a/rainbow/SDLFb/SDLFb.h b/rainbow/SDLFb/SDLFb.h
index 727b18163..6a9df8958 100644
--- a/rainbow/SDLFb/SDLFb.h
+++ b/rainbow/SDLFb/SDLFb.h
@@ -3,6 +3,10 @@
 
 #include <Framebuffer/Framebuffer.h>
 
+#ifdef PLATFORM_POSIX
+#include <CtrlCore/stdids.h>
+#endif
+
 //make keysym known to K_ enum in CtrlCore.h
 #include "SDLWrap.h"
 
diff --git a/rainbow/UWord/UWord.upp b/rainbow/UWord/UWord.upp
index f43ec1052..4226bdea5 100644
--- a/rainbow/UWord/UWord.upp
+++ b/rainbow/UWord/UWord.upp
@@ -6,7 +6,7 @@ uses
 	PdfDraw,
 	plugin\jpg;
 
-uses(WINFB) Framebuffer;
+uses(WINFB | SDLFB) Framebuffer;
 
 uses(SKELETON) Skeleton;
 
@@ -14,6 +14,8 @@ uses(WINFB) WinFb;
 
 uses(WINALT) WinAlt;
 
+uses(SDLFB) SDLFb;
+
 file
 	UWord.cpp,
 	UWord.iml;
@@ -21,5 +23,6 @@ file
 mainconfig
 	"" = "GUI WINFB",
 	"" = "GUI WINALT",
-	"" = "GUI SKELETON";
+	"" = "GUI SKELETON",
+	"" = "GUI SDLFB";
 
diff --git a/rainbow/UWord/init b/rainbow/UWord/init
index dbe5a23f7..053e11def 100644
--- a/rainbow/UWord/init
+++ b/rainbow/UWord/init
@@ -8,4 +8,5 @@
 #include "Skeleton/init"
 #include "WinFb/init"
 #include "WinAlt/init"
+#include "SDLFb/init"
 #endif