From a3e019c4f6745d06d7afed7991b9c682b0ea65b9 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Fri, 28 Nov 2014 19:26:48 +0100
Subject: [PATCH] Fix MSVC compiling error (argc/argv not available to pass to
init_gettext)
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
---
src/main.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 2ebdeda20..201995b5c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -157,7 +157,7 @@ static void list_game_ids();
static void list_worlds();
static void setup_log_params(const Settings &cmd_args);
static bool create_userdata_path();
-static bool init_common(int *log_level, const Settings &cmd_args);
+static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[]);
static void startup_message();
static bool read_config_file(const Settings &cmd_args);
static void init_debug_streams(int *log_level, const Settings &cmd_args);
@@ -831,7 +831,7 @@ int main(int argc, char *argv[])
}
GameParams game_params;
- if (!init_common(&game_params.log_level, cmd_args))
+ if (!init_common(&game_params.log_level, cmd_args, argc, argv))
return 1;
#ifndef __ANDROID__
@@ -1086,7 +1086,7 @@ static bool create_userdata_path()
return success;
}
-static bool init_common(int *log_level, const Settings &cmd_args)
+static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[])
{
startup_message();
set_default_settings(g_settings);
--
GitLab