summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-12-15 10:25:51 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-12-15 10:25:51 +0000
commit41cfe303a6bf496bd782366e9d0dd00b9e809632 (patch)
tree5493f6b444db3c0230f6a68ad3212a60812e2e1d /uisimulator
parentc4e1bdf0163d2f04d4f8577050f8cc23638e9490 (diff)
downloadrockbox-41cfe303a6bf496bd782366e9d0dd00b9e809632.tar.gz
rockbox-41cfe303a6bf496bd782366e9d0dd00b9e809632.tar.bz2
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.c12
-rw-r--r--uisimulator/x11/Makefile17
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 @@
#else
#include "lcd-x11.h"
#endif
+
+void lcd_blit(unsigned char* p_data, int x, int y, int width, int height,
+ int stride)
+{
+ (void)p_data;
+ (void)x;
+ (void)y;
+ (void)width;
+ (void)height;
+ (void)stride;
+}
+
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
PREVAPPDIR= ..
FIRMWAREDIR = ../../firmware
COMMON = $(FIRMWAREDIR)/common
+SIMCOMMON = ../common
DRIVERS = $(FIRMWAREDIR)/drivers
TOOLSDIR = ../../tools
DOCSDIR = ../../docs
@@ -51,7 +52,7 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC)
# Use this for simulator-only files
INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \
--I$(MACHINEDIR) -I../common -I$(OBJDIR)
+-I$(MACHINEDIR) -I$(SIMCOMMON) -I$(OBJDIR)
SRCDIRS = . $(DRIVERS) $(FIRMWAREDIR)/export $(APPDIR) $(MACHINEDIR)
# The true Rockbox Applications should use this include path:
@@ -110,7 +111,8 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
endif
SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \
- button-x11.c io.c thread.c sim_icons.c $(APPS) $(MENUS) $(FIRMSRCS)
+ button-x11.c io.c thread.c sim_icons.c $(APPS) $(MENUS) $(FIRMSRCS) \
+ lcd-common.c
ROCKSRC := $(wildcard $(APPDIR)/plugins/*.c)
ROCKS := $(ROCKSRC:$(APPDIR)/plugins/%.c=$(OBJDIR)/%.rock)
@@ -247,16 +249,19 @@ $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c
$(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
$(CC) $(CFLAGS) -c $< -o $@
+$(OBJDIR)/lcd-common.o: $(SIMCOMMON)/lcd-common.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
$(OBJDIR)/buffer.o: $(FIRMWAREDIR)/buffer.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/ctype.o: $(COMMON)/ctype.c
$(CC) $(CFLAGS) $(APPINCLUDES) -c $< -o $@
-$(OBJDIR)/stubs.o: ../common/stubs.c
+$(OBJDIR)/stubs.o: $(SIMCOMMON)/stubs.c
$(CC) $(APPCFLAGS) -c $< -o $@
-$(OBJDIR)/sim_icons.o: ../common/sim_icons.c
+$(OBJDIR)/sim_icons.o: $(SIMCOMMON)/sim_icons.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
@@ -277,10 +282,10 @@ $(OBJDIR)/power.o: $(DRIVERS)/power.c
$(OBJDIR)/lcd-player-charset.o: $(DRIVERS)/lcd-player-charset.c
$(CC) $(CFLAGS) -c $< -o $@
-$(OBJDIR)/lcd-playersim.o: ../common/lcd-playersim.c
+$(OBJDIR)/lcd-playersim.o: $(SIMCOMMON)/lcd-playersim.c
$(CC) $(CFLAGS) -c $< -o $@
-$(OBJDIR)/font-player.o: ../common/font-player.c
+$(OBJDIR)/font-player.o: $(SIMCOMMON)/font-player.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c