Skip to content

Commit 8c51c33

Browse files
committed
fix build on Android and Windows
1 parent 8cdaa01 commit 8c51c33

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/config.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ struct avocado_config_t {
3030
KeyBindings keys;
3131
} controller[2]{
3232
{
33-
.type = ControllerType::analog,
34-
.keys = DefaultKeyBindings::keyboard_numpad(),
33+
ControllerType::analog,
34+
DefaultKeyBindings::keyboard_numpad(),
3535
},
3636
{
37-
.type = ControllerType::none,
38-
.keys = DefaultKeyBindings::none(),
37+
ControllerType::none,
38+
DefaultKeyBindings::none(),
3939
},
4040
};
4141

@@ -81,8 +81,8 @@ struct avocado_config_t {
8181
struct {
8282
std::string path;
8383
} memoryCard[2]{
84-
{.path = "data/memory/card1.mcr"}, //
85-
{.path = ""}, //
84+
{"data/memory/card1.mcr"}, //
85+
{""}, //
8686
};
8787

8888
struct {

src/platform/windows/gui/helper/file_dialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void FileDialog::getDriveList() {
7474
continue;
7575
}
7676

77-
auto volume = fs::path(components[1]);
77+
auto volume = fs::path(std::string(components[1]));
7878
auto name = volume.filename().string();
7979
if (name.empty()) {
8080
name = "/";

0 commit comments

Comments
 (0)