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 | |
parent | 0ad2010865165120a521272eef68d00b6a7b2edc (diff) | |
download | rockbox-ba349223bf8b80d6f52e30bf3dfcdbf030fd0933.tar.gz rockbox-ba349223bf8b80d6f52e30bf3dfcdbf030fd0933.zip |
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')
-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 e03d4ade4d..43e6990d38 100644 --- a/uisimulator/win32/Makefile.vc6 +++ b/uisimulator/win32/Makefile.vc6 | |||
@@ -17,21 +17,28 @@ | |||
17 | # | 17 | # |
18 | ############################################################################ | 18 | ############################################################################ |
19 | 19 | ||
20 | |||
21 | #CHANGE THIS FIELD TO SPECIFY RECORDER OR PLAYER | ||
22 | TARGET = RECORDER | ||
23 | |||
20 | FIRMWAREDIR = ../../firmware | 24 | FIRMWAREDIR = ../../firmware |
21 | DRIVERS = $(FIRMWAREDIR)/drivers | 25 | DRIVERS = $(FIRMWAREDIR)/drivers |
22 | COMMON = $(FIRMWAREDIR)/common | 26 | COMMON = $(FIRMWAREDIR)/common |
23 | APPSCOMMON = ../common | 27 | APPSCOMMON = ../common |
24 | SIMDIR = ../win32/ | 28 | SIMDIR = ../win32/ |
25 | APPDIR = ../../apps/ | 29 | APPDIR = ../../apps/ |
30 | PLAYERDIR = $(APPDIR)player/ | ||
26 | RECDIR = $(APPDIR)recorder/ | 31 | RECDIR = $(APPDIR)recorder/ |
27 | RM = del | 32 | RM = del |
28 | 33 | ||
29 | !IF ("$(TARGET)" == "RECORDER") | 34 | !IF ("$(TARGET)" == "RECORDER") |
30 | DISPLAY = -DHAVE_LCD_BITMAP | 35 | DISPLAY = -DHAVE_LCD_BITMAP |
31 | KEYPAD = -DHAVE_RECORDER_KEYPAD | 36 | KEYPAD = -DHAVE_RECORDER_KEYPAD |
37 | MODEL_SPECIFIC_DIR = $(RECDIR) | ||
32 | !ELSE | 38 | !ELSE |
33 | DISPLAY = -DHAVE_LCD_CHARCELLS | 39 | DISPLAY = -DHAVE_LCD_CHARCELLS |
34 | KEYPAD = -DHAVE_PLAYER_KEYPAD | 40 | KEYPAD = -DHAVE_PLAYER_KEYPAD |
41 | MODEL_SPECIFIC_DIR = $(PLAYERDIR) | ||
35 | !ENDIF | 42 | !ENDIF |
36 | 43 | ||
37 | CC = cl | 44 | CC = cl |
@@ -39,7 +46,7 @@ RC = rc | |||
39 | LINK = link | 46 | LINK = link |
40 | DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\" | 47 | DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\" |
41 | LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows /NOLOGO /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib | 48 | LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows /NOLOGO /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib |
42 | INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(RECDIR) | 49 | INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(MODEL_SPECIFIC_DIR) |
43 | LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib | 50 | LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib |
44 | 51 | ||
45 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c | 52 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c |
@@ -47,6 +54,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c | |||
47 | SRCS = *.c \ | 54 | SRCS = *.c \ |
48 | $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ | 55 | $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ |
49 | $(APPDIR)*.c \ | 56 | $(APPDIR)*.c \ |
57 | $(PLAYERDIR)*.c \ | ||
50 | $(APPSCOMMON)/*.c \ | 58 | $(APPSCOMMON)/*.c \ |
51 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c \ | 59 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c \ |
52 | $(FIRMWAREDIR)/powermgmt.c \ | 60 | $(FIRMWAREDIR)/powermgmt.c \ |