mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-09 16:35:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace MiniFFI allocation function with correct one

Browse source
This commit is contained in:
Inori 2019-09-15 07:56:30 -04:00 • committed by Inori
parent b8d79cec76
commit 3b71c1f501
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
binding/miniffi-binding.cpp
View file

@ -42,12 +42,6 @@ DEF_TYPE_CUSTOMFREE(MiniFFI, SDL_UnloadObject);
DEF_ALLOCFUNC_CUSTOMFREE(MiniFFI, SDL_UnloadObject); DEF_ALLOCFUNC_CUSTOMFREE(MiniFFI, SDL_UnloadObject);
#endif #endif
static VALUE
MiniFFI_alloc(VALUE self)
{
return Data_Wrap_Struct(self, 0, SDL_UnloadObject, 0);
}
static void* static void*
MiniFFI_GetFunctionHandle(void *libhandle, const char *func) MiniFFI_GetFunctionHandle(void *libhandle, const char *func)
{ {
@ -293,7 +287,7 @@ MiniFFIBindingInit()
#ifndef OLD_RUBY #ifndef OLD_RUBY
rb_define_alloc_func(cMiniFFI, classAllocate<&MiniFFIType>); rb_define_alloc_func(cMiniFFI, classAllocate<&MiniFFIType>);
#else #else
rb_define_alloc_func(cMiniFFI, MiniFFI_alloc); rb_define_alloc_func(cMiniFFI, MiniFFIAllocate);
#endif #endif
_rb_define_method(cMiniFFI, "initialize", MiniFFI_initialize); _rb_define_method(cMiniFFI, "initialize", MiniFFI_initialize);
_rb_define_method(cMiniFFI, "call", MiniFFI_call); _rb_define_method(cMiniFFI, "call", MiniFFI_call);

2
macos/Info.plist
View file

@ -13,7 +13,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>icon.icns</string> <string>icon.icns</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0.2</string> <string>1.0.3</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>

2
meson.build
View file

@ -1,4 +1,4 @@
project('mkxp-z', 'cpp', 'c', version: '1.0.1', default_options: ['cpp_std=c++11']) project('mkxp-z', 'cpp', 'c', version: '1.0.3', default_options: ['cpp_std=c++11'])
minimum_macos_version = get_option('macos_min_version') minimum_macos_version = get_option('macos_min_version')

8
windows/resource.rc
View file

@ -4,17 +4,17 @@
IDI_APPICON ICON "icon.ico" IDI_APPICON ICON "icon.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,2,0 FILEVERSION 1,0,3,0
PRODUCTVERSION 1,0,2,0 PRODUCTVERSION 1,0,3,0
{ {
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
{ {
BLOCK "040904b0" BLOCK "040904b0"
{ {
VALUE "FileVersion", "1.0.2.0\0" VALUE "FileVersion", "1.0.3.0\0"
VALUE "OriginalFilename", "mkxp-z.exe\0" VALUE "OriginalFilename", "mkxp-z.exe\0"
VALUE "ProductName", "mkxp-z\0" VALUE "ProductName", "mkxp-z\0"
VALUE "ProductVersion", "1.0.2.0\0" VALUE "ProductVersion", "1.0.3.0\0"
} }
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"