diff options
| author | Justin Heiner <jheiner@rockbox.org> | 2002-09-04 01:51:09 +0000 |
|---|---|---|
| committer | Justin Heiner <jheiner@rockbox.org> | 2002-09-04 01:51:09 +0000 |
| commit | ba349223bf8b80d6f52e30bf3dfcdbf030fd0933 (patch) | |
| tree | 974a145a002a556ce721ad45e54c2a9ec9709914 /uisimulator/win32/Makefile.vc6 | |
| parent | 0ad2010865165120a521272eef68d00b6a7b2edc (diff) | |
| download | rockbox-ba349223bf8b80d6f52e30bf3dfcdbf030fd0933.zip rockbox-ba349223bf8b80d6f52e30bf3dfcdbf030fd0933.tar.gz rockbox-ba349223bf8b80d6f52e30bf3dfcdbf030fd0933.tar.bz2 rockbox-ba349223bf8b80d6f52e30bf3dfcdbf030fd0933.tar.xz | |
wps-display.c
* Made 'Remaining Time' count correctly when doing FF/REW.
* Fixed bug in player_progressbar that caused Illegal Instruction
if the FF/Play went past the end of the song.
wps.c
* Removed 'if(lastbutton!=BUTTON_LEFT)' from track changes.
It was causing tracks to not change unless button was pressed
numerous times quickly :-)
* For player, changed BUTTON_STOP to BUTTON_STOP | BUTTON_REL.
Since stop is also the key to turn the device off, we don't want
it to go to the dir browser unless the stop button is released.
settings_menu.c
* Changed the minimum disk spindown time to 3 seconds, due to
reported problems if set below that.
makefile.vc6
* Fixed the VC makefile to work with both Recorder & Player again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2159 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32/Makefile.vc6')
| -rw-r--r-- | uisimulator/win32/Makefile.vc6 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/uisimulator/win32/Makefile.vc6 b/uisimulator/win32/Makefile.vc6 index e03d4ad..43e6990 100644 --- a/uisimulator/win32/Makefile.vc6 +++ b/uisimulator/win32/Makefile.vc6 @@ -17,21 +17,28 @@ # ############################################################################ + +#CHANGE THIS FIELD TO SPECIFY RECORDER OR PLAYER +TARGET = RECORDER + FIRMWAREDIR = ../../firmware DRIVERS = $(FIRMWAREDIR)/drivers COMMON = $(FIRMWAREDIR)/common APPSCOMMON = ../common SIMDIR = ../win32/ APPDIR = ../../apps/ +PLAYERDIR = $(APPDIR)player/ RECDIR = $(APPDIR)recorder/ RM = del !IF ("$(TARGET)" == "RECORDER") DISPLAY = -DHAVE_LCD_BITMAP KEYPAD = -DHAVE_RECORDER_KEYPAD +MODEL_SPECIFIC_DIR = $(RECDIR) !ELSE DISPLAY = -DHAVE_LCD_CHARCELLS KEYPAD = -DHAVE_PLAYER_KEYPAD +MODEL_SPECIFIC_DIR = $(PLAYERDIR) !ENDIF CC = cl @@ -39,7 +46,7 @@ RC = rc LINK = link DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\" LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows /NOLOGO /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib -INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(RECDIR) +INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(MODEL_SPECIFIC_DIR) LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c @@ -47,6 +54,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c SRCS = *.c \ $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ $(APPDIR)*.c \ + $(PLAYERDIR)*.c \ $(APPSCOMMON)/*.c \ $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c \ $(FIRMWAREDIR)/powermgmt.c \ |