summaryrefslogtreecommitdiffstats
path: root/uisimulator/win32
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-09-03 10:13:46 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-09-03 10:13:46 +0000
commit62794583efb6a303937e99201d78e8736592c5d7 (patch)
treeb3e79e7822f7416be8410609004519137539da77 /uisimulator/win32
parentc521ed128d1afeea9bfad134358f6c3a7df9f2c0 (diff)
downloadrockbox-62794583efb6a303937e99201d78e8736592c5d7.tar.gz
rockbox-62794583efb6a303937e99201d78e8736592c5d7.zip
Updated win32 Makefile
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2150 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32')
-rw-r--r--uisimulator/win32/Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index 43adca3cb4..0a88e91d0f 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/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,7 +49,7 @@ $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\"
LDFLAGS = -lgdi32 -luser32 -mwindows
# Use this for simulator-only files
-INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR) -I../common
+INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR)
# The true Rockbox Applications should use this include path:
APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES)
@@ -56,13 +63,13 @@ APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mwindows
FIRMSRCS = chartables.c lcd.c power.c sprintf.c id3.c usb.c \
mpeg.c powermgmt.c
-APPS = main.c tree.c menu.c credits.c main_menu.c\
+APPS = main.c tree.c menu.c credits.c main_menu.c icons.c \
playlist.c showtext.c wps.c wps-display.c settings.c status.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
@@ -108,7 +115,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