len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed some files to save space, made bitmap smaller, brought everything up to date

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@802 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Felix Arends 2002-05-29 16:34:40 +00:00
parent 56f7202328
commit 175ac8961e
12 changed files with 104 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
uisimulator/win32/Release/uisw32.res
View file

Binary file not shown.

BIN
uisimulator/win32/UI.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 253 KiB

BIN
uisimulator/win32/UI256.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 85 KiB

2
uisimulator/win32/button.c
View file

@ -31,7 +31,7 @@ void button_init(void)
last_key = 0 ; last_key = 0 ;
} }
int button_get(void) int button_get(bool block)
{ {
int btn = 0; int btn = 0;
if (KEY (VK_NUMPAD4) || if (KEY (VK_NUMPAD4) ||

56
uisimulator/win32/makefile
View file

@ -22,12 +22,15 @@ TARGET = rockboxui
FIRMWAREDIR = ../../firmware FIRMWAREDIR = ../../firmware
DRIVERS = $(FIRMWAREDIR)/drivers DRIVERS = $(FIRMWAREDIR)/drivers
COMMON = $(FIRMWAREDIR)/common COMMON = $(FIRMWAREDIR)/common
SIMDIR = ../win32/
APPDIR = ../../apps/
RECDIR = $(APPDIR)recorder/
RM = del RM = del
CC = cl CC = cl
DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR -DARCHOS_RECORDER -D_WIN32 -DWIN32 DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR -DARCHOS_RECORDER -D_WIN32 -DWIN32
LDFLAGS = /ouisw32.exe /link -subsystem:windows 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 LIBS = gdi32.lib user32.lib
@ -35,8 +38,10 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb"
#SRCS = $(wildcard *.c) #SRCS = $(wildcard *.c)
SRCS = lcd-win32.c tetris.c uisw32.c lcd.c button.c tree.c app.c \ SRCS = lcd-win32.c tetris.c uisw32.c lcd.c button.c tree.c main.c \
chartables.c kernel.c Release/uisw32.res dir-win32.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) OBJS = $(SRCS:.c=.obj)
@ -49,14 +54,47 @@ lcd.obj: $(DRIVERS)/lcd.c
chartables.obj: $(FIRMWAREDIR)/chartables.c chartables.obj: $(FIRMWAREDIR)/chartables.c
$(CC) $(CFLAGS) -c $(FIRMWAREDIR)/chartables.c -ochartables.obj $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/chartables.c -ochartables.obj
tetris.obj: ../tetris.c tetris.obj: ../../apps/recorder/tetris.c
$(CC) $(CFLAGS) -c ../tetris.c -otetris.obj $(CC) $(CFLAGS) -c ../../apps/recorder/tetris.c -otetris.obj
tree.obj: ../tree.c tree.obj: ../../apps/tree.c
$(CC) $(CFLAGS) -c ../tree.c -otree.obj $(CC) $(CFLAGS) -c ../../apps/tree.c -otree.obj
app.obj: ../app.c main.obj: ../../apps/main.c
$(CC) $(CFLAGS) -c ../app.c -oapp.obj $(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: clean:
$(RM) *.obj $(RM) *.obj

2
uisimulator/win32/panic-win32.c
View file

@ -26,7 +26,7 @@ char panic_buf[128];
// whatever it says ;) // whatever it says ;)
void panic( char *message ) void panic( char *message )
{ {
debug( message ); debugf ( message );
PostQuitMessage (-1); PostQuitMessage (-1);
} }

6
uisimulator/win32/resource.h
View file

@ -3,13 +3,15 @@
// Used by uisw32.rc // Used by uisw32.rc
// //
#define IDB_BITMAP1 102 #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 // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #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_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101

BIN
uisimulator/win32/uisw32.aps
View file

Binary file not shown.

2
uisimulator/win32/uisw32.c
View file

@ -50,7 +50,7 @@ LRESULT GUIWndProc (
case WM_CREATE: case WM_CREATE:
// load background image // load background image
hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI), hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI),
IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); IMAGE_BITMAP, 0, 0, LR_VGACOLOR);
hMemDc = CreateCompatibleDC (GetDC (hWnd)); hMemDc = CreateCompatibleDC (GetDC (hWnd));
SelectObject (hMemDc, hBkgnd); SelectObject (hMemDc, hBkgnd);
return TRUE; return TRUE;

2
uisimulator/win32/uisw32.rc
View file

@ -52,7 +52,7 @@ END
// Bitmap // Bitmap
// //
IDB_UI BITMAP "UI.bmp" IDB_UI BITMAP "UI256.bmp"
#endif // English (U.S.) resources #endif // English (U.S.) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

BIN
uisimulator/win32/uisw32.suo
View file

Binary file not shown.

62
uisimulator/win32/uisw32.vcproj
View file

@ -19,8 +19,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;C:\Programming\CVS Checkout\RockBox\firmware&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware\drivers&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware\common&quot;" AdditionalIncludeDirectories="&quot;C:\Programming\CVS Checkout\RockBox\apps\recorder&quot;;&quot;C:\Programming\CVS Checkout\RockBox\apps&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware&quot;;&quot;C:\Programming\CVS Checkout\RockBox\uisimulator\win32&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware\drivers&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware\common&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ARCHOS_RECORDER;SIMULATOR;HAVE_LCD_BITMAP" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ARCHOS_RECORDER;SIMULATOR;HAVE_LCD_BITMAP;SIMULATOR;"
MinimalRebuild="TRUE" MinimalRebuild="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -107,7 +107,7 @@
Name="Source Files" Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
<File <File
RelativePath="..\app.c"> RelativePath="..\..\apps\recorder\bmp.c">
</File> </File>
<File <File
RelativePath="button.c"> RelativePath="button.c">
@ -115,6 +115,9 @@
<File <File
RelativePath="..\..\firmware\chartables.c"> RelativePath="..\..\firmware\chartables.c">
</File> </File>
<File
RelativePath="..\..\apps\credits.c">
</File>
<File <File
RelativePath="debug-win32.c"> RelativePath="debug-win32.c">
</File> </File>
@ -122,10 +125,7 @@
RelativePath="dir-win32.c"> RelativePath="dir-win32.c">
</File> </File>
<File <File
RelativePath="..\..\firmware\disk.c"> RelativePath="..\..\apps\recorder\icons.c">
</File>
<File
RelativePath="..\icons.c">
</File> </File>
<File <File
RelativePath="..\..\firmware\id3.c"> RelativePath="..\..\firmware\id3.c">
@ -140,31 +140,67 @@
RelativePath="..\..\firmware\drivers\lcd.c"> RelativePath="..\..\firmware\drivers\lcd.c">
</File> </File>
<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>
<File <File
RelativePath="panic-win32.c"> RelativePath="panic-win32.c">
</File> </File>
<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>
<File <File
RelativePath="..\..\firmware\playlist.c"> RelativePath="..\..\firmware\playlist.c">
</File> </File>
<File <File
RelativePath="..\screensaver.c"> RelativePath="..\..\apps\recorder\screensaver.c">
</File> </File>
<File <File
RelativePath="..\..\firmware\settings.c"> RelativePath="..\..\firmware\settings.c">
</File> </File>
<File
RelativePath="..\..\apps\sound_menu.c">
</File>
<File <File
RelativePath="..\..\firmware\common\sprintf.c"> RelativePath="..\..\firmware\common\sprintf.c">
</File> </File>
<File <File
RelativePath="..\tetris.c"> RelativePath="..\..\apps\recorder\tetris.c">
</File> </File>
<File <File
RelativePath="..\tree.c"> RelativePath="..\..\apps\tree.c">
</File> </File>
<File <File
RelativePath="uisw32.c"> RelativePath="uisw32.c">
@ -202,7 +238,7 @@
Name="Resource Files" Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
<File <File
RelativePath="UI.bmp"> RelativePath="UI256.bmp">
</File> </File>
<File <File
RelativePath="uisw32.rc"> RelativePath="uisw32.rc">