mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-23 07:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add System::VERSION

Browse source
This commit is contained in:
Roza 2020-12-31 17:26:14 -05:00
parent 559ed0bd4e
commit a388192bcd
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
binding/binding-mri.cpp
View file

@ -61,6 +61,8 @@ extern "C" {
#define NULL_IO "/dev/null" #define NULL_IO "/dev/null"
#endif #endif
#define MACRO_STRINGIFY(x) #x
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[];
@ -206,6 +208,7 @@ static void mriBindingInit() {
/* Load global constants */ /* Load global constants */
rb_gv_set("MKXP", Qtrue); 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); VALUE debug = rb_bool_new(shState->config().editor.debug);
if (rgssVer == 1) if (rgssVer == 1)

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

2
macos/mkxp-z.xcodeproj/project.pbxproj
View file

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

1
meson.build
View file

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