diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-05-23 16:23:25 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-05-23 16:23:25 +0000 |
| commit | ac31e6af875eed8dce724604cff94da107a4700b (patch) | |
| tree | 9f2e3cc33933ae69753314ffea509741b35ed45b /apps | |
| parent | ed42300bff0d7e5d6f6af3a41fd5d0249830bdfa (diff) | |
Remote LCD support added to the x11 simulator, take 1. The win32 simulator
still builds, but shows no remote LCD yet.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6510 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 11 | ||||
| -rw-r--r-- | apps/plugins/logo.c | 6 |
2 files changed, 4 insertions, 13 deletions
diff --git a/apps/Makefile b/apps/Makefile index ca2b427155..38b213f372 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -46,13 +46,9 @@ LIBROCKBOX = $(BUILDDIR)/librockbox.a ifdef SIMVER # this is a sim build -COMMONLIB = $(BUILDDIR)/comsim/libcomsim.a -all: $(COMMONLIB) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) - @$(MAKE) -C $(SIMDIR) +all: $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) -$(COMMONLIB): - @$(MAKE) -C $(ROOTDIR)/uisimulator/common else # regular target build all: $(BUILDDIR)/$(BINARY) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) @@ -120,11 +116,6 @@ $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ @echo "LD $(BINARY)" @$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map -$(BUILDDIR)/libsim.a: - @$(MAKE) -C $(SIMDIR) OBJDIR=$(BUILDDIR)/sim - -$(BUILDDIR)/libcomsim.a: - @$(MAKE) -C $(ROOTDIR)/uisimulator/common OBJDIR=$(BUILDDIR)/comsim endif $(BUILDDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 9cace8943c..03250f888f 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -24,9 +24,9 @@ #define DISPLAY_HEIGHT LCD_HEIGHT #define RAND_SCALE 5 -#if defined(IRIVER_H100) && !defined(SIMULATOR) -#define REMOTE_WIDTH 134 -#define REMOTE_HEIGHT 65 +#ifdef HAVE_REMOTE_LCD +#define REMOTE_WIDTH LCD_REMOTE_WIDTH +#define REMOTE_HEIGHT LCD_REMOTE_HEIGHT #define REMOTE_LOGO_WIDTH 91 #define REMOTE_LOGO_HEIGHT 32 #define REMOTE_LOGO rockbox91x32 |