Fix warnings

drhelius · Apr 5, 2020 · d04573c · d04573c
1 parent a6adafe
commit d04573c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/platforms/desktop-shared/config.h b/platforms/desktop-shared/config.h
@@ -84,8 +84,6 @@ struct config_Input
     int gamepad_y_axis = 1;
 };
 
-static const char* config_input_gamepad_names[16] = {"0", "A", "B" ,"3", "L", "R", "6", "7", "SELECT", "START", "10", "11", "12", "13", "14", "15"};
-
 EXTERN mINI::INIFile* config_ini_file;
 EXTERN mINI::INIStructure config_ini_data;
 EXTERN char* config_root_path;

diff --git a/platforms/desktop-shared/gui.cpp b/platforms/desktop-shared/gui.cpp
@@ -552,7 +552,10 @@ static void gamepad_configuration_item(const char* text, int* button)
 {
     ImGui::Text("%s", text);
     ImGui::SameLine(70);
-    if (ImGui::Button(config_input_gamepad_names[*button], ImVec2(70,0)))
+
+    static const char* gamepad_names[16] = {"0", "A", "B" ,"3", "L", "R", "6", "7", "SELECT", "START", "10", "11", "12", "13", "14", "15"};
+
+    if (ImGui::Button(gamepad_names[*button], ImVec2(70,0)))
     {
         configured_button = button;
         ImGui::OpenPopup("Gamepad Configuration");
@@ -622,7 +625,7 @@ static void popup_modal_about(void)
 
         #ifdef _WIN64
         ImGui::Text("Windows 64 bit detected.");
-        #elif
+        #elif defined(_WIN32)
         ImGui::Text("Windows 32 bit detected.");
         #endif
         #ifdef __linux__