summaryrefslogtreecommitdiff
path: root/uisimulator/x11
diff options
context:
space:
mode:
Diffstat (limited to 'uisimulator/x11')
-rw-r--r--uisimulator/x11/Makefile9
-rw-r--r--uisimulator/x11/lcd-x11.c10
2 files changed, 6 insertions, 13 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 0c82b2d0a3..c91342fa9e 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -42,7 +42,7 @@ DISPLAY = -DHAVE_LCD_BITMAP
KEYPAD = -DHAVE_RECORDER_KEYPAD
DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
-$(KEYPAD) $(DISPLAY)
+$(KEYPAD) $(DISPLAY) -DLCD_PROPFONTS
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
@@ -69,7 +69,7 @@ ifdef MPEG_PLAY
INCLUDES += -I$(PREVAPPDIR)/common
endif
-CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
+CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall
@@ -84,7 +84,7 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c
endif
-SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
+SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \
button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS)
ifdef MPEG_PLAY
@@ -221,6 +221,9 @@ $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
$(CC) $(CFLAGS) -c $< -o $@
+$(OBJDIR)/stubs.o: ../common/stubs.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
# these ones are simulator-specific
diff --git a/uisimulator/x11/lcd-x11.c b/uisimulator/x11/lcd-x11.c
index 8d58dcbb17..96ce800c8f 100644
--- a/uisimulator/x11/lcd-x11.c
+++ b/uisimulator/x11/lcd-x11.c
@@ -109,13 +109,3 @@ void lcd_update (void)
/* Logf("lcd_update: Draws %d pixels, clears %d pixels", p, cp);*/
XSync(dpy,False);
}
-
-void backlight_on(void)
-{
- /* we could do something better here! */
-}
-
-void backlight_time(int dummy)
-{
- (void)dummy;
-}