diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-12-15 10:25:51 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-12-15 10:25:51 +0000 |
commit | 41cfe303a6bf496bd782366e9d0dd00b9e809632 (patch) | |
tree | 5493f6b444db3c0230f6a68ad3212a60812e2e1d /uisimulator | |
parent | c4e1bdf0163d2f04d4f8577050f8cc23638e9490 (diff) | |
download | rockbox-41cfe303a6bf496bd782366e9d0dd00b9e809632.tar.gz rockbox-41cfe303a6bf496bd782366e9d0dd00b9e809632.zip |
fixed lcd_blit for the (x11) sim
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4148 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/common/lcd-common.c | 12 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 17 |
2 files changed, 23 insertions, 6 deletions
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c index 52a98eec58..719c61b488 100644 --- a/uisimulator/common/lcd-common.c +++ b/uisimulator/common/lcd-common.c | |||
@@ -29,3 +29,15 @@ | |||
29 | #else | 29 | #else |
30 | #include "lcd-x11.h" | 30 | #include "lcd-x11.h" |
31 | #endif | 31 | #endif |
32 | |||
33 | void lcd_blit(unsigned char* p_data, int x, int y, int width, int height, | ||
34 | int stride) | ||
35 | { | ||
36 | (void)p_data; | ||
37 | (void)x; | ||
38 | (void)y; | ||
39 | (void)width; | ||
40 | (void)height; | ||
41 | (void)stride; | ||
42 | } | ||
43 | |||
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index c4b47790a5..6e4ed61b88 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -32,6 +32,7 @@ endif | |||
32 | PREVAPPDIR= .. | 32 | PREVAPPDIR= .. |
33 | FIRMWAREDIR = ../../firmware | 33 | FIRMWAREDIR = ../../firmware |
34 | COMMON = $(FIRMWAREDIR)/common | 34 | COMMON = $(FIRMWAREDIR)/common |
35 | SIMCOMMON = ../common | ||
35 | DRIVERS = $(FIRMWAREDIR)/drivers | 36 | DRIVERS = $(FIRMWAREDIR)/drivers |
36 | TOOLSDIR = ../../tools | 37 | TOOLSDIR = ../../tools |
37 | DOCSDIR = ../../docs | 38 | DOCSDIR = ../../docs |
@@ -51,7 +52,7 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC) | |||
51 | 52 | ||
52 | # Use this for simulator-only files | 53 | # Use this for simulator-only files |
53 | INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ | 54 | INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ |
54 | -I$(MACHINEDIR) -I../common -I$(OBJDIR) | 55 | -I$(MACHINEDIR) -I$(SIMCOMMON) -I$(OBJDIR) |
55 | SRCDIRS = . $(DRIVERS) $(FIRMWAREDIR)/export $(APPDIR) $(MACHINEDIR) | 56 | SRCDIRS = . $(DRIVERS) $(FIRMWAREDIR)/export $(APPDIR) $(MACHINEDIR) |
56 | 57 | ||
57 | # The true Rockbox Applications should use this include path: | 58 | # The true Rockbox Applications should use this include path: |
@@ -110,7 +111,8 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | |||
110 | endif | 111 | endif |
111 | 112 | ||
112 | SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \ | 113 | SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \ |
113 | button-x11.c io.c thread.c sim_icons.c $(APPS) $(MENUS) $(FIRMSRCS) | 114 | button-x11.c io.c thread.c sim_icons.c $(APPS) $(MENUS) $(FIRMSRCS) \ |
115 | lcd-common.c | ||
114 | 116 | ||
115 | ROCKSRC := $(wildcard $(APPDIR)/plugins/*.c) | 117 | ROCKSRC := $(wildcard $(APPDIR)/plugins/*.c) |
116 | ROCKS := $(ROCKSRC:$(APPDIR)/plugins/%.c=$(OBJDIR)/%.rock) | 118 | ROCKS := $(ROCKSRC:$(APPDIR)/plugins/%.c=$(OBJDIR)/%.rock) |
@@ -247,16 +249,19 @@ $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c | |||
247 | $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c | 249 | $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c |
248 | $(CC) $(CFLAGS) -c $< -o $@ | 250 | $(CC) $(CFLAGS) -c $< -o $@ |
249 | 251 | ||
252 | $(OBJDIR)/lcd-common.o: $(SIMCOMMON)/lcd-common.c | ||
253 | $(CC) $(CFLAGS) -c $< -o $@ | ||
254 | |||
250 | $(OBJDIR)/buffer.o: $(FIRMWAREDIR)/buffer.c | 255 | $(OBJDIR)/buffer.o: $(FIRMWAREDIR)/buffer.c |
251 | $(CC) $(CFLAGS) -c $< -o $@ | 256 | $(CC) $(CFLAGS) -c $< -o $@ |
252 | 257 | ||
253 | $(OBJDIR)/ctype.o: $(COMMON)/ctype.c | 258 | $(OBJDIR)/ctype.o: $(COMMON)/ctype.c |
254 | $(CC) $(CFLAGS) $(APPINCLUDES) -c $< -o $@ | 259 | $(CC) $(CFLAGS) $(APPINCLUDES) -c $< -o $@ |
255 | 260 | ||
256 | $(OBJDIR)/stubs.o: ../common/stubs.c | 261 | $(OBJDIR)/stubs.o: $(SIMCOMMON)/stubs.c |
257 | $(CC) $(APPCFLAGS) -c $< -o $@ | 262 | $(CC) $(APPCFLAGS) -c $< -o $@ |
258 | 263 | ||
259 | $(OBJDIR)/sim_icons.o: ../common/sim_icons.c | 264 | $(OBJDIR)/sim_icons.o: $(SIMCOMMON)/sim_icons.c |
260 | $(CC) $(CFLAGS) -c $< -o $@ | 265 | $(CC) $(CFLAGS) -c $< -o $@ |
261 | 266 | ||
262 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c | 267 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c |
@@ -277,10 +282,10 @@ $(OBJDIR)/power.o: $(DRIVERS)/power.c | |||
277 | $(OBJDIR)/lcd-player-charset.o: $(DRIVERS)/lcd-player-charset.c | 282 | $(OBJDIR)/lcd-player-charset.o: $(DRIVERS)/lcd-player-charset.c |
278 | $(CC) $(CFLAGS) -c $< -o $@ | 283 | $(CC) $(CFLAGS) -c $< -o $@ |
279 | 284 | ||
280 | $(OBJDIR)/lcd-playersim.o: ../common/lcd-playersim.c | 285 | $(OBJDIR)/lcd-playersim.o: $(SIMCOMMON)/lcd-playersim.c |
281 | $(CC) $(CFLAGS) -c $< -o $@ | 286 | $(CC) $(CFLAGS) -c $< -o $@ |
282 | 287 | ||
283 | $(OBJDIR)/font-player.o: ../common/font-player.c | 288 | $(OBJDIR)/font-player.o: $(SIMCOMMON)/font-player.c |
284 | $(CC) $(CFLAGS) -c $< -o $@ | 289 | $(CC) $(CFLAGS) -c $< -o $@ |
285 | 290 | ||
286 | $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c | 291 | $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c |