Fixed linux build
parent
fa709eda71
commit
3d113fef36
|
@ -90,7 +90,7 @@ run_command (const char *command_template,
|
||||||
error = NULL;
|
error = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (command && !moo_spawn_command_line_async_with_flags (command, G_SPAWN_WIN32_HIDDEN_CONSOLE, &error))
|
if (command && !moo_spawn_command_line_async_with_flags (command, MOO_SPAWN_WIN32_HIDDEN_CONSOLE, &error))
|
||||||
{
|
{
|
||||||
g_warning ("%s", moo_error_message (error));
|
g_warning ("%s", moo_error_message (error));
|
||||||
g_error_free (error);
|
g_error_free (error);
|
||||||
|
|
|
@ -120,7 +120,7 @@ cfunc__execute (lua_State *L)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!g_spawn_sync (NULL, argv, NULL,
|
if (!g_spawn_sync (NULL, argv, NULL,
|
||||||
(GSpawnFlags) (G_SPAWN_SEARCH_PATH | G_SPAWN_WIN32_HIDDEN_CONSOLE),
|
(GSpawnFlags) (G_SPAWN_SEARCH_PATH | MOO_SPAWN_WIN32_HIDDEN_CONSOLE),
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
&exit_status, &error))
|
&exit_status, &error))
|
||||||
{
|
{
|
||||||
|
|
|
@ -530,7 +530,7 @@ moo_cmd_run_command (MooCmd *cmd,
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
flags |= G_SPAWN_WIN32_HIDDEN_CONSOLE;
|
flags |= MOO_SPAWN_WIN32_HIDDEN_CONSOLE;
|
||||||
|
|
||||||
if ((flags & G_SPAWN_STDOUT_TO_DEV_NULL) || (cmd_flags & MOO_CMD_STDOUT_TO_PARENT))
|
if ((flags & G_SPAWN_STDOUT_TO_DEV_NULL) || (cmd_flags & MOO_CMD_STDOUT_TO_PARENT))
|
||||||
outp = NULL;
|
outp = NULL;
|
||||||
|
|
|
@ -64,6 +64,12 @@ struct _MooCmdClass
|
||||||
const char *line);
|
const char *line);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef __WIN32__
|
||||||
|
#define MOO_SPAWN_WIN32_HIDDEN_CONSOLE G_SPAWN_WIN32_HIDDEN_CONSOLE
|
||||||
|
#else
|
||||||
|
#define MOO_SPAWN_WIN32_HIDDEN_CONSOLE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
GType _moo_cmd_get_type (void) G_GNUC_CONST;
|
GType _moo_cmd_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
MooCmd *_moo_cmd_new (const char *working_dir,
|
MooCmd *_moo_cmd_new (const char *working_dir,
|
||||||
|
|
|
@ -546,7 +546,7 @@ run_sync (const char *base_cmd_line,
|
||||||
{
|
{
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
gboolean result = FALSE;
|
gboolean result = FALSE;
|
||||||
GSpawnFlags flags = (GSpawnFlags) (RUN_CMD_FLAGS | G_SPAWN_WIN32_HIDDEN_CONSOLE);
|
GSpawnFlags flags = (GSpawnFlags) (RUN_CMD_FLAGS | MOO_SPAWN_WIN32_HIDDEN_CONSOLE);
|
||||||
char **argv;
|
char **argv;
|
||||||
char **real_env;
|
char **real_env;
|
||||||
char *cmd_line;
|
char *cmd_line;
|
||||||
|
|
Loading…
Reference in New Issue