diff options
Diffstat (limited to 'uisimulator/x11')
-rw-r--r-- | uisimulator/x11/Makefile | 9 | ||||
-rw-r--r-- | uisimulator/x11/lcd-x11.c | 10 |
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 | |||
42 | KEYPAD = -DHAVE_RECORDER_KEYPAD | 42 | KEYPAD = -DHAVE_RECORDER_KEYPAD |
43 | 43 | ||
44 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 44 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
45 | $(KEYPAD) $(DISPLAY) | 45 | $(KEYPAD) $(DISPLAY) -DLCD_PROPFONTS |
46 | 46 | ||
47 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 47 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
48 | 48 | ||
@@ -69,7 +69,7 @@ ifdef MPEG_PLAY | |||
69 | INCLUDES += -I$(PREVAPPDIR)/common | 69 | INCLUDES += -I$(PREVAPPDIR)/common |
70 | endif | 70 | endif |
71 | 71 | ||
72 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall | 72 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall |
73 | 73 | ||
74 | APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall | 74 | APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall |
75 | 75 | ||
@@ -84,7 +84,7 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | |||
84 | APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c | 84 | APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c |
85 | endif | 85 | endif |
86 | 86 | ||
87 | SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \ | 87 | SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \ |
88 | button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS) | 88 | button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS) |
89 | 89 | ||
90 | ifdef MPEG_PLAY | 90 | ifdef MPEG_PLAY |
@@ -221,6 +221,9 @@ $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c | |||
221 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c | 221 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c |
222 | $(CC) $(CFLAGS) -c $< -o $@ | 222 | $(CC) $(CFLAGS) -c $< -o $@ |
223 | 223 | ||
224 | $(OBJDIR)/stubs.o: ../common/stubs.c | ||
225 | $(CC) $(CFLAGS) -c $< -o $@ | ||
226 | |||
224 | 227 | ||
225 | # these ones are simulator-specific | 228 | # these ones are simulator-specific |
226 | 229 | ||
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) | |||
109 | /* Logf("lcd_update: Draws %d pixels, clears %d pixels", p, cp);*/ | 109 | /* Logf("lcd_update: Draws %d pixels, clears %d pixels", p, cp);*/ |
110 | XSync(dpy,False); | 110 | XSync(dpy,False); |
111 | } | 111 | } |
112 | |||
113 | void backlight_on(void) | ||
114 | { | ||
115 | /* we could do something better here! */ | ||
116 | } | ||
117 | |||
118 | void backlight_time(int dummy) | ||
119 | { | ||
120 | (void)dummy; | ||
121 | } | ||