mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-04 14:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Silence stderr if built without console

Browse source
This commit is contained in:
Inori 2019-08-10 04:35:37 -04:00
parent 261af9efe0
commit 6b102c1772
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
binding/binding-mri.cpp
View file

@ -43,6 +43,12 @@
#include <SDL_filesystem.h> #include <SDL_filesystem.h>
#ifdef __WIN32__
#define NULL_IO "NUL"
#else
#define NULL_IO "/dev/null"
#endif
extern const char module_rpg1[]; extern const char module_rpg1[];
extern const char module_rpg2[]; extern const char module_rpg2[];
extern const char module_rpg3[]; extern const char module_rpg3[];
@ -616,6 +622,10 @@ static void mriBindingExecute()
#else #else
ruby_init(); ruby_init();
rb_eval_string("$KCODE='U'"); rb_eval_string("$KCODE='U'");
#ifdef NO_CONSOLE
// Sysinit isn't a thing yet, so send stderr to /dev/null instead
rb_funcall(rb_gv_get("$stderr"), rb_intern("reopen"), 1, rb_str_new2(NULL_IO));
#endif
#endif #endif
Config &conf = shState->rtData().config; Config &conf = shState->rtData().config;

8
meson.build
View file

@ -4,14 +4,18 @@ xxd = find_program('xxd', native: true)
host_system = host_machine.system() host_system = host_machine.system()
compiler = meson.get_compiler('cpp') compiler = meson.get_compiler('cpp')
if get_option('workdir_current') == true if get_option('workdir_current')
add_project_arguments('-DWORKDIR_CURRENT', language: 'cpp') add_project_arguments('-DWORKDIR_CURRENT', language: 'cpp')
endif endif
if get_option('fix_essentials') == true if get_option('fix_essentials')
add_project_arguments('-DUSE_ESSENTIALS_FIXES', language: 'cpp') add_project_arguments('-DUSE_ESSENTIALS_FIXES', language: 'cpp')
endif endif
if not get_option('console')
add_project_arguments('-DNO_CONSOLE', language: 'cpp')
endif
subdir('src') subdir('src')
subdir('binding') subdir('binding')
subdir('shader') subdir('shader')