diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-08-12 19:49:03 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-08-12 19:49:03 +0000 |
commit | f28da1a35a6403b153f93f66e3d96e485f89c363 (patch) | |
tree | 760d0c286a65042e18e2165ff555be0d40e80558 /apps/menus/settings_menu.c | |
parent | 90c40b7fea0275e212addf3ae6ac6979f5b4585b (diff) | |
download | rockbox-f28da1a35a6403b153f93f66e3d96e485f89c363.tar.gz rockbox-f28da1a35a6403b153f93f66e3d96e485f89c363.zip |
Enable a lot more features for simulators and add stubs where necessary, simulators should now work with identical lng and voice files as the respective target
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14299 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index b1ba6680be..283acc4cb7 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -122,7 +122,6 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, | |||
122 | /* SYSTEM MENU */ | 122 | /* SYSTEM MENU */ |
123 | 123 | ||
124 | /* Battery */ | 124 | /* Battery */ |
125 | #ifndef SIMULATOR | ||
126 | #if BATTERY_CAPACITY_INC > 0 | 125 | #if BATTERY_CAPACITY_INC > 0 |
127 | MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); | 126 | MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); |
128 | #endif | 127 | #endif |
@@ -158,7 +157,6 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | |||
158 | #endif | 157 | #endif |
159 | #endif | 158 | #endif |
160 | ); | 159 | ); |
161 | #endif /* SIMULATOR */ | ||
162 | /* Disk */ | 160 | /* Disk */ |
163 | #ifndef HAVE_FLASH_STORAGE | 161 | #ifndef HAVE_FLASH_STORAGE |
164 | MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); | 162 | MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); |
@@ -340,7 +338,7 @@ MENUITEM_SETTING(buttonlight_brightness, &global_settings.buttonlight_brightness | |||
340 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | 338 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), |
341 | 0, Icon_System_menu, | 339 | 0, Icon_System_menu, |
342 | &start_screen, | 340 | &start_screen, |
343 | #ifndef SIMULATOR | 341 | #if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1) |
344 | &battery_menu, | 342 | &battery_menu, |
345 | #endif | 343 | #endif |
346 | #if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE) | 344 | #if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE) |