len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 13:45:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed lcd_blit for the (x11) sim

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4148 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2003-12-15 10:25:51 +00:00
parent c4e1bdf016
commit 41cfe303a6
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uisimulator/common/lcd-common.c
View file

@ -29,3 +29,15 @@
#else #else
#include "lcd-x11.h" #include "lcd-x11.h"
#endif #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;
}

17
uisimulator/x11/Makefile
View file

@ -32,6 +32,7 @@ endif
PREVAPPDIR= .. PREVAPPDIR= ..
FIRMWAREDIR = ../../firmware FIRMWAREDIR = ../../firmware
COMMON = $(FIRMWAREDIR)/common COMMON = $(FIRMWAREDIR)/common
SIMCOMMON = ../common
DRIVERS = $(FIRMWAREDIR)/drivers DRIVERS = $(FIRMWAREDIR)/drivers
TOOLSDIR = ../../tools TOOLSDIR = ../../tools
DOCSDIR = ../../docs DOCSDIR = ../../docs
@ -51,7 +52,7 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC)
# Use this for simulator-only files # Use this for simulator-only files
INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ 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) SRCDIRS = . $(DRIVERS) $(FIRMWAREDIR)/export $(APPDIR) $(MACHINEDIR)
# The true Rockbox Applications should use this include path: # The true Rockbox Applications should use this include path:
@ -110,7 +111,8 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
endif endif
SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \ 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) ROCKSRC := $(wildcard $(APPDIR)/plugins/*.c)
ROCKS := $(ROCKSRC:$(APPDIR)/plugins/%.c=$(OBJDIR)/%.rock) ROCKS := $(ROCKSRC:$(APPDIR)/plugins/%.c=$(OBJDIR)/%.rock)
@ -247,16 +249,19 @@ $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c
$(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/lcd-common.o: $(SIMCOMMON)/lcd-common.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/buffer.o: $(FIRMWAREDIR)/buffer.c $(OBJDIR)/buffer.o: $(FIRMWAREDIR)/buffer.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/ctype.o: $(COMMON)/ctype.c $(OBJDIR)/ctype.o: $(COMMON)/ctype.c
$(CC) $(CFLAGS) $(APPINCLUDES) -c $< -o $@ $(CC) $(CFLAGS) $(APPINCLUDES) -c $< -o $@
$(OBJDIR)/stubs.o: ../common/stubs.c $(OBJDIR)/stubs.o: $(SIMCOMMON)/stubs.c
$(CC) $(APPCFLAGS) -c $< -o $@ $(CC) $(APPCFLAGS) -c $< -o $@
$(OBJDIR)/sim_icons.o: ../common/sim_icons.c $(OBJDIR)/sim_icons.o: $(SIMCOMMON)/sim_icons.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c $(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 $(OBJDIR)/lcd-player-charset.o: $(DRIVERS)/lcd-player-charset.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/lcd-playersim.o: ../common/lcd-playersim.c $(OBJDIR)/lcd-playersim.o: $(SIMCOMMON)/lcd-playersim.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/font-player.o: ../common/font-player.c $(OBJDIR)/font-player.o: $(SIMCOMMON)/font-player.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c