mirror of
https://gitlab.com/Nanolx/homebrewfilter.git
synced 2024-11-24 10:09:21 +01:00
hide SD Gecko setting in vWii builds
This commit is contained in:
parent
cea6f37b7e
commit
e1a1a3c847
Binary file not shown.
@ -676,11 +676,16 @@ int MenuMain()
|
||||
|
||||
if(!first)
|
||||
{
|
||||
#ifndef VWII
|
||||
if (Options.sdgecko)
|
||||
{
|
||||
xprintf("The HomebrewFilter rev%i\n= == == == == == == == =\nSD Card Gecko initialized.\n\n", SvnRev());
|
||||
}
|
||||
else if(Options.wifigecko)
|
||||
else if
|
||||
#else
|
||||
if
|
||||
#endif
|
||||
(Options.wifigecko)
|
||||
{
|
||||
WifiGecko_Connect();
|
||||
xprintf("The HomebrewFilter rev%i\n= == == == == == == == =\nWifi Gecko connected.\n\n", SvnRev());
|
||||
|
@ -27,8 +27,8 @@ bool temp_show_all;
|
||||
int temp_device_icon;
|
||||
int temp_wiiload_ios;
|
||||
int temp_wiiload_ahb;
|
||||
bool temp_sdgecko;
|
||||
#ifndef VWII
|
||||
bool temp_sdgecko;
|
||||
bool temp_bootmii_boot2;
|
||||
#endif
|
||||
bool temp_navigation;
|
||||
@ -57,8 +57,8 @@ int MenuSettingsFile()
|
||||
else
|
||||
childlock = 1;
|
||||
bool navigation = Options.navigation;
|
||||
bool sdgecko = Options.sdgecko;
|
||||
#ifndef VWII
|
||||
bool sdgecko = Options.sdgecko;
|
||||
bool bootmii_boot2 = Options.bootmii_boot2;
|
||||
#endif
|
||||
string device_dat;
|
||||
@ -80,8 +80,8 @@ int MenuSettingsFile()
|
||||
sprintf(options.name[i++], tr("Device icon"));
|
||||
sprintf(options.name[i++], tr("Wiiload IOS"));
|
||||
sprintf(options.name[i++], tr("Wiiload IOS Reload"));
|
||||
sprintf(options.name[i++], tr("SD Gecko"));
|
||||
#ifndef VWII
|
||||
sprintf(options.name[i++], tr("SD Gecko"));
|
||||
sprintf(options.name[i++], tr("BootMii in Boot2"));
|
||||
#endif
|
||||
sprintf(options.name[i++], tr("Childlock"));
|
||||
@ -214,11 +214,11 @@ int MenuSettingsFile()
|
||||
change = 3;
|
||||
wiiload_ahb = change;
|
||||
break;
|
||||
|
||||
#ifndef VWII
|
||||
case SDGECKO:
|
||||
sdgecko = 1;
|
||||
break;
|
||||
#ifndef VWII
|
||||
|
||||
case BOOTMII_BOOT2:
|
||||
bootmii_boot2 = 1;
|
||||
break;
|
||||
@ -300,11 +300,11 @@ int MenuSettingsFile()
|
||||
change = 0;
|
||||
wiiload_ahb = change;
|
||||
break;
|
||||
|
||||
#ifndef VWII
|
||||
case SDGECKO:
|
||||
sdgecko = 0;
|
||||
break;
|
||||
#ifndef VWII
|
||||
|
||||
case BOOTMII_BOOT2:
|
||||
bootmii_boot2 = 0;
|
||||
break;
|
||||
@ -338,8 +338,8 @@ int MenuSettingsFile()
|
||||
temp_wiiload_ios = atoi(options.value[WIILOAD_IOS]);
|
||||
temp_wiiload_ahb = wiiload_ahb;
|
||||
temp_device_dat = device_dat;
|
||||
temp_sdgecko = sdgecko;
|
||||
#ifndef VWII
|
||||
temp_sdgecko = sdgecko;
|
||||
temp_bootmii_boot2 = bootmii_boot2;
|
||||
#endif
|
||||
temp_navigation = navigation;
|
||||
@ -400,8 +400,8 @@ int MenuSettingsFile()
|
||||
childlock = 0;
|
||||
else
|
||||
childlock = 1;
|
||||
sdgecko = temp_sdgecko;
|
||||
#ifndef VWII
|
||||
sdgecko = temp_sdgecko;
|
||||
bootmii_boot2 = temp_bootmii_boot2;
|
||||
#endif
|
||||
navigation = temp_navigation;
|
||||
@ -459,12 +459,12 @@ int MenuSettingsFile()
|
||||
sprintf (options.value[WIILOAD_AHB], tr("IOS Reload"));
|
||||
else if(wiiload_ahb == 2)
|
||||
sprintf (options.value[WIILOAD_AHB], tr("AHB Access"));
|
||||
|
||||
#ifndef VWII
|
||||
if(!sdgecko)
|
||||
sprintf (options.value[SDGECKO], tr("No"));
|
||||
else
|
||||
sprintf (options.value[SDGECKO], tr("Yes"));
|
||||
#ifndef VWII
|
||||
|
||||
if(!bootmii_boot2)
|
||||
sprintf (options.value[BOOTMII_BOOT2], tr("No"));
|
||||
else
|
||||
@ -541,8 +541,8 @@ int MenuSettingsFile()
|
||||
Options.wiiload_ios = atoi(options.value[WIILOAD_IOS]);
|
||||
Options.wiiload_ahb = wiiload_ahb;
|
||||
device_dat = options.value[STORAGE_DEVICE];
|
||||
Options.sdgecko = sdgecko;
|
||||
#ifndef VWII
|
||||
Options.sdgecko = sdgecko;
|
||||
Options.bootmii_boot2 = bootmii_boot2;
|
||||
#endif
|
||||
Options.navigation = navigation;
|
||||
|
@ -30,8 +30,8 @@ enum
|
||||
DEVICE_ICON,
|
||||
WIILOAD_IOS,
|
||||
WIILOAD_AHB,
|
||||
SDGECKO,
|
||||
#ifndef VWII
|
||||
SDGECKO,
|
||||
BOOTMII_BOOT2,
|
||||
#endif
|
||||
CHILDLOCK,
|
||||
|
@ -109,9 +109,10 @@ void load()
|
||||
if(get_setting(source, "navigation") != "")
|
||||
Options.navigation = atoi(get_setting(source, "navigation").c_str());
|
||||
|
||||
#ifndef VWII
|
||||
if(get_setting(source, "sdgecko") != "")
|
||||
Options.sdgecko = atoi(get_setting(source, "sdgecko").c_str());
|
||||
#ifndef VWII
|
||||
|
||||
if(get_setting(source, "bootmii_boot2") != "")
|
||||
Options.bootmii_boot2 = atoi(get_setting(source, "bootmii_boot2").c_str());
|
||||
#endif
|
||||
|
@ -106,8 +106,8 @@ void save()
|
||||
save_settings << "apps_nr = \"" << Options.apps << "\"" << endl;
|
||||
save_settings << "quick_start = \"" << Options.quick_start << "\"" << endl;
|
||||
save_settings << "show_all = \"" << Options.show_all << "\"" << endl;
|
||||
save_settings << "sdgecko = \"" << Options.sdgecko << "\"" << endl;
|
||||
#ifndef VWII
|
||||
save_settings << "sdgecko = \"" << Options.sdgecko << "\"" << endl;
|
||||
save_settings << "bootmii_boot2 = \"" << Options.bootmii_boot2 << "\"" << endl;
|
||||
#endif
|
||||
save_settings << "navigation = \"" << Options.navigation << "\"" << endl;
|
||||
|
@ -177,8 +177,8 @@ DefaultOptions()
|
||||
Options.apps = 4;
|
||||
Options.quick_start = 0;
|
||||
Options.show_all = 1;
|
||||
Options.sdgecko = 1;
|
||||
#ifndef VWII
|
||||
Options.sdgecko = 1;
|
||||
Options.bootmii_boot2 = 0;
|
||||
#endif
|
||||
Options.navigation = 0;
|
||||
|
@ -127,7 +127,9 @@ struct SOptions
|
||||
bool quick_start;
|
||||
bool show_all;
|
||||
int device_icon;
|
||||
#ifndef VWII
|
||||
bool sdgecko;
|
||||
#endif
|
||||
bool navigation;
|
||||
bool network;
|
||||
bool wifigecko;
|
||||
|
@ -26,10 +26,15 @@ extern "C" void sdprintf(const char * format, ...)
|
||||
|
||||
extern "C" void xprintf(const char *str, ...)
|
||||
{
|
||||
#ifndef VWII
|
||||
if(Options.sdgecko)
|
||||
sdprintf(str);
|
||||
else if
|
||||
#else
|
||||
if
|
||||
#endif
|
||||
|
||||
else if(Options.wifigecko)
|
||||
(Options.wifigecko)
|
||||
wifi_printf(str);
|
||||
else
|
||||
gprintf(str);
|
||||
|
Loading…
Reference in New Issue
Block a user