add System::VERSION

This commit is contained in:
Struma 2020-12-31 17:26:14 -05:00 committed by Roza
parent 69514de7c6
commit 59078356ac
4 changed files with 10 additions and 4 deletions

View file

@ -61,6 +61,8 @@ extern "C" {
#define NULL_IO "/dev/null"
#endif
#define MACRO_STRINGIFY(x) #x
extern const char module_rpg1[];
extern const char module_rpg2[];
extern const char module_rpg3[];
@ -206,6 +208,7 @@ static void mriBindingInit() {
/* Load global constants */
rb_gv_set("MKXP", Qtrue);
rb_const_set(mod, rb_intern("VERSION"), rb_str_new_cstr(MACRO_STRINGIFY(MKXPZ_VERSION)));
VALUE debug = rb_bool_new(shState->config().editor.debug);
if (rgssVer == 1)

View file

@ -8,13 +8,13 @@ mffi_value miniffi_call_intern(MINIFFI_FUNC target, MiniFFIFuncArgs *p, int npar
p->params[4], p->params[5], p->params[6], p->params[7]);
}
#else
mffi_value miniffi_call_intern(MINIFFI_FUNC target, MiniFFIFuncArgs *params, size_t nparams) {
return call_asm(target, params, nparams);
mffi_value miniffi_call_intern(MINIFFI_FUNC target, MiniFFIFuncArgs *p, size_t nparams) {
return call_asm(target, p, nparams);
}
#define INTEL_ASM ".intel_syntax noprefix\n"
#ifdef _WIN32
mffi_value call_asm(MINIFFI_FUNC target, MINIFFIFuncArgs *params, size_t nparams) {
mffi_value call_asm(MINIFFI_FUNC target, MINIFFIFuncArgs *p, size_t nparams) {
mffi_value ret;
void *old_esp = 0;
@ -57,7 +57,7 @@ mffi_value call_asm(MINIFFI_FUNC target, MINIFFIFuncArgs *params, size_t nparams
return ret;
}
#else
mffi_value call_asm(MINIFFI_FUNC target, MINIFFIFuncArgs *params, size_t nparams) {
mffi_value call_asm(MINIFFI_FUNC target, MINIFFIFuncArgs *p, size_t nparams) {
mffi_value ret;
void *old_rsp = 0;
asm volatile(INTEL_ASM

View file

@ -3688,6 +3688,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
MKXPZ_BUILD_XCODE,
"MKXPZ_ALCDEVICE=ALCdevice",
"MKXPZ_VERSION=\"$(MARKETING_VERSION)\"",
MKXPZ_MINIFFI,
AL_LIBTYPE_STATIC,
);
@ -3727,6 +3728,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
MKXPZ_BUILD_XCODE,
"MKXPZ_ALCDEVICE=ALCdevice",
"MKXPZ_VERSION=\"$(MARKETING_VERSION)\"",
MKXPZ_MINIFFI,
AL_LIBTYPE_STATIC,
);

View file

@ -22,6 +22,7 @@ sizeof = {'void*': compilers['cpp'].sizeof('void*'),
win64 = (sizeof['void*'] != sizeof['long'])
global_args += '-DMKXPZ_BUILD_MESON'
global_args += '-DMKXPZ_VERSION="@0@"'.format(meson.project_version())
# ====================
# Ext libs
# ====================