diff options
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/Makefile | 5 | ||||
-rw-r--r-- | uisimulator/win32/lcd-win32.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 3a84a2dd70..4cdcef345e 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -68,7 +68,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c\ | |||
68 | MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c | 68 | MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c |
69 | 69 | ||
70 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 70 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
71 | APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c | 71 | APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c widgets.c |
72 | endif | 72 | endif |
73 | 73 | ||
74 | SRCS = button.c dir-win32.c lcd-win32.c panic-win32.c thread-win32.c \ | 74 | SRCS = button.c dir-win32.c lcd-win32.c panic-win32.c thread-win32.c \ |
@@ -116,6 +116,9 @@ $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c | |||
116 | $(OBJDIR)/icons.o: $(RECDIR)/icons.c | 116 | $(OBJDIR)/icons.o: $(RECDIR)/icons.c |
117 | $(CC) $(APPCFLAGS) -c $< -o $@ | 117 | $(CC) $(APPCFLAGS) -c $< -o $@ |
118 | 118 | ||
119 | $(OBJDIR)/widgets.o: $(RECDIR)/widgets.c | ||
120 | $(CC) $(APPCFLAGS) -c $< -o $@ | ||
121 | |||
119 | $(OBJDIR)/tetris.o: $(RECDIR)/tetris.c | 122 | $(OBJDIR)/tetris.o: $(RECDIR)/tetris.c |
120 | $(CC) $(APPCFLAGS) -c $< -o $@ | 123 | $(CC) $(APPCFLAGS) -c $< -o $@ |
121 | 124 | ||
diff --git a/uisimulator/win32/lcd-win32.c b/uisimulator/win32/lcd-win32.c index 510117ed9d..102e262346 100644 --- a/uisimulator/win32/lcd-win32.c +++ b/uisimulator/win32/lcd-win32.c | |||
@@ -27,7 +27,7 @@ | |||
27 | // | 27 | // |
28 | 28 | ||
29 | // varaibles | 29 | // varaibles |
30 | unsigned char display[LCD_WIDTH][LCD_HEIGHT/8]; // the display | 30 | unsigned char lcd_framebuffer[LCD_WIDTH][LCD_HEIGHT/8]; // the display |
31 | char bitmap[LCD_HEIGHT][LCD_WIDTH]; // the ui display | 31 | char bitmap[LCD_HEIGHT][LCD_WIDTH]; // the ui display |
32 | 32 | ||
33 | BITMAPINFO2 bmi = | 33 | BITMAPINFO2 bmi = |
@@ -54,7 +54,7 @@ void lcd_update() | |||
54 | 54 | ||
55 | for (x = 0; x < LCD_WIDTH; x++) | 55 | for (x = 0; x < LCD_WIDTH; x++) |
56 | for (y = 0; y < LCD_HEIGHT; y++) | 56 | for (y = 0; y < LCD_HEIGHT; y++) |
57 | bitmap[y][x] = ((display[x][y/8] >> (y & 7)) & 1); | 57 | bitmap[y][x] = ((lcd_framebuffer[x][y/8] >> (y & 7)) & 1); |
58 | 58 | ||
59 | InvalidateRect (hGUIWnd, NULL, FALSE); | 59 | InvalidateRect (hGUIWnd, NULL, FALSE); |
60 | 60 | ||