4 files changed, 10 insertions, 7 deletions

diff --git a/uisimulator/common/sim_icons.c b/uisimulator/common/sim_icons.c
index 8c175e48b1..8676d873bf 100644
--- a/uisimulator/common/sim_icons.c
+++ b/uisimulator/common/sim_icons.c
@@ -172,7 +172,7 @@ void sim_battery_icon(int icon, bool enable)
 };
 
 void
-sim_lcd_icon(int icon, bool enable)
+lcd_icon(int icon, bool enable)
 {
     switch (icon)
     {
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index f999b2fd95..463cf199bf 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -119,3 +119,6 @@ void lcd_putc(int x, int y, unsigned char ch)
     (void)ch;
 }
 
+void lcd_set_contrast( int x )
+{
+}
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index 382e71b886..bd4708ab6a 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -62,7 +62,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mwindows
 
 APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mwindows
 
-FIRMSRCS = lcd.c power.c sprintf.c id3.c usb.c          \
+FIRMSRCS = lcd-recorder.c power.c sprintf.c id3.c usb.c         \
         mpeg.c powermgmt.c font.c sysfont.c
 
 APPS = main.c tree.c menu.c credits.c main_menu.c icons.c \
@@ -166,8 +166,8 @@ $(OBJDIR)/lang.o: $(APPDIR)/lang/$(LANGUAGE).lang
         $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
         $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@
 
-$(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c
-        $(CC) $(APPCFLAGS) -c $< -o $@
+$(OBJDIR)/lcd.o: $(DRIVERS)/lcd-recorder.c
+        $(CC) $(APPCFLAGS) -DHAVE_LCD_BITMAP -c $< -o $@
 
 $(OBJDIR)/power.o: $(DRIVERS)/power.c
         $(CC) $(APPCFLAGS) -c $< -o $@
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 3f9b999acb..a35778c931 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -77,7 +77,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
 
 APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall
 
-FIRMSRCS = lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c\
+FIRMSRCS = lcd-recorder.c sprintf.c id3.c debug.c usb.c mpeg.c power.c\
   powermgmt.c font.c panic.c sysfont.c
 
 APPS = main.c tree.c menu.c credits.c main_menu.c\
@@ -218,8 +218,8 @@ $(OBJDIR)/lang.o: $(APPDIR)/lang/$(LANGUAGE).lang
         $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
         $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@
 
-$(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c
-        $(CC) $(CFLAGS) -c $< -o $@
+$(OBJDIR)/lcd-recorder.o: $(DRIVERS)/lcd-recorder.c
+        $(CC) $(CFLAGS) -DHAVE_LCD_BITMAP -c $< -o $@
 
 $(OBJDIR)/sysfont.o: $(FIRMWAREDIR)/fonts/clR6x8.bdf
         $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<