diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-09-03 08:30:15 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-09-03 08:30:15 +0000 |
| commit | 7f22b84793237c065de5b455e597fcc64fd50f0e (patch) | |
| tree | 1e789319793b46e78bafe7055b9a81d50306e652 | |
| parent | 644e4ce792817be267373b7713c07fe10ea76278 (diff) | |
| download | rockbox-7f22b84793237c065de5b455e597fcc64fd50f0e.zip rockbox-7f22b84793237c065de5b455e597fcc64fd50f0e.tar.gz rockbox-7f22b84793237c065de5b455e597fcc64fd50f0e.tar.bz2 rockbox-7f22b84793237c065de5b455e597fcc64fd50f0e.tar.xz | |
Now handles both player/ and recorder/ directories
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2146 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | uisimulator/x11/Makefile | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index d894eee..f7a928a 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -19,6 +19,13 @@ APPDIR = ../../apps RECDIR = $(APPDIR)/recorder +PLAYDIR = $(APPDIR)/player + +ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) + MACHINEDIR = $(RECDIR) +else + MACHINEDIR = $(PLAYDIR) +endif PREVAPPDIR= .. FIRMWAREDIR = ../../firmware @@ -42,8 +49,8 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl # Use this for simulator-only files -INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR) -I../common -SRCDIRS = . $(DRIVERS) $(COMMON) $(FIRMWAREDIR) $(APPDIR) $(RECDIR) +INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common +SRCDIRS = . $(DRIVERS) $(COMMON) $(FIRMWAREDIR) $(APPDIR) $(MACHINEDIR) # The true Rockbox Applications should use this include path: APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) @@ -78,12 +85,12 @@ ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES))) endif APPS = main.c tree.c menu.c credits.c main_menu.c\ - playlist.c showtext.c wps.c wps-display.c settings.c status.c + playlist.c showtext.c wps.c wps-display.c settings.c status.c icons.c MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) - APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \ + APPS += tetris.c sokoban.c blank.c bounce.c boxes.c bmp.c \ widgets.c wormlet.c endif @@ -170,7 +177,7 @@ $(OBJDIR)/screensavers_menu.o: $(APPDIR)/screensavers_menu.c $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c $(CC) $(APPCFLAGS) -c $< -o $@ -$(OBJDIR)/icons.o: $(RECDIR)/icons.c +$(OBJDIR)/icons.o: $(MACHINEDIR)/icons.c $(CC) $(APPCFLAGS) -c $< -o $@ $(OBJDIR)/widgets.o: $(RECDIR)/widgets.c |