fix build on Android and Windows

JaCzekanski · Apr 1, 2020 · 8c51c33 · 8c51c33
1 parent 8cdaa01
commit 8c51c33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/config.h b/src/config.h
@@ -30,12 +30,12 @@ struct avocado_config_t {
         KeyBindings keys;
     } controller[2]{
         {
-            .type = ControllerType::analog,
-            .keys = DefaultKeyBindings::keyboard_numpad(),
+            ControllerType::analog,
+            DefaultKeyBindings::keyboard_numpad(),
         },
         {
-            .type = ControllerType::none,
-            .keys = DefaultKeyBindings::none(),
+            ControllerType::none,
+            DefaultKeyBindings::none(),
         },
     };
 
@@ -81,8 +81,8 @@ struct avocado_config_t {
     struct {
         std::string path;
     } memoryCard[2]{
-        {.path = "data/memory/card1.mcr"},  //
-        {.path = ""},                       //
+        {"data/memory/card1.mcr"},  //
+        {""},                       //
     };
 
     struct {

diff --git a/src/platform/windows/gui/helper/file_dialog.cpp b/src/platform/windows/gui/helper/file_dialog.cpp
@@ -74,7 +74,7 @@ void FileDialog::getDriveList() {
                 continue;
             }
 
-            auto volume = fs::path(components[1]);
+            auto volume = fs::path(std::string(components[1]));
             auto name = volume.filename().string();
             if (name.empty()) {
                 name = "/";