mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-08 12:45:26 -05:00
Removed some files to save space, made bitmap smaller, brought everything up to date
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@802 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Felix Arends
parent
56f7202328
commit
175ac8961e
12 changed files with 104 additions and 28 deletions
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 253 KiB |
BIN
uisimulator/win32/UI256.bmp
Normal file
BIN
uisimulator/win32/UI256.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 85 KiB |
|
|
@ -31,7 +31,7 @@ void button_init(void)
|
|||
last_key = 0 ;
|
||||
}
|
||||
|
||||
int button_get(void)
|
||||
int button_get(bool block)
|
||||
{
|
||||
int btn = 0;
|
||||
if (KEY (VK_NUMPAD4) ||
|
||||
|
|
|
|||
|
|
@ -22,12 +22,15 @@ TARGET = rockboxui
|
|||
FIRMWAREDIR = ../../firmware
|
||||
DRIVERS = $(FIRMWAREDIR)/drivers
|
||||
COMMON = $(FIRMWAREDIR)/common
|
||||
SIMDIR = ../win32/
|
||||
APPDIR = ../../apps/
|
||||
RECDIR = $(APPDIR)recorder/
|
||||
RM = del
|
||||
|
||||
CC = cl
|
||||
DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR -DARCHOS_RECORDER -D_WIN32 -DWIN32
|
||||
LDFLAGS = /ouisw32.exe /link -subsystem:windows
|
||||
INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON)
|
||||
INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(SIMDIR) -I$(APPDIR) -I$(RECDIR)
|
||||
LIBS = gdi32.lib user32.lib
|
||||
|
||||
|
||||
|
|
@ -35,8 +38,10 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb"
|
|||
|
||||
#SRCS = $(wildcard *.c)
|
||||
|
||||
SRCS = lcd-win32.c tetris.c uisw32.c lcd.c button.c tree.c app.c \
|
||||
chartables.c kernel.c Release/uisw32.res dir-win32.c
|
||||
SRCS = lcd-win32.c tetris.c uisw32.c lcd.c button.c tree.c main.c \
|
||||
chartables.c kernel.c uisw32.res dir-win32.c main_menu.c \
|
||||
play.c bmp.c debug-win32.c screensaver.c menu.c credits.c \
|
||||
icons.c sound_menu.c mpeg.c id3.c settings.c sprintf.c
|
||||
|
||||
OBJS = $(SRCS:.c=.obj)
|
||||
|
||||
|
|
@ -49,14 +54,47 @@ lcd.obj: $(DRIVERS)/lcd.c
|
|||
chartables.obj: $(FIRMWAREDIR)/chartables.c
|
||||
$(CC) $(CFLAGS) -c $(FIRMWAREDIR)/chartables.c -ochartables.obj
|
||||
|
||||
tetris.obj: ../tetris.c
|
||||
$(CC) $(CFLAGS) -c ../tetris.c -otetris.obj
|
||||
tetris.obj: ../../apps/recorder/tetris.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/recorder/tetris.c -otetris.obj
|
||||
|
||||
tree.obj: ../tree.c
|
||||
$(CC) $(CFLAGS) -c ../tree.c -otree.obj
|
||||
tree.obj: ../../apps/tree.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/tree.c -otree.obj
|
||||
|
||||
app.obj: ../app.c
|
||||
$(CC) $(CFLAGS) -c ../app.c -oapp.obj
|
||||
main.obj: ../../apps/main.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/main.c -omain.obj
|
||||
|
||||
main_menu.obj: ../../apps/main_menu.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/main_menu.c -omain_menu.obj
|
||||
|
||||
play.obj: ../../apps/play.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/play.c -oplay.obj
|
||||
|
||||
bmp.obj: ../../apps/recorder/bmp.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/recorder/bmp.c -obmp.obj
|
||||
|
||||
screensaver.obj: ../../apps/recorder/screensaver.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/recorder/screensaver.c -oscreensaver.obj
|
||||
|
||||
menu.obj: ../../apps/menu.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/menu.c -omenu.obj
|
||||
|
||||
credits.obj: ../../apps/credits.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/credits.c -ocredits.obj
|
||||
|
||||
icons.obj: ../../apps/recorder/icons.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/recorder/icons.c -oicons.obj
|
||||
|
||||
sound_menu.obj: ../../apps/sound_menu.c
|
||||
$(CC) $(CFLAGS) -c ../../apps/sound_menu.c -osound_menu.obj
|
||||
|
||||
id3.obj: $(FIRMWAREDIR)/id3.c
|
||||
$(CC) $(CFLAGS) -c $(FIRMWAREDIR)/id3.c -oid3.obj
|
||||
|
||||
settings.obj: $(FIRMWAREDIR)/settings.c
|
||||
$(CC) $(CFLAGS) -c $(FIRMWAREDIR)/settings.c -osettings.obj
|
||||
|
||||
sprintf.obj: $(FIRMWAREDIR)/common/sprintf.c
|
||||
$(CC) $(CFLAGS) -c $(FIRMWAREDIR)/common/sprintf.c -osprintf.obj
|
||||
|
||||
clean:
|
||||
$(RM) *.obj
|
||||
|
|
@ -26,7 +26,7 @@ char panic_buf[128];
|
|||
// whatever it says ;)
|
||||
void panic( char *message )
|
||||
{
|
||||
debug( message );
|
||||
debugf ( message );
|
||||
PostQuitMessage (-1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,15 @@
|
|||
// Used by uisw32.rc
|
||||
//
|
||||
#define IDB_BITMAP1 102
|
||||
#define IDB_UI 102
|
||||
#define IDR_JPG1 103
|
||||
#define IDB_BITMAP2 104
|
||||
#define IDB_UI 104
|
||||
|
||||
// Next default values for new objects
|
||||
//
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||
#define _APS_NEXT_RESOURCE_VALUE 103
|
||||
#define _APS_NEXT_RESOURCE_VALUE 105
|
||||
#define _APS_NEXT_COMMAND_VALUE 40001
|
||||
#define _APS_NEXT_CONTROL_VALUE 1001
|
||||
#define _APS_NEXT_SYMED_VALUE 101
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -50,7 +50,7 @@ LRESULT GUIWndProc (
|
|||
case WM_CREATE:
|
||||
// load background image
|
||||
hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI),
|
||||
IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
|
||||
IMAGE_BITMAP, 0, 0, LR_VGACOLOR);
|
||||
hMemDc = CreateCompatibleDC (GetDC (hWnd));
|
||||
SelectObject (hMemDc, hBkgnd);
|
||||
return TRUE;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ END
|
|||
// Bitmap
|
||||
//
|
||||
|
||||
IDB_UI BITMAP "UI.bmp"
|
||||
IDB_UI BITMAP "UI256.bmp"
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -19,8 +19,8 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""C:\Programming\CVS Checkout\RockBox\firmware";"C:\Programming\CVS Checkout\RockBox\firmware\drivers";"C:\Programming\CVS Checkout\RockBox\firmware\common""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ARCHOS_RECORDER;SIMULATOR;HAVE_LCD_BITMAP"
|
||||
AdditionalIncludeDirectories=""C:\Programming\CVS Checkout\RockBox\apps\recorder";"C:\Programming\CVS Checkout\RockBox\apps";"C:\Programming\CVS Checkout\RockBox\firmware";"C:\Programming\CVS Checkout\RockBox\uisimulator\win32";"C:\Programming\CVS Checkout\RockBox\firmware\drivers";"C:\Programming\CVS Checkout\RockBox\firmware\common""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ARCHOS_RECORDER;SIMULATOR;HAVE_LCD_BITMAP;SIMULATOR;"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
|
||||
<File
|
||||
RelativePath="..\app.c">
|
||||
RelativePath="..\..\apps\recorder\bmp.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="button.c">
|
||||
|
|
@ -115,6 +115,9 @@
|
|||
<File
|
||||
RelativePath="..\..\firmware\chartables.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\apps\credits.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="debug-win32.c">
|
||||
</File>
|
||||
|
|
@ -122,10 +125,7 @@
|
|||
RelativePath="dir-win32.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\firmware\disk.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\icons.c">
|
||||
RelativePath="..\..\apps\recorder\icons.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\firmware\id3.c">
|
||||
|
|
@ -140,31 +140,67 @@
|
|||
RelativePath="..\..\firmware\drivers\lcd.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\menu.c">
|
||||
RelativePath="..\..\apps\main.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\apps\main_menu.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\apps\menu.c">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="mpeg.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="panic-win32.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\play.c">
|
||||
RelativePath="..\..\apps\play.c">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\firmware\playlist.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\screensaver.c">
|
||||
RelativePath="..\..\apps\recorder\screensaver.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\firmware\settings.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\apps\sound_menu.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\firmware\common\sprintf.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\tetris.c">
|
||||
RelativePath="..\..\apps\recorder\tetris.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\tree.c">
|
||||
RelativePath="..\..\apps\tree.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="uisw32.c">
|
||||
|
|
@ -202,7 +238,7 @@
|
|||
Name="Resource Files"
|
||||
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
|
||||
<File
|
||||
RelativePath="UI.bmp">
|
||||
RelativePath="UI256.bmp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="uisw32.rc">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue