diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-08-02 20:34:47 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-02 20:34:47 +0000 |
commit | 240923a801382c86545d10be167a15892a556fb6 (patch) | |
tree | 3c0e07ec3abf0c493a0b24b0b57e8bbd0200f7f6 /firmware/export/config | |
parent | 850efead04f10488b478a0f255a2464a01156a7f (diff) | |
download | rockbox-240923a801382c86545d10be167a15892a556fb6.tar.gz rockbox-240923a801382c86545d10be167a15892a556fb6.zip |
Rockbox as an application: Commit current Android port progress.
General state is: Rockbox is usable (plays music, saves configuration, touchscreen works too).
Problems:
- Playing music in the background (i.e. when switching to another app) doesn't work reliably, but I'm working on that now.
- no cabbiev2 (only some preliminary files for it), no other default theme.
- screen flickers sometimes if the updates are too frequent
- no multi screen apk/package
- strange behavior when a phone call comes in
The java files (and the eclipse project) resides in android/, which is also supposed to be the build folder.
I've put a small README in there for instructions. There are some steps needed after the make part, which are described there,
and which eclipse mostly handles. But there ought to be some script/makefile rules which do that instead in the future.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27668 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/config')
-rw-r--r-- | firmware/export/config/application.h | 28 | ||||
-rw-r--r-- | firmware/export/config/sim.h | 3 |
2 files changed, 22 insertions, 9 deletions
diff --git a/firmware/export/config/application.h b/firmware/export/config/application.h index a5583ded75..988f0d51ac 100644 --- a/firmware/export/config/application.h +++ b/firmware/export/config/application.h | |||
@@ -4,11 +4,13 @@ | |||
4 | #define TARGET_TREE /* this target is using the target tree system */ | 4 | #define TARGET_TREE /* this target is using the target tree system */ |
5 | 5 | ||
6 | /* We don't run on hardware directly */ | 6 | /* We don't run on hardware directly */ |
7 | #define CONFIG_PLATFORM PLATFORM_HOSTED | 7 | #ifdef ANDROID |
8 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) | ||
9 | #else | ||
10 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) | ||
11 | #endif | ||
8 | /* For Rolo and boot loader */ | 12 | /* For Rolo and boot loader */ |
9 | /* | 13 | #define MODEL_NUMBER 100 |
10 | #define MODEL_NUMBER 24 | ||
11 | */ | ||
12 | 14 | ||
13 | #define MODEL_NAME "Rockbox" | 15 | #define MODEL_NAME "Rockbox" |
14 | 16 | ||
@@ -37,9 +39,17 @@ | |||
37 | /* define this if you would like tagcache to build on this target */ | 39 | /* define this if you would like tagcache to build on this target */ |
38 | #define HAVE_TAGCACHE | 40 | #define HAVE_TAGCACHE |
39 | 41 | ||
40 | /* LCD dimensions */ | 42 | /* LCD dimensions |
43 | * | ||
44 | * overriden by configure for application builds */ | ||
45 | #ifndef LCD_WIDTH | ||
41 | #define LCD_WIDTH 320 | 46 | #define LCD_WIDTH 320 |
42 | #define LCD_HEIGHT 240 | 47 | #endif |
48 | |||
49 | #ifndef LCD_HEIGHT | ||
50 | #define LCD_HEIGHT 480 | ||
51 | #endif | ||
52 | |||
43 | #define LCD_DEPTH 16 | 53 | #define LCD_DEPTH 16 |
44 | #define LCD_PIXELFORMAT 565 | 54 | #define LCD_PIXELFORMAT 565 |
45 | 55 | ||
@@ -62,10 +72,10 @@ | |||
62 | #define CONFIG_CODEC SWCODEC | 72 | #define CONFIG_CODEC SWCODEC |
63 | 73 | ||
64 | #define CONFIG_KEYPAD COWON_D2_PAD | 74 | #define CONFIG_KEYPAD COWON_D2_PAD |
75 | |||
76 | #if (CONFIG_PLATFORM & PLATFORM_SDL) | ||
65 | /* Use SDL audio/pcm in a SDL app build */ | 77 | /* Use SDL audio/pcm in a SDL app build */ |
66 | #define HAVE_SDL | 78 | #define HAVE_SDL |
67 | |||
68 | #ifdef HAVE_SDL | ||
69 | #define HAVE_SDL_AUDIO | 79 | #define HAVE_SDL_AUDIO |
70 | #endif | 80 | #endif |
71 | 81 | ||
@@ -92,3 +102,5 @@ | |||
92 | 102 | ||
93 | /* Define this if a programmable hotkey is mapped */ | 103 | /* Define this if a programmable hotkey is mapped */ |
94 | //#define HAVE_HOTKEY | 104 | //#define HAVE_HOTKEY |
105 | |||
106 | #define BOOTDIR "/.rockbox" | ||
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index 5dcb4f6f2d..066201ad08 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h | |||
@@ -99,7 +99,8 @@ | |||
99 | #define DEFAULT_BRIGHTNESS_SETTING MAX_BRIGHTNESS_SETTING | 99 | #define DEFAULT_BRIGHTNESS_SETTING MAX_BRIGHTNESS_SETTING |
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) | ||
102 | #define HAVE_SDL | 103 | #define HAVE_SDL |
103 | #define HAVE_SDL_AUDIO | 104 | #define HAVE_SDL_AUDIO |
104 | #define CONFIG_PLATFORM PLATFORM_HOSTED | 105 | |
105 | #define _ISOC99_SOURCE 1 | 106 | #define _ISOC99_SOURCE 1 |