From 198774d7b8e4acb41882cda35d121198a366aae0 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Tue, 1 Jan 2013 11:52:27 +0100 Subject: [PATCH] exclude bootmii-boot2 in vWii build also in load/save.cpp --- installer/wad.vwii/0001000154484246.tmd | Bin 592 -> 592 bytes installer/wad/0001000154484246.tmd | Bin 592 -> 592 bytes main/source/Tools/load.cpp | 8 ++++---- main/source/Tools/save.cpp | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/installer/wad.vwii/0001000154484246.tmd b/installer/wad.vwii/0001000154484246.tmd index 2f497ad658e4d6c7e025b40e9d1c054c5a7f7dc7..6797dc039115dd0df85aeb6a9fa7f9ed2370f724 100644 GIT binary patch delta 30 ocmV+(0O9}81kePqIsz6#JGxq#HujoO=zhzPp4&2J;Q)`<{M?NX%K!iX diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd index 88b760118318167a8c3fc3a0516705f3ace5a6c3..161f1d3d9d98d69a49b429c0d3b289535d4c9a30 100644 GIT binary patch delta 34 scmV+-0Nwx41kePq76KMbAkdmZ#F|%f>#JGxq#Huja)D)o7?YScL$ZX8gzW=fNyQg)nU^g3cHME7{-nt|Oez4!?+hUT diff --git a/main/source/Tools/load.cpp b/main/source/Tools/load.cpp index 1ff6a5f..1609ded 100644 --- a/main/source/Tools/load.cpp +++ b/main/source/Tools/load.cpp @@ -105,10 +105,10 @@ void load() if(get_setting(source, "sdgecko") != "") Options.sdgecko = atoi(get_setting(source, "sdgecko").c_str()); - - if(get_setting(source, "bootmii_boot2") != "") - Options.bootmii_boot2 = atoi(get_setting(source, "bootmii_boot2").c_str()); - +#ifndef VWII + if(get_setting(source, "bootmii_boot2") != "") + Options.bootmii_boot2 = atoi(get_setting(source, "bootmii_boot2").c_str()); +#endif if(get_setting(source, "network") != "") { Options.network = atoi(get_setting(source, "network").c_str()); diff --git a/main/source/Tools/save.cpp b/main/source/Tools/save.cpp index 0926e44..12cfc0a 100644 --- a/main/source/Tools/save.cpp +++ b/main/source/Tools/save.cpp @@ -102,7 +102,9 @@ void save() save_settings << "quick_start = \"" << Options.quick_start << "\"" << endl; save_settings << "show_all = \"" << Options.show_all << "\"" << endl; save_settings << "sdgecko = \"" << Options.sdgecko << "\"" << endl; - save_settings << "bootmii_boot2 = \"" << Options.bootmii_boot2 << "\"" << endl; +#ifndef VWII + save_settings << "bootmii_boot2 = \"" << Options.bootmii_boot2 << "\"" << endl; +#endif save_settings << "navigation = \"" << Options.navigation << "\"" << endl; save_settings << "network = \"" << Options.network << "\"" << endl; save_settings << "wifigecko = \"" << Options.wifigecko << "\"" << endl;