devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

build and work with the new include path(s)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3214 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2003-02-07 09:42:57 +00:00
parent f9b4490066
commit ae26233817
6 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uisimulator/x11/Makefile
View file

@ -32,7 +32,6 @@ endif
PREVAPPDIR= .. PREVAPPDIR= ..
FIRMWAREDIR = ../../firmware FIRMWAREDIR = ../../firmware
DRIVERS = $(FIRMWAREDIR)/drivers DRIVERS = $(FIRMWAREDIR)/drivers
COMMON = $(FIRMWAREDIR)/common
LIBMADDIR = $(PREVAPPDIR)/common/libmad LIBMADDIR = $(PREVAPPDIR)/common/libmad
TOOLSDIR = ../../tools TOOLSDIR = ../../tools
DOCSDIR = ../../docs DOCSDIR = ../../docs
@ -53,11 +52,12 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC)
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
# Use this for simulator-only files # Use this for simulator-only files
INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(OBJDIR) INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \
SRCDIRS = . $(DRIVERS) $(COMMON) $(FIRMWAREDIR) $(APPDIR) $(MACHINEDIR) -I$(MACHINEDIR) -I../common -I$(OBJDIR)
SRCDIRS = . $(DRIVERS) $(FIRMWAREDIR)/export $(APPDIR) $(MACHINEDIR)
# The true Rockbox Applications should use this include path: # The true Rockbox Applications should use this include path:
APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) APPINCLUDES = $(INCLUDES)
LIBS = -lpthread LIBS = -lpthread
@ -85,8 +85,8 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
else else
LCDSRSC = lcd-playersim.c lcd-player.c font-player.c lcd-player-charset.c LCDSRSC = lcd-playersim.c lcd-player.c font-player.c lcd-player-charset.c
endif endif
FIRMSRCS = $(LCDSRSC) sprintf.c id3.c debug.c usb.c mpeg.c power.c\ FIRMSRCS = $(LCDSRSC) id3.c debug.c usb.c mpeg.c power.c\
powermgmt.c panic.c ctype.c powermgmt.c panic.c
APPS = main.c tree.c menu.c credits.c main_menu.c language.c\ APPS = main.c tree.c menu.c credits.c main_menu.c language.c\
playlist.c wps.c wps-display.c settings.c status.c icons.c\ playlist.c wps.c wps-display.c settings.c status.c icons.c\
@ -284,7 +284,7 @@ $(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: ../common/stubs.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(APPCFLAGS) -c $< -o $@
$(OBJDIR)/sim_icons.o: ../common/sim_icons.c $(OBJDIR)/sim_icons.o: ../common/sim_icons.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@

2
uisimulator/x11/atoi.h Normal file
View file

@ -0,0 +1,2 @@
int atoi(const char *);

2
uisimulator/x11/kernel.h
View file

@ -17,7 +17,7 @@
* *
****************************************************************************/ ****************************************************************************/
#include "../../firmware/include/kernel.h" #include "../../firmware/export/kernel.h"
#define sleep(x) x11_sleep(x) #define sleep(x) x11_sleep(x)

7
uisimulator/x11/lcd-x11.c
View file

@ -46,6 +46,8 @@ extern Display *dpy;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
unsigned char lcd_framebuffer_copy[LCD_WIDTH][LCD_HEIGHT/8]; unsigned char lcd_framebuffer_copy[LCD_WIDTH][LCD_HEIGHT/8];
static int counter;
void lcd_update (void) void lcd_update (void)
{ {
int x, y; int x, y;
@ -55,6 +57,8 @@ void lcd_update (void)
int cp=0; int cp=0;
struct coordinate clearpoints[LCD_WIDTH * LCD_HEIGHT]; struct coordinate clearpoints[LCD_WIDTH * LCD_HEIGHT];
fprintf(stderr, "%04d: lcd_update()\n", counter++);
for(y=0; y<LCD_HEIGHT; y+=8) { for(y=0; y<LCD_HEIGHT; y+=8) {
for(x=0; x<LCD_WIDTH; x++) { for(x=0; x<LCD_WIDTH; x++) {
if(lcd_framebuffer[x][y/8] || lcd_framebuffer_copy[x][y/8]) { if(lcd_framebuffer[x][y/8] || lcd_framebuffer_copy[x][y/8]) {
@ -104,6 +108,9 @@ void lcd_update_rect(int x_start, int y_start,
struct coordinate points[LCD_WIDTH * LCD_HEIGHT]; struct coordinate points[LCD_WIDTH * LCD_HEIGHT];
struct coordinate clearpoints[LCD_WIDTH * LCD_HEIGHT]; struct coordinate clearpoints[LCD_WIDTH * LCD_HEIGHT];
fprintf(stderr, "%04d: lcd_update_rect(%d, %d, %d, %d)\n",
counter++, x_start, y_start, width, height);
/* The Y coordinates have to work on even 8 pixel rows */ /* The Y coordinates have to work on even 8 pixel rows */
ymax = (yline + height)/8; ymax = (yline + height)/8;
yline /= 8; yline /= 8;

5
uisimulator/x11/sprintf.h Normal file
View file

@ -0,0 +1,5 @@
#include <stdarg.h>
#include <stdio.h>
int snprintf (char *buf, size_t size, const char *fmt, ...);

2
uisimulator/x11/timefuncs.h Normal file
View file

@ -0,0 +1,2 @@
/* struct tm defined */