bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=f51d801c46c48b7f9ca3fa86e14e2ba8b6cba19b
commit f51d801c46c48b7f9ca3fa86e14e2ba8b6cba19b Author: Marcel Hollerbach <[email protected]> Date: Wed Jan 3 07:42:42 2018 +0000 meson: here comes ecore_cocoa --- meson.build | 6 ++++++ meson_options.txt | 6 ++++++ src/lib/ecore_cocoa/meson.build | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/meson.build b/meson.build index cd0e750096..4fda2d1e3b 100644 --- a/meson.build +++ b/meson.build @@ -3,6 +3,11 @@ project('efl', ['c','cpp'], default_options : ['buildtype=plain'] ) +if target_machine.system() == 'darwin' + add_languages('objc') +endif + + clean_check = run_command('meson/clean_check.sh') if clean_check.returncode() == 0 error('Meson build requires a clean source tree') @@ -109,6 +114,7 @@ subprojects = [ ['ector' , false, true, false, false, true, false, ['draw', 'triangulator', 'freetype']], ['elput' , false, true, false, false, true, false, []], ['ecore_drm2' , false, true, false, false, false, false, []], +['ecore_cocoa' , false, true, false, false, false, false, []], ] diff --git a/meson_options.txt b/meson_options.txt index b26de289d2..d739a5cbb9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -130,6 +130,12 @@ option('elput', description : 'build elput' ) +option('ecore_cocoa', + type : 'boolean', + value : false, + description : 'build ecore_cocoa' +) + option('build-id', type : 'string', value : 'none', diff --git a/src/lib/ecore_cocoa/meson.build b/src/lib/ecore_cocoa/meson.build new file mode 100644 index 0000000000..88d8eae3f4 --- /dev/null +++ b/src/lib/ecore_cocoa/meson.build @@ -0,0 +1,45 @@ +ecore_cocoa_deps = [eina, ecore_input, ecore, emile, eet] +pub_eo_file_target = [] + +ecore_cocoa_header_src = [ + 'Ecore_Cocoa.h' +] + +ecore_cocoa_src = [ + 'ecore_cocoa.m', + 'ecore_cocoa_keys.h', + 'ecore_cocoa_window.h', + 'ecore_cocoa_window.m', + 'ecore_cocoa_cnp.m', + 'ecore_cocoa_app.m', + 'ecore_cocoa_app.h', + 'ecore_cocoa_private.h' +] + +evas_include_directories = [ + include_directories(join_paths('..', 'evas')), + include_directories(join_paths('..', 'evas','common')), + include_directories(join_paths('..', 'evas','common3d')), + include_directories(join_paths('..', 'evas','common3d', 'save_load')), + include_directories(join_paths('..', 'evas','include')), + include_directories(join_paths('..', 'evas','filters')) +] + +ecore_cocoa_lib = library('ecore_cocoa', + ecore_cocoa_src, pub_eo_file_target, + dependencies: [ ecore_cocoa_deps], + include_directories : config_dir + evas_include_directories, + link_args : ['-lobjc', '-framework', 'CoreFoundation', '-framework', 'cocoa', '-Wl,-U,_evas_textblock_text_markup_to_utf8'], + install: true, +) + +ecore_cocoa = declare_dependency( + include_directories: [include_directories('.')], + link_with: ecore_cocoa_lib, + sources : pub_eo_file_target, + dependencies: [eina], +) + +install_headers(ecore_cocoa_header_src, + install_dir : dir_package_include, +) \ No newline at end of file --
