Build cleanup and general fixes. fprintf() is now fdprintf(), the separation

between uisimulator files and firmware/apps files are better done.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6031 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 12 insertions, 4 deletions

diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 8a4a642a86..bbb4c68ff9 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -65,6 +65,10 @@ struct mutex
 /* global tick variable */
 extern long current_tick;
 
+#ifdef SIMULATOR
+#define sleep(x) sim_sleep(x)
+#endif
+
 /* kernel functions */
 extern void kernel_init(void);
 extern void yield(void);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 6d485c2f43..98e2a58a53 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -27,6 +27,10 @@
 #define STYLE_DEFAULT 0
 #define STYLE_INVERT  1
 
+#ifdef SIMULATOR
+#define lcd_icon(x,y) sim_lcd_icon(x,y)
+#endif
+
 /* common functions */
 extern void lcd_init(void);
 extern void lcd_clear_display(void);
@@ -61,10 +65,6 @@ extern void lcd_update_rect(int x, int y, int width, int height);
   #define lcd_update_rect(x,y,w,h)
 #endif
 
-#if defined(SIMULATOR)
-#include "sim_icons.h"
-#endif
-
 #ifdef HAVE_LCD_CHARCELLS
 
 /* Icon definitions for lcd_icon() */
diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h
index 671f9389f0..479c5f2317 100644
--- a/firmware/export/mpeg.h
+++ b/firmware/export/mpeg.h
@@ -42,6 +42,10 @@
 /* For ID3 info and VBR header */
 #define MPEG_RESERVED_HEADER_SPACE (4096 + 1500)
 
+#ifdef SIMULATOR
+#define mpeg_play(x) sim_mpeg_play(x)
+#endif
+
 struct mpeg_debug
 {
         int mp3buflen;