diff options
author | Dave Chapman <dave@dchapman.com> | 2011-02-27 11:37:39 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2011-02-27 11:37:39 +0000 |
commit | 376c9f3ad0c257ee97d7eba03962f232e85b36a7 (patch) | |
tree | 3323dfd60b82814af115b4c436ea8680ca9da978 | |
parent | 9501986047056c9f6ca954817ae597e302028f2e (diff) | |
download | rockbox-376c9f3ad0c257ee97d7eba03962f232e85b36a7.tar.gz rockbox-376c9f3ad0c257ee97d7eba03962f232e85b36a7.zip |
FS#11966 - use separate modelnames and config files for RaaA. This adds an APPLICATION define that can be used in Makefiles, and target-name defines (-DSDLAPP, -DANDROID, -DNOKIAN8XX and -DNOKIAN900) for use elsewhere. LCD size is now hard-coded for the Nokia builds in their config files. A new --app parameter is passed to buildzip.pl to explicitly state that this is an application build - it was previously derived from the model name.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29418 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/apps.make | 3 | ||||
-rw-r--r-- | firmware/export/config.h | 16 | ||||
-rw-r--r-- | firmware/export/config/android.h | 99 | ||||
-rw-r--r-- | firmware/export/config/nokian8xx.h | 97 | ||||
-rw-r--r-- | firmware/export/config/nokian900.h (renamed from firmware/export/config/application.h) | 36 | ||||
-rw-r--r-- | firmware/export/config/sdlapp.h | 101 | ||||
-rwxr-xr-x | tools/buildzip.pl | 3 | ||||
-rwxr-xr-x | tools/configure | 45 | ||||
-rw-r--r-- | tools/root.make | 16 | ||||
-rw-r--r-- | uisimulator/uisimulator.make | 2 |
10 files changed, 345 insertions, 73 deletions
diff --git a/apps/apps.make b/apps/apps.make index a430288870..6afcd12b5c 100644 --- a/apps/apps.make +++ b/apps/apps.make | |||
@@ -8,9 +8,6 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 10 | INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
11 | ifdef APP_TYPE | ||
12 | INCLUDES += -I$(APPSDIR)/hosted | ||
13 | endif | ||
14 | SRC += $(call preprocess, $(APPSDIR)/SOURCES) | 11 | SRC += $(call preprocess, $(APPSDIR)/SOURCES) |
15 | 12 | ||
16 | # apps/features.txt is a file that (is preprocessed and) lists named features | 13 | # apps/features.txt is a file that (is preprocessed and) lists named features |
diff --git a/firmware/export/config.h b/firmware/export/config.h index a870e5d815..1783cc137d 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -440,13 +440,21 @@ Lyre prototype 1 */ | |||
440 | #include "config/mpiohd200.h" | 440 | #include "config/mpiohd200.h" |
441 | #elif defined(MPIO_HD300) | 441 | #elif defined(MPIO_HD300) |
442 | #include "config/mpiohd300.h" | 442 | #include "config/mpiohd300.h" |
443 | #elif defined(SDLAPP) | ||
444 | #include "config/sdlapp.h" | ||
445 | #elif defined(ANDROID) | ||
446 | #include "config/android.h" | ||
447 | #elif defined(NOKIAN8XX) | ||
448 | #include "config/nokian8xx.h" | ||
449 | #elif defined(NOKIAN900) | ||
450 | #include "config/nokian900.h" | ||
451 | #else | ||
452 | /* no known platform */ | ||
453 | #endif | ||
443 | 454 | ||
444 | #elif defined(APPLICATION) | 455 | #ifdef APPLICATION |
445 | #include "config/application.h" | ||
446 | #define CONFIG_CPU 0 | 456 | #define CONFIG_CPU 0 |
447 | #define CONFIG_STORAGE 0 | 457 | #define CONFIG_STORAGE 0 |
448 | #else | ||
449 | /* no known platform */ | ||
450 | #endif | 458 | #endif |
451 | 459 | ||
452 | /* keep this include after the target configs */ | 460 | /* keep this include after the target configs */ |
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h new file mode 100644 index 0000000000..db214d28b1 --- /dev/null +++ b/firmware/export/config/android.h | |||
@@ -0,0 +1,99 @@ | |||
1 | /* | ||
2 | * This config file is for Rockbox as an application on Android | ||
3 | */ | ||
4 | #define TARGET_TREE /* this target is using the target tree system */ | ||
5 | |||
6 | /* We don't run on hardware directly */ | ||
7 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) | ||
8 | |||
9 | /* For Rolo and boot loader */ | ||
10 | #define MODEL_NUMBER 100 | ||
11 | |||
12 | #define MODEL_NAME "Rockbox" | ||
13 | |||
14 | #define USB_NONE | ||
15 | |||
16 | /* define this if you have a bitmap LCD display */ | ||
17 | #define HAVE_LCD_BITMAP | ||
18 | |||
19 | /* define this if you have a colour LCD */ | ||
20 | #define HAVE_LCD_COLOR | ||
21 | |||
22 | /* define this if you want album art for this target */ | ||
23 | #define HAVE_ALBUMART | ||
24 | |||
25 | /* define this to enable bitmap scaling */ | ||
26 | #define HAVE_BMP_SCALING | ||
27 | |||
28 | /* define this to enable JPEG decoding */ | ||
29 | #define HAVE_JPEG | ||
30 | |||
31 | /* define this if you have access to the quickscreen */ | ||
32 | #define HAVE_QUICKSCREEN | ||
33 | /* define this if you have access to the pitchscreen */ | ||
34 | #define HAVE_PITCHSCREEN | ||
35 | |||
36 | /* define this if you would like tagcache to build on this target */ | ||
37 | #define HAVE_TAGCACHE | ||
38 | |||
39 | /* LCD dimensions | ||
40 | * | ||
41 | * overriden by configure for application builds */ | ||
42 | #ifndef LCD_WIDTH | ||
43 | #define LCD_WIDTH 320 | ||
44 | #endif | ||
45 | |||
46 | #ifndef LCD_HEIGHT | ||
47 | #define LCD_HEIGHT 480 | ||
48 | #endif | ||
49 | |||
50 | #define LCD_DEPTH 16 | ||
51 | #define LCD_PIXELFORMAT 565 | ||
52 | |||
53 | #define HAVE_LCD_ENABLE | ||
54 | |||
55 | /* define this to indicate your device's keypad */ | ||
56 | #define HAVE_TOUCHSCREEN | ||
57 | #define HAVE_BUTTON_DATA | ||
58 | |||
59 | /* define this if you have RTC RAM available for settings */ | ||
60 | //#define HAVE_RTC_RAM | ||
61 | |||
62 | /* The number of bytes reserved for loadable codecs */ | ||
63 | #define CODEC_SIZE 0x100000 | ||
64 | |||
65 | /* The number of bytes reserved for loadable plugins */ | ||
66 | #define PLUGIN_BUFFER_SIZE 0x80000 | ||
67 | |||
68 | #define AB_REPEAT_ENABLE | ||
69 | |||
70 | /* Define this if you do software codec */ | ||
71 | #define CONFIG_CODEC SWCODEC | ||
72 | |||
73 | #define HAVE_MULTIMEDIA_KEYS | ||
74 | #define CONFIG_KEYPAD ANDROID_PAD | ||
75 | |||
76 | #define HAVE_SW_TONE_CONTROLS | ||
77 | |||
78 | /* Define current usage levels. */ | ||
79 | #define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */ | ||
80 | #define CURRENT_BACKLIGHT 30 /* TBD */ | ||
81 | #define CURRENT_RECORD 0 /* no recording yet */ | ||
82 | |||
83 | /* Define this to the CPU frequency */ | ||
84 | /* | ||
85 | #define CPU_FREQ 48000000 | ||
86 | */ | ||
87 | |||
88 | /* Offset ( in the firmware file's header ) to the file CRC */ | ||
89 | #define FIRMWARE_OFFSET_FILE_CRC 0 | ||
90 | |||
91 | /* Offset ( in the firmware file's header ) to the real data */ | ||
92 | #define FIRMWARE_OFFSET_FILE_DATA 8 | ||
93 | |||
94 | #define CONFIG_LCD LCD_COWOND2 | ||
95 | |||
96 | /* Define this if a programmable hotkey is mapped */ | ||
97 | //#define HAVE_HOTKEY | ||
98 | |||
99 | #define BOOTDIR "/.rockbox" | ||
diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h new file mode 100644 index 0000000000..328d73145f --- /dev/null +++ b/firmware/export/config/nokian8xx.h | |||
@@ -0,0 +1,97 @@ | |||
1 | /* | ||
2 | * This config file is for Rockbox as an application on the Nokia N8xx | ||
3 | */ | ||
4 | #define TARGET_TREE /* this target is using the target tree system */ | ||
5 | |||
6 | /* We don't run on hardware directly */ | ||
7 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) | ||
8 | |||
9 | /* For Rolo and boot loader */ | ||
10 | #define MODEL_NUMBER 100 | ||
11 | |||
12 | #define MODEL_NAME "Rockbox" | ||
13 | |||
14 | #define USB_NONE | ||
15 | |||
16 | /* define this if you have a bitmap LCD display */ | ||
17 | #define HAVE_LCD_BITMAP | ||
18 | |||
19 | /* define this if you have a colour LCD */ | ||
20 | #define HAVE_LCD_COLOR | ||
21 | |||
22 | /* define this if you want album art for this target */ | ||
23 | #define HAVE_ALBUMART | ||
24 | |||
25 | /* define this to enable bitmap scaling */ | ||
26 | #define HAVE_BMP_SCALING | ||
27 | |||
28 | /* define this to enable JPEG decoding */ | ||
29 | #define HAVE_JPEG | ||
30 | |||
31 | /* define this if you have access to the quickscreen */ | ||
32 | #define HAVE_QUICKSCREEN | ||
33 | /* define this if you have access to the pitchscreen */ | ||
34 | #define HAVE_PITCHSCREEN | ||
35 | |||
36 | /* define this if you would like tagcache to build on this target */ | ||
37 | #define HAVE_TAGCACHE | ||
38 | |||
39 | /* LCD dimensions */ | ||
40 | #define LCD_WIDTH 800 | ||
41 | #define LCD_HEIGHT 480 | ||
42 | #define LCD_DEPTH 16 | ||
43 | #define LCD_PIXELFORMAT 565 | ||
44 | |||
45 | /* define this to indicate your device's keypad */ | ||
46 | #define HAVE_TOUCHSCREEN | ||
47 | #define HAVE_BUTTON_DATA | ||
48 | |||
49 | /* define this if you have RTC RAM available for settings */ | ||
50 | //#define HAVE_RTC_RAM | ||
51 | |||
52 | /* The number of bytes reserved for loadable codecs */ | ||
53 | #define CODEC_SIZE 0x100000 | ||
54 | |||
55 | /* The number of bytes reserved for loadable plugins */ | ||
56 | #define PLUGIN_BUFFER_SIZE 0x80000 | ||
57 | |||
58 | #define AB_REPEAT_ENABLE | ||
59 | |||
60 | /* Define this if you do software codec */ | ||
61 | #define CONFIG_CODEC SWCODEC | ||
62 | |||
63 | /* Work around debug macro expansion of strncmp in scratchbox */ | ||
64 | #define _HAVE_STRING_ARCH_strncmp | ||
65 | |||
66 | #define HAVE_MULTIMEDIA_KEYS | ||
67 | #define HAVE_SCROLLWHEEL | ||
68 | #define CONFIG_KEYPAD SDL_PAD | ||
69 | |||
70 | /* Use SDL audio/pcm in a SDL app build */ | ||
71 | #define HAVE_SDL | ||
72 | #define HAVE_SDL_AUDIO | ||
73 | |||
74 | #define HAVE_SW_TONE_CONTROLS | ||
75 | |||
76 | /* Define current usage levels. */ | ||
77 | #define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */ | ||
78 | #define CURRENT_BACKLIGHT 30 /* TBD */ | ||
79 | #define CURRENT_RECORD 0 /* no recording yet */ | ||
80 | |||
81 | /* Define this to the CPU frequency */ | ||
82 | /* | ||
83 | #define CPU_FREQ 48000000 | ||
84 | */ | ||
85 | |||
86 | /* Offset ( in the firmware file's header ) to the file CRC */ | ||
87 | #define FIRMWARE_OFFSET_FILE_CRC 0 | ||
88 | |||
89 | /* Offset ( in the firmware file's header ) to the real data */ | ||
90 | #define FIRMWARE_OFFSET_FILE_DATA 8 | ||
91 | |||
92 | #define CONFIG_LCD LCD_COWOND2 | ||
93 | |||
94 | /* Define this if a programmable hotkey is mapped */ | ||
95 | //#define HAVE_HOTKEY | ||
96 | |||
97 | #define BOOTDIR "/.rockbox" | ||
diff --git a/firmware/export/config/application.h b/firmware/export/config/nokian900.h index 0aa4a3f54d..a65dc7260b 100644 --- a/firmware/export/config/application.h +++ b/firmware/export/config/nokian900.h | |||
@@ -1,18 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * This config file is for Rockbox as an application! | 2 | * This config file is for Rockbox as an application on the Nokia N900 |
3 | */ | 3 | */ |
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 | #ifdef ANDROID | ||
8 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) | ||
9 | #elif MAEMO5 | ||
10 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) | 7 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) |
11 | #elif MAEMO4 | 8 | |
12 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) | ||
13 | #else | ||
14 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) | ||
15 | #endif | ||
16 | /* For Rolo and boot loader */ | 9 | /* For Rolo and boot loader */ |
17 | #define MODEL_NUMBER 100 | 10 | #define MODEL_NUMBER 100 |
18 | 11 | ||
@@ -46,21 +39,11 @@ | |||
46 | /* LCD dimensions | 39 | /* LCD dimensions |
47 | * | 40 | * |
48 | * overriden by configure for application builds */ | 41 | * overriden by configure for application builds */ |
49 | #ifndef LCD_WIDTH | 42 | #define LCD_WIDTH 800 |
50 | #define LCD_WIDTH 320 | ||
51 | #endif | ||
52 | |||
53 | #ifndef LCD_HEIGHT | ||
54 | #define LCD_HEIGHT 480 | 43 | #define LCD_HEIGHT 480 |
55 | #endif | ||
56 | |||
57 | #define LCD_DEPTH 16 | 44 | #define LCD_DEPTH 16 |
58 | #define LCD_PIXELFORMAT 565 | 45 | #define LCD_PIXELFORMAT 565 |
59 | 46 | ||
60 | #if (CONFIG_PLATFORM & PLATFORM_ANDROID) | ||
61 | #define HAVE_LCD_ENABLE | ||
62 | #endif | ||
63 | |||
64 | /* define this to indicate your device's keypad */ | 47 | /* define this to indicate your device's keypad */ |
65 | #define HAVE_TOUCHSCREEN | 48 | #define HAVE_TOUCHSCREEN |
66 | #define HAVE_BUTTON_DATA | 49 | #define HAVE_BUTTON_DATA |
@@ -80,28 +63,15 @@ | |||
80 | #define CONFIG_CODEC SWCODEC | 63 | #define CONFIG_CODEC SWCODEC |
81 | 64 | ||
82 | /* Work around debug macro expansion of strncmp in scratchbox */ | 65 | /* Work around debug macro expansion of strncmp in scratchbox */ |
83 | #if (CONFIG_PLATFORM & PLATFORM_MAEMO) | ||
84 | #define _HAVE_STRING_ARCH_strncmp | 66 | #define _HAVE_STRING_ARCH_strncmp |
85 | #endif | ||
86 | 67 | ||
87 | #if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)) | ||
88 | #define HAVE_MULTIMEDIA_KEYS | 68 | #define HAVE_MULTIMEDIA_KEYS |
89 | #endif | ||
90 | |||
91 | #if (CONFIG_PLATFORM & PLATFORM_ANDROID) | ||
92 | #define CONFIG_KEYPAD ANDROID_PAD | ||
93 | #elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) | ||
94 | #define HAVE_SCROLLWHEEL | 69 | #define HAVE_SCROLLWHEEL |
95 | #define CONFIG_KEYPAD SDL_PAD | 70 | #define CONFIG_KEYPAD SDL_PAD |
96 | #else | ||
97 | #error unknown platform | ||
98 | #endif | ||
99 | 71 | ||
100 | #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) | ||
101 | /* Use SDL audio/pcm in a SDL app build */ | 72 | /* Use SDL audio/pcm in a SDL app build */ |
102 | #define HAVE_SDL | 73 | #define HAVE_SDL |
103 | #define HAVE_SDL_AUDIO | 74 | #define HAVE_SDL_AUDIO |
104 | #endif | ||
105 | 75 | ||
106 | #define HAVE_SW_TONE_CONTROLS | 76 | #define HAVE_SW_TONE_CONTROLS |
107 | 77 | ||
diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h new file mode 100644 index 0000000000..ef2710c999 --- /dev/null +++ b/firmware/export/config/sdlapp.h | |||
@@ -0,0 +1,101 @@ | |||
1 | /* | ||
2 | * This config file is for the SDL application | ||
3 | */ | ||
4 | #define TARGET_TREE /* this target is using the target tree system */ | ||
5 | |||
6 | /* We don't run on hardware directly */ | ||
7 | #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) | ||
8 | |||
9 | /* For Rolo and boot loader */ | ||
10 | #define MODEL_NUMBER 100 | ||
11 | |||
12 | #define MODEL_NAME "Rockbox" | ||
13 | |||
14 | #define USB_NONE | ||
15 | |||
16 | /* define this if you have a bitmap LCD display */ | ||
17 | #define HAVE_LCD_BITMAP | ||
18 | |||
19 | /* define this if you have a colour LCD */ | ||
20 | #define HAVE_LCD_COLOR | ||
21 | |||
22 | /* define this if you want album art for this target */ | ||
23 | #define HAVE_ALBUMART | ||
24 | |||
25 | /* define this to enable bitmap scaling */ | ||
26 | #define HAVE_BMP_SCALING | ||
27 | |||
28 | /* define this to enable JPEG decoding */ | ||
29 | #define HAVE_JPEG | ||
30 | |||
31 | /* define this if you have access to the quickscreen */ | ||
32 | #define HAVE_QUICKSCREEN | ||
33 | /* define this if you have access to the pitchscreen */ | ||
34 | #define HAVE_PITCHSCREEN | ||
35 | |||
36 | /* define this if you would like tagcache to build on this target */ | ||
37 | #define HAVE_TAGCACHE | ||
38 | |||
39 | /* LCD dimensions | ||
40 | * | ||
41 | * overriden by configure for application builds */ | ||
42 | #ifndef LCD_WIDTH | ||
43 | #define LCD_WIDTH 320 | ||
44 | #endif | ||
45 | |||
46 | #ifndef LCD_HEIGHT | ||
47 | #define LCD_HEIGHT 480 | ||
48 | #endif | ||
49 | |||
50 | #define LCD_DEPTH 16 | ||
51 | #define LCD_PIXELFORMAT 565 | ||
52 | |||
53 | /* define this to indicate your device's keypad */ | ||
54 | #define HAVE_TOUCHSCREEN | ||
55 | #define HAVE_BUTTON_DATA | ||
56 | |||
57 | /* define this if you have RTC RAM available for settings */ | ||
58 | //#define HAVE_RTC_RAM | ||
59 | |||
60 | /* The number of bytes reserved for loadable codecs */ | ||
61 | #define CODEC_SIZE 0x100000 | ||
62 | |||
63 | /* The number of bytes reserved for loadable plugins */ | ||
64 | #define PLUGIN_BUFFER_SIZE 0x80000 | ||
65 | |||
66 | #define AB_REPEAT_ENABLE | ||
67 | |||
68 | /* Define this if you do software codec */ | ||
69 | #define CONFIG_CODEC SWCODEC | ||
70 | |||
71 | #define HAVE_SCROLLWHEEL | ||
72 | #define CONFIG_KEYPAD SDL_PAD | ||
73 | |||
74 | /* Use SDL audio/pcm in a SDL app build */ | ||
75 | #define HAVE_SDL | ||
76 | #define HAVE_SDL_AUDIO | ||
77 | |||
78 | #define HAVE_SW_TONE_CONTROLS | ||
79 | |||
80 | /* Define current usage levels. */ | ||
81 | #define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */ | ||
82 | #define CURRENT_BACKLIGHT 30 /* TBD */ | ||
83 | #define CURRENT_RECORD 0 /* no recording yet */ | ||
84 | |||
85 | /* Define this to the CPU frequency */ | ||
86 | /* | ||
87 | #define CPU_FREQ 48000000 | ||
88 | */ | ||
89 | |||
90 | /* Offset ( in the firmware file's header ) to the file CRC */ | ||
91 | #define FIRMWARE_OFFSET_FILE_CRC 0 | ||
92 | |||
93 | /* Offset ( in the firmware file's header ) to the real data */ | ||
94 | #define FIRMWARE_OFFSET_FILE_DATA 8 | ||
95 | |||
96 | #define CONFIG_LCD LCD_COWOND2 | ||
97 | |||
98 | /* Define this if a programmable hotkey is mapped */ | ||
99 | //#define HAVE_HOTKEY | ||
100 | |||
101 | #define BOOTDIR "/.rockbox" | ||
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 0d8f7117a5..2337dbe729 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -214,6 +214,7 @@ GetOptions ( 'r|root=s' => \$ROOT, | |||
214 | 'install=s' => \$install, # install destination | 214 | 'install=s' => \$install, # install destination |
215 | 'rbdir:s' => \$rbdir, # If we want to put in a different directory | 215 | 'rbdir:s' => \$rbdir, # If we want to put in a different directory |
216 | 'l|link' => \$mklinks, # If we want to create links instead of copying files | 216 | 'l|link' => \$mklinks, # If we want to create links instead of copying files |
217 | 'a|app:s' => \$app, # Is this an Application build? | ||
217 | ); | 218 | ); |
218 | 219 | ||
219 | # GetOptions() doesn't remove the params from @ARGV if their value was "" | 220 | # GetOptions() doesn't remove the params from @ARGV if their value was "" |
@@ -681,8 +682,6 @@ $year+=1900; | |||
681 | sub runone { | 682 | sub runone { |
682 | my ($target, $fonts)=@_; | 683 | my ($target, $fonts)=@_; |
683 | 684 | ||
684 | $app = ($modelname eq "application"); | ||
685 | |||
686 | # Strip the leading / from $rbdir unless we are installing an application | 685 | # Strip the leading / from $rbdir unless we are installing an application |
687 | # build - the layout is different (no .rockbox, but bin/lib/share) | 686 | # build - the layout is different (no .rockbox, but bin/lib/share) |
688 | unless ($app && $install) { | 687 | unless ($app && $install) { |
diff --git a/tools/configure b/tools/configure index 23fef9c968..904e676e9e 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -26,7 +26,6 @@ libdir= | |||
26 | sharedir= | 26 | sharedir= |
27 | 27 | ||
28 | thread_support="ASSEMBLER_THREADS" | 28 | thread_support="ASSEMBLER_THREADS" |
29 | app_modelname= | ||
30 | app_lcd_width= | 29 | app_lcd_width= |
31 | app_lcd_height= | 30 | app_lcd_height= |
32 | # | 31 | # |
@@ -610,7 +609,6 @@ androidcc () { | |||
610 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \ | 609 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \ |
611 | --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm" | 610 | --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm" |
612 | LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog" | 611 | LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog" |
613 | extradefines="$extradefines -DANDROID" | ||
614 | endian="little" | 612 | endian="little" |
615 | SHARED_FLAG="-shared" | 613 | SHARED_FLAG="-shared" |
616 | } | 614 | } |
@@ -2902,10 +2900,10 @@ fi | |||
2902 | ;; | 2900 | ;; |
2903 | 2901 | ||
2904 | 200|sdlapp) | 2902 | 200|sdlapp) |
2903 | application="yes" | ||
2905 | target_id=73 | 2904 | target_id=73 |
2906 | modelname="application" | 2905 | modelname="sdlapp" |
2907 | app_modelname="sdlapp" | 2906 | target="-DSDLAPP" |
2908 | target="-DAPPLICATION" | ||
2909 | app_set_paths | 2907 | app_set_paths |
2910 | app_set_lcd_size | 2908 | app_set_lcd_size |
2911 | memory=8 | 2909 | memory=8 |
@@ -2927,10 +2925,10 @@ fi | |||
2927 | ;; | 2925 | ;; |
2928 | 2926 | ||
2929 | 201|android) | 2927 | 201|android) |
2928 | application="yes" | ||
2930 | target_id=74 | 2929 | target_id=74 |
2931 | modelname="application" | 2930 | modelname="android" |
2932 | app_modelname="android" | 2931 | target="-DANDROID" |
2933 | target="-DAPPLICATION" | ||
2934 | app_type="android" | 2932 | app_type="android" |
2935 | app_set_lcd_size | 2933 | app_set_lcd_size |
2936 | sharedir="/data/data/org.rockbox/app_rockbox/rockbox" | 2934 | sharedir="/data/data/org.rockbox/app_rockbox/rockbox" |
@@ -2945,7 +2943,7 @@ fi | |||
2945 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 2943 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
2946 | output="librockbox.so" | 2944 | output="librockbox.so" |
2947 | bootoutput="librockbox.so" | 2945 | bootoutput="librockbox.so" |
2948 | appextra="recorder:gui:radio" | 2946 | appextra="recorder:gui:radio:hosted" |
2949 | plugins="yes" | 2947 | plugins="yes" |
2950 | swcodec="yes" | 2948 | swcodec="yes" |
2951 | # architecture, manufacturer and model for the target-tree build | 2949 | # architecture, manufacturer and model for the target-tree build |
@@ -2955,12 +2953,11 @@ fi | |||
2955 | ;; | 2953 | ;; |
2956 | 2954 | ||
2957 | 202|nokian8xx) | 2955 | 202|nokian8xx) |
2956 | application="yes" | ||
2958 | target_id=75 | 2957 | target_id=75 |
2959 | modelname="application" | 2958 | modelname="nokian8xx" |
2960 | app_modelname="nokian8xx" | ||
2961 | app_type="sdl-app" | 2959 | app_type="sdl-app" |
2962 | target="-DAPPLICATION" | 2960 | target="-DNOKIAN8XX" |
2963 | app_set_lcd_size 800 480 | ||
2964 | sharedir="/opt/rockbox/share/rockbox" | 2961 | sharedir="/opt/rockbox/share/rockbox" |
2965 | bindir="/opt/rockbox/bin" | 2962 | bindir="/opt/rockbox/bin" |
2966 | libdir="/opt/rockbox/lib" | 2963 | libdir="/opt/rockbox/lib" |
@@ -2983,12 +2980,11 @@ fi | |||
2983 | ;; | 2980 | ;; |
2984 | 2981 | ||
2985 | 203|nokian900) | 2982 | 203|nokian900) |
2983 | application="yes" | ||
2986 | target_id=76 | 2984 | target_id=76 |
2987 | modelname="application" | 2985 | modelname="nokian900" |
2988 | app_modelname="nokian900" | ||
2989 | app_type="sdl-app" | 2986 | app_type="sdl-app" |
2990 | target="-DAPPLICATION" | 2987 | target="-DNOKIAN900" |
2991 | app_set_lcd_size 800 480 | ||
2992 | sharedir="/opt/rockbox/share/rockbox" | 2988 | sharedir="/opt/rockbox/share/rockbox" |
2993 | bindir="/opt/rockbox/bin" | 2989 | bindir="/opt/rockbox/bin" |
2994 | libdir="/opt/rockbox/lib" | 2990 | libdir="/opt/rockbox/lib" |
@@ -3236,6 +3232,11 @@ if [ -z "$debug" ]; then | |||
3236 | GCCOPTS="$GCCOPTS $GCCOPTIMIZE" | 3232 | GCCOPTS="$GCCOPTS $GCCOPTIMIZE" |
3237 | fi | 3233 | fi |
3238 | 3234 | ||
3235 | if [ "yes" = "$application" ]; then | ||
3236 | echo Building Rockbox as an Application | ||
3237 | extradefines="$extradefines -DAPPLICATION" | ||
3238 | fi | ||
3239 | |||
3239 | echo "Using source code root directory: $rootdir" | 3240 | echo "Using source code root directory: $rootdir" |
3240 | 3241 | ||
3241 | # this was once possible to change at build-time, but no more: | 3242 | # this was once possible to change at build-time, but no more: |
@@ -3504,13 +3505,11 @@ fi | |||
3504 | if [ -n "$ARG_PREFIX" ]; then | 3505 | if [ -n "$ARG_PREFIX" ]; then |
3505 | cmdline="$cmdline--prefix=\$(PREFIX) " | 3506 | cmdline="$cmdline--prefix=\$(PREFIX) " |
3506 | fi | 3507 | fi |
3507 | if [ "$modelname" = "application" ]; then | 3508 | if [ -n "$ARG_LCDWIDTH" ]; then |
3508 | cmdline="$cmdline--target=$app_modelname --lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " | 3509 | cmdline="$cmdline--lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " |
3509 | else | ||
3510 | cmdline="$cmdline--target=\$(MODELNAME) " | ||
3511 | fi | 3510 | fi |
3512 | 3511 | ||
3513 | cmdline="$cmdline--ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts" | 3512 | cmdline="$cmdline--target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts" |
3514 | 3513 | ||
3515 | ### end of cmdline | 3514 | ### end of cmdline |
3516 | 3515 | ||
@@ -3561,6 +3560,7 @@ sed > Makefile \ | |||
3561 | -e "s<@TOOLSDIR@<${toolsdir}<g" \ | 3560 | -e "s<@TOOLSDIR@<${toolsdir}<g" \ |
3562 | -e "s<@APPS@<${apps}<g" \ | 3561 | -e "s<@APPS@<${apps}<g" \ |
3563 | -e "s<@APP_TYPE@<${app_type}<g" \ | 3562 | -e "s<@APP_TYPE@<${app_type}<g" \ |
3563 | -e "s<@APPLICATION@<${application}<g" \ | ||
3564 | -e "s<@GCCVER@<${gccver}<g" \ | 3564 | -e "s<@GCCVER@<${gccver}<g" \ |
3565 | -e "s<@GCCNUM@<${gccnum}<g" \ | 3565 | -e "s<@GCCNUM@<${gccnum}<g" \ |
3566 | -e "s<@UNAME@<${uname}<g" \ | 3566 | -e "s<@UNAME@<${uname}<g" \ |
@@ -3630,6 +3630,7 @@ export RANLIB=@RANLIB@ | |||
3630 | export PREFIX=@PREFIX@ | 3630 | export PREFIX=@PREFIX@ |
3631 | export PROFILE_OPTS=@PROFILE_OPTS@ | 3631 | export PROFILE_OPTS=@PROFILE_OPTS@ |
3632 | export APP_TYPE=@APP_TYPE@ | 3632 | export APP_TYPE=@APP_TYPE@ |
3633 | export APPLICATION=@APPLICATION@ | ||
3633 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | 3634 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl |
3634 | export GCCOPTS=@GCCOPTS@ | 3635 | export GCCOPTS=@GCCOPTS@ |
3635 | export TARGET_INC=@TARGET_INC@ | 3636 | export TARGET_INC=@TARGET_INC@ |
diff --git a/tools/root.make b/tools/root.make index 0640ba5656..85a996fc62 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -251,10 +251,10 @@ tags: | |||
251 | $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC)) | 251 | $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC)) |
252 | 252 | ||
253 | fontzip: | 253 | fontzip: |
254 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) | 254 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) |
255 | 255 | ||
256 | zip: | 256 | zip: |
257 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 257 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
258 | 258 | ||
259 | mapzip: | 259 | mapzip: |
260 | $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip | 260 | $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip |
@@ -263,14 +263,14 @@ elfzip: | |||
263 | $(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip | 263 | $(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip |
264 | 264 | ||
265 | fullzip: | 265 | fullzip: |
266 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) | 266 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) |
267 | 267 | ||
268 | 7zip: | 268 | 7zip: |
269 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 269 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
270 | 270 | ||
271 | tar: | 271 | tar: |
272 | $(SILENT)rm -f rockbox.tar | 272 | $(SILENT)rm -f rockbox.tar |
273 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 273 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
274 | 274 | ||
275 | bzip2: tar | 275 | bzip2: tar |
276 | $(SILENT)bzip2 -f9 rockbox.tar | 276 | $(SILENT)bzip2 -f9 rockbox.tar |
@@ -305,15 +305,15 @@ bininstall: $(BUILDDIR)/$(BINARY) | |||
305 | 305 | ||
306 | install: | 306 | install: |
307 | @echo "Installing your build in your '$(RBPREFIX)' dir" | 307 | @echo "Installing your build in your '$(RBPREFIX)' dir" |
308 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) | 308 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) |
309 | 309 | ||
310 | fullinstall: | 310 | fullinstall: |
311 | @echo "Installing a full setup in your '$(RBPREFIX)' dir" | 311 | @echo "Installing a full setup in your '$(RBPREFIX)' dir" |
312 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) | 312 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) |
313 | 313 | ||
314 | symlinkinstall: | 314 | symlinkinstall: |
315 | @echo "Installing a full setup with links in your '$(RBPREFIX)' dir" | 315 | @echo "Installing a full setup with links in your '$(RBPREFIX)' dir" |
316 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l | 316 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l |
317 | endif | 317 | endif |
318 | 318 | ||
319 | help: | 319 | help: |
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index dcbd79988f..d30a9db9ae 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make | |||
@@ -18,7 +18,7 @@ SIMOBJ = $(call c2obj,$(SIMSRC)) | |||
18 | OTHER_SRC += $(SIMSRC) | 18 | OTHER_SRC += $(SIMSRC) |
19 | 19 | ||
20 | SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a | 20 | SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a |
21 | ifeq ($(MODELNAME), application) | 21 | ifeq (yes,$(APPLICATION)) |
22 | UIBMP= | 22 | UIBMP= |
23 | else | 23 | else |
24 | UIBMP=$(BUILDDIR)/UI256.bmp | 24 | UIBMP=$(BUILDDIR)/UI256.bmp |