From bc82b6168b8f6f8da915c0c8b8e40ebecac1af1d Mon Sep 17 00:00:00 2001
From: Thomas Martitz <thomas.martitz@student.htw-berlin.de>
Date: Fri, 14 May 2010 14:01:53 +0200
Subject: [PATCH] Fix build

---
 firmware/target/hosted/sdl/system-sdl.c | 5 ++---
 firmware/target/hosted/sdl/system-sdl.h | 1 -
 uisimulator/sdl/SOURCES                 | 1 -
 uisimulator/sdl/lcd-bitmap.c            | 1 +
 uisimulator/sdl/lcd-sdl.h               | 1 +
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c
index 58db02a33..bc3e34054 100644
--- a/firmware/target/hosted/sdl/system-sdl.c
+++ b/firmware/target/hosted/sdl/system-sdl.c
@@ -40,7 +40,7 @@
 
 SDL_Surface    *gui_surface;
 
-static bool     background = true;          /* use backgrounds by default */
+bool            background = true;          /* use backgrounds by default */
 #ifdef HAVE_REMOTE_LCD
 bool            showremote = true;          /* include remote by default */
 #endif
@@ -138,7 +138,7 @@ void system_reboot(void)
     thread_sdl_exception_wait();
 }
 
-int sys_handle_argv(int argc, char *argv[])
+void sys_handle_argv(int argc, char *argv[])
 {
     if (argc >= 1) 
     {
@@ -233,5 +233,4 @@ int sys_handle_argv(int argc, char *argv[])
     if (display_zoom > 1) {
         background = false;
     }
-    return 0;
 }
diff --git a/firmware/target/hosted/sdl/system-sdl.h b/firmware/target/hosted/sdl/system-sdl.h
index 4ac2df730..917e6e89d 100644
--- a/firmware/target/hosted/sdl/system-sdl.h
+++ b/firmware/target/hosted/sdl/system-sdl.h
@@ -45,7 +45,6 @@ void sim_kernel_shutdown(void);
 void sys_poweroff(void);
 void sys_handle_argv(int argc, char *argv[]);
 
-extern SDL_Surface *gui_surface;
 extern bool background;  /* True if the background image is enabled */
 extern int display_zoom;
 extern long start_tick;
diff --git a/uisimulator/sdl/SOURCES b/uisimulator/sdl/SOURCES
index ce97df85a..84eb5ca68 100644
--- a/uisimulator/sdl/SOURCES
+++ b/uisimulator/sdl/SOURCES
@@ -10,4 +10,3 @@ lcd-remote-bitmap.c
 lcd-sdl.c
 timer.c
 thread-sdl.c
-uisdl.c
diff --git a/uisimulator/sdl/lcd-bitmap.c b/uisimulator/sdl/lcd-bitmap.c
index 0bd90196e..298086d9d 100644
--- a/uisimulator/sdl/lcd-bitmap.c
+++ b/uisimulator/sdl/lcd-bitmap.c
@@ -21,6 +21,7 @@
 
 #include "debug.h"
 #include "uisdl.h"
+#include "system.h"
 #include "lcd-sdl.h"
 #include "screendump.h"
 
diff --git a/uisimulator/sdl/lcd-sdl.h b/uisimulator/sdl/lcd-sdl.h
index 9ffa5246c..1f57b06b9 100644
--- a/uisimulator/sdl/lcd-sdl.h
+++ b/uisimulator/sdl/lcd-sdl.h
@@ -27,6 +27,7 @@
 
 /* Default display zoom level */
 extern int display_zoom;
+extern SDL_Surface *gui_surface;
 
 void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width,
                      int height, int max_x, int max_y,
-- 
2.11.4.GIT