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

Only use -Wno-virtual-dtor with Apple clang

Browse source
This commit is contained in:
Inori 2019-10-23 02:27:26 -04:00 • committed by Inori
parent 0d6d69c47a
commit 428c936a9c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -65,7 +65,7 @@ all_sources += files('cwalk/src/cwalk.c')
include_dirs += include_directories('cwalk/include')
# Disable some warnings
add_project_arguments(['-Wno-undefined-var-template', '-Wno-non-virtual-dtor', '-Wno-uninitialized'], language: 'cpp')
add_project_arguments(['-Wno-reorder', '-Wno-non-virtual-dtor', '-Wno-uninitialized'], language: 'cpp')
linker_args = []
@ -78,6 +78,7 @@ elif host_system == 'darwin'
subdir('macos')
if compiler.get_id() == 'clang'
add_project_arguments('-stdlib=libc++', language: 'cpp')
add_project_arguments('-Wno-undefined-var-template', 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')

4
src/main.cpp
View file

@ -48,9 +48,9 @@
#include "icon.png.xxd"
#ifdef __APPLE__
#define GLINIT_SHOWERROR(s) rgssThreadError(threadData, s)
#else
#define GLINIT_SHOWERROR(s) showInitError(s)
#else
#define GLINIT_SHOWERROR(s) rgssThreadError(threadData, s)
#endif
static void