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

Set macOS deployment target to 10.10

Browse source
This commit is contained in:
Inori 2019-08-31 19:12:54 -04:00
parent cd62cf8808
commit 0ff3a4d563
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
binding/audio-binding.cpp
View file

@ -32,10 +32,7 @@
int volume = 100; \ int volume = 100; \
int pitch = 100; \ int pitch = 100; \
double pos = 0.0; \ double pos = 0.0; \
if (rgssVer >= 3) \
rb_get_args(argc, argv, "z|iif", &filename, &volume, &pitch, &pos RB_ARG_END); \ rb_get_args(argc, argv, "z|iif", &filename, &volume, &pitch, &pos RB_ARG_END); \
else \
rb_get_args(argc, argv, "z|ii", &filename, &volume, &pitch RB_ARG_END); \
GUARD_EXC( shState->audio().entity##Play(filename, volume, pitch, pos); ) \ GUARD_EXC( shState->audio().entity##Play(filename, volume, pitch, pos); ) \
return Qnil; \ return Qnil; \
} \ } \

3
binding/graphics-binding.cpp
View file

@ -265,9 +265,6 @@ void graphicsBindingInit()
INIT_GRA_PROP_BIND( FrameRate, "frame_rate" ); INIT_GRA_PROP_BIND( FrameRate, "frame_rate" );
INIT_GRA_PROP_BIND( FrameCount, "frame_count" ); INIT_GRA_PROP_BIND( FrameCount, "frame_count" );
// Typically, these functions are only used in RGSS2+, but
// Essentials really wants them badly
_rb_define_module_function(module, "width", graphicsWidth); _rb_define_module_function(module, "width", graphicsWidth);
_rb_define_module_function(module, "height", graphicsHeight); _rb_define_module_function(module, "height", graphicsHeight);
_rb_define_module_function(module, "wait", graphicsWait); _rb_define_module_function(module, "wait", graphicsWait);

5
meson.build
View file

@ -1,5 +1,7 @@
project('mkxp-z', 'cpp', 'c', version: '1.0', default_options: ['cpp_std=c++11']) project('mkxp-z', 'cpp', 'c', version: '1.0', default_options: ['cpp_std=c++11'])
minimum_macos_version = '10.10'
# The meson build is mostly directly copied from the old CMakeLists, # The meson build is mostly directly copied from the old CMakeLists,
# it still needs to be cleaned up # it still needs to be cleaned up
@ -41,6 +43,9 @@ elif host_system == 'darwin'
subdir('macos') subdir('macos')
if compiler.get_id() == 'clang' if compiler.get_id() == 'clang'
add_project_arguments('-stdlib=libc++', language: 'cpp') add_project_arguments('-stdlib=libc++', language: 'cpp')
add_project_arguments('-mmacosx-version-min='+minimum_macos_version, language: 'cpp')
add_project_arguments('-mmacosx-version-min='+minimum_macos_version, language: 'c')
add_project_link_arguments('-mmacosx-version-min='+minimum_macos_version, language: 'cpp')
endif endif
endif endif

12
src/graphics.cpp
View file

@ -934,9 +934,6 @@ int Graphics::height() const
void Graphics::resizeScreen(int width, int height) void Graphics::resizeScreen(int width, int height)
{ {
// Commented out to allow SpriteResizer to
// resize the screen as much as it likes
//width = clamp(width, 1, 640); //width = clamp(width, 1, 640);
//height = clamp(height, 1, 480); //height = clamp(height, 1, 480);
@ -955,6 +952,15 @@ void Graphics::resizeScreen(int width, int height)
p->screenQuad.setTexPosRect(screenRect, screenRect); p->screenQuad.setTexPosRect(screenRect, screenRect);
shState->eThread().requestWindowResize(width, height); shState->eThread().requestWindowResize(width, height);
int cur_sz = p->scSize.x;
// Give things a little time to recalculate before continuing
for (int i = 0; i < p->frameRate; i++)
{
if (cur_sz != p->scSize.x) break;
update();
}
} }
void Graphics::playMovie(const char *filename) void Graphics::playMovie(const char *filename)