sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Android build after controller changes

Browse Source
This commit is contained in:
Connor McLaughlin
2019-12-16 16:46:43 +10:00
parent 52c82b6aa3
commit ad21f48a67
7 changed files with 57 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/settings.h
View File

@ -1,5 +1,6 @@
#pragma once
#include "types.h"
#include <array>
#include <optional>
#include <string>
@ -45,11 +46,8 @@ struct Settings
bool bios_patch_tty_enable = false;
bool bios_patch_fast_boot = false;
ControllerType controller_1_type = ControllerType::None;
ControllerType controller_2_type = ControllerType::None;
std::string memory_card_1_path;
std::string memory_card_2_path;
std::array<ControllerType, NUM_CONTROLLER_AND_CARD_PORTS> controller_types{};
std::array<std::string, NUM_CONTROLLER_AND_CARD_PORTS> memory_card_paths{};
void SetDefaults();
void Load(const char* filename);