interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set the minimum required meson version and moved the libui-specific OS X variables into darwin.build like we did with unix.build.

This commit is contained in:
Pietro Gagliardi 2019-03-23 21:50:54 -04:00
parent dff8ec0f22
commit 5e557d61b3
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
darwin/meson.build
View File

@ -53,3 +53,10 @@ libui_sources += [
] ]
libui_include_directories += [include_directories('.')] libui_include_directories += [include_directories('.')]
libui_deps += [dependency('appleframeworks',
modules: ['Foundation', 'AppKit'],
required: true)]
libui_soversion = 'A'
# the / is required by some older versions of OS X
libui_rpath = '@executable_path/'

10
meson.build
View File

@ -14,6 +14,7 @@
# we have to specify C++ here even if we're not using C++ immediately because otherwise none of the C++ built-in options are available (sigh; TODO) # we have to specify C++ here even if we're not using C++ immediately because otherwise none of the C++ built-in options are available (sigh; TODO)
# and same for Objective-C because of add_project_arguments() (double sigh; TODO) # and same for Objective-C because of add_project_arguments() (double sigh; TODO)
project('libui', ['c', 'cpp'], project('libui', ['c', 'cpp'],
meson_version: '>=0.48.0',
default_options: [ default_options: [
'buildtype=debug', # build debug by default 'buildtype=debug', # build debug by default
'default_library=shared', # build shared libraries by default 'default_library=shared', # build shared libraries by default
@ -33,7 +34,7 @@ libui_OS = host_machine.system()
libui_MSVC = meson.get_compiler('c').get_id() == 'msvc' libui_MSVC = meson.get_compiler('c').get_id() == 'msvc'
if libui_OS == 'darwin' if libui_OS == 'darwin'
add_language('objc', add_languages('objc',
required: true) required: true)
endif endif
@ -75,13 +76,6 @@ if libui_OS == 'windows'
# TODO c_winlibs and cpp_winlibs are the windows libraries # TODO c_winlibs and cpp_winlibs are the windows libraries
# user32 kernel32 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid windowscodecs # user32 kernel32 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid windowscodecs
elif libui_OS == 'darwin' elif libui_OS == 'darwin'
libui_deps += [dependency('appleframeworks',
modules: ['Foundation', 'AppKit'],
required: true)]
libui_soversion = 'A'
# the / is required by some older versions of OS X
libui_rpath = '@executable_path/'
# TODO see if there's a more direct way to set this # TODO see if there's a more direct way to set this
libui_macosx_version_min = '-mmacosx-version-min=10.8' libui_macosx_version_min = '-mmacosx-version-min=10.8'
add_project_arguments(libui_macosx_version_min, add_project_arguments(libui_macosx_version_min,