aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-19 18:58:23 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-19 20:00:16 +0200
commit3befed7283616d1830b00cd425c00ab9d7943ba1 (patch)
tree85ddd69db61d1bd8b0d6e28a902a4ed7bb1b74b0
parentbuild: seperate the engine build file from the rest (diff)
downloadefl-devs/bu5hm4n/evas-build-fixes.tar.gz
build: make it possible to link our engines against evasdevs/bu5hm4n/evas-build-fixes
it FINALLY happend! With this python bindings should be able to work again with a meson build, you can also enable b_lundef right now. And it appears to work, with this we can also get another step closer to a windows build.
-rw-r--r--meson.build29
-rw-r--r--src/lib/evas/meson.build2
-rw-r--r--src/modules/evas/engines/buffer/meson.build2
-rw-r--r--src/modules/evas/engines/drm/meson.build2
-rw-r--r--src/modules/evas/engines/fb/meson.build2
-rw-r--r--src/modules/evas/engines/gl_cocoa/meson.build2
-rw-r--r--src/modules/evas/engines/gl_drm/meson.build2
-rw-r--r--src/modules/evas/engines/gl_generic/meson.build2
-rw-r--r--src/modules/evas/engines/gl_x11/meson.build2
-rw-r--r--src/modules/evas/engines/software_ddraw/meson.build2
-rw-r--r--src/modules/evas/engines/software_gdi/meson.build2
-rw-r--r--src/modules/evas/engines/software_x11/meson.build2
-rw-r--r--src/modules/evas/engines/wayland_egl/meson.build2
-rw-r--r--src/modules/evas/engines/wayland_shm/meson.build2
-rw-r--r--src/modules/evas/meson.build1
15 files changed, 37 insertions, 19 deletions
diff --git a/meson.build b/meson.build
index 1ee603192a..9af4f86505 100644
--- a/meson.build
+++ b/meson.build
@@ -248,6 +248,27 @@ boot_strap_eolian = [
['eolian' ,[] , false, true, true, false, false, false, ['eina'], []],
]
+evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
+evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
+evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []]
+evas_goal = ['evas_goal' ,[], false, true, false, false, false, false, ['eina', 'efl', 'eo'], []]
+
+if get_option('evas-modules') == 'static'
+ evas_settings = [
+ evas_lib,
+ evas_img_modules,
+ evas_engines,
+ evas_goal,
+ ]
+else
+ evas_settings = [
+ evas_lib,
+ evas_img_modules,
+ evas_goal,
+ evas_engines,
+ ]
+endif
+
subprojects = [
# name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs
['evil' ,[] , false, true, false, false, false, false, [], []],
@@ -275,9 +296,7 @@ subprojects = [
['ector' ,[] , false, true, false, false, true, false, ['eina', 'efl'], ['draw', 'triangulator', 'freetype']],
['elput' ,['drm'] , false, true, false, false, true, false, ['eina', 'eldbus'], []],
['ecore_drm2' ,['drm'] , false, true, false, false, false, false, ['ecore'], ['libdrm']],
-['ecore_cocoa' ,['cocoa'] , false, true, false, false, false, false, ['eina'], []],
-['evas' ,[] , true, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']],
-['evas_goal' ,[] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []],
+['ecore_cocoa' ,['cocoa'] , false, true, false, false, false, false, ['eina'], []]] + evas_settings +[
['ecore_input_evas' ,[] , false, true, false, false, false, false, ['eina', 'evas'], []],
['ecore_evas' ,[] , true, true, true, false, false, false, ['evas', 'ector'], []],
['ecore_imf' ,[] , true, true, false, false, false, false, ['eina'], []],
@@ -323,7 +342,7 @@ foreach package : subprojects
]
automatic_pkgfile = true
if package[1].length() == 0 or get_option(package[1][0])
- config_h.set('HAVE_'+package_name.to_upper(), '1')
+ config_h.set('HAVE_'+package_name.to_upper().underscorify(), '1')
dir_package_include = join_paths(dir_include, package_version_name)
dir_package_modules = join_paths(dir_lib, package_name, 'modules')
@@ -376,7 +395,7 @@ foreach package : subprojects
example_dirs += [package_name]
endif
- set_variable('build_'+package_name, true)
+ set_variable('build_'+package_name.underscorify(), true)
# generate automatic pc files for libraries
if automatic_pkgfile == true and package[3]
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 91cc0abc5c..e3dddaa3cd 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -178,7 +178,7 @@ if get_option('opengl') != 'none'
endif
evas_pre = declare_dependency(
- include_directories: evas_include_directories + [vg_common_inc_dir],
+ include_directories: evas_include_directories + [vg_common_inc_dir] + [include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))],
sources : pub_eo_file_target + priv_eo_file_target,
dependencies: [eina, eo, ector, emile, evas_deps, m],
)
diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build
index b5742217a3..b5b5541466 100644
--- a/src/modules/evas/engines/buffer/meson.build
+++ b/src/modules/evas/engines/buffer/meson.build
@@ -16,7 +16,7 @@ install_headers('Evas_Engine_Buffer.h',
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/drm/meson.build b/src/modules/evas/engines/drm/meson.build
index 0c2933dc7e..441a09a316 100644
--- a/src/modules/evas/engines/drm/meson.build
+++ b/src/modules/evas/engines/drm/meson.build
@@ -10,7 +10,7 @@ engine_deps = [ecore_drm2, libdrm]
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/fb/meson.build b/src/modules/evas/engines/fb/meson.build
index 0f80a8ad04..c857e83aec 100644
--- a/src/modules/evas/engines/fb/meson.build
+++ b/src/modules/evas/engines/fb/meson.build
@@ -12,7 +12,7 @@ engine_deps = [ecore_fb]
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_cocoa/meson.build b/src/modules/evas/engines/gl_cocoa/meson.build
index 2e6b91ce21..a175c3c730 100644
--- a/src/modules/evas/engines/gl_cocoa/meson.build
+++ b/src/modules/evas/engines/gl_cocoa/meson.build
@@ -10,7 +10,7 @@ engine_deps = [ecore_cocoa, gl_deps]
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_drm/meson.build b/src/modules/evas/engines/gl_drm/meson.build
index 0c80fa6922..28988d5599 100644
--- a/src/modules/evas/engines/gl_drm/meson.build
+++ b/src/modules/evas/engines/gl_drm/meson.build
@@ -10,7 +10,7 @@ engine_deps = [ecore_drm2, libdrm, gl_deps, dependency('gbm')]
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build
index 1b616d97b5..d18e032f7a 100644
--- a/src/modules/evas/engines/gl_generic/meson.build
+++ b/src/modules/evas/engines/gl_generic/meson.build
@@ -72,7 +72,7 @@ engine_include_dir = include_directories(join_paths('..','software_generic'), jo
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_x11/meson.build b/src/modules/evas/engines/gl_x11/meson.build
index d4c8a29109..7aec198e39 100644
--- a/src/modules/evas/engines/gl_x11/meson.build
+++ b/src/modules/evas/engines/gl_x11/meson.build
@@ -10,7 +10,7 @@ engine_deps = [ecore_x_deps, gl_deps]
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/software_ddraw/meson.build b/src/modules/evas/engines/software_ddraw/meson.build
index 83bfca3c55..2f6f580e3f 100644
--- a/src/modules/evas/engines/software_ddraw/meson.build
+++ b/src/modules/evas/engines/software_ddraw/meson.build
@@ -12,7 +12,7 @@ engine_deps = []
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/software_gdi/meson.build b/src/modules/evas/engines/software_gdi/meson.build
index ef71d76587..63a1c2c232 100644
--- a/src/modules/evas/engines/software_gdi/meson.build
+++ b/src/modules/evas/engines/software_gdi/meson.build
@@ -12,7 +12,7 @@ engine_deps = []
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/software_x11/meson.build b/src/modules/evas/engines/software_x11/meson.build
index 74f1bc631c..b5409568c0 100644
--- a/src/modules/evas/engines/software_x11/meson.build
+++ b/src/modules/evas/engines/software_x11/meson.build
@@ -31,7 +31,7 @@ engine_deps = [x11, ecore_x, ecore_x_deps, gl_deps]
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/wayland_egl/meson.build b/src/modules/evas/engines/wayland_egl/meson.build
index fa087b1ec0..818210fc62 100644
--- a/src/modules/evas/engines/wayland_egl/meson.build
+++ b/src/modules/evas/engines/wayland_egl/meson.build
@@ -12,7 +12,7 @@ engine_include_dir = include_directories(join_paths('..','wayland_common'))
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/wayland_shm/meson.build b/src/modules/evas/engines/wayland_shm/meson.build
index 6e09109c9c..29453841cc 100644
--- a/src/modules/evas/engines/wayland_shm/meson.build
+++ b/src/modules/evas/engines/wayland_shm/meson.build
@@ -11,7 +11,7 @@ engine_include_dir = include_directories(join_paths('..','wayland_common'))
if get_option('evas-modules') == 'shared'
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
- dependencies : [eina, evas_pre] + engine_deps,
+ dependencies : [eina, evas] + engine_deps,
install : true,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
diff --git a/src/modules/evas/meson.build b/src/modules/evas/meson.build
index 25549122f2..a79dc6800b 100644
--- a/src/modules/evas/meson.build
+++ b/src/modules/evas/meson.build
@@ -14,4 +14,3 @@ subdir('model_savers')
subdir('model_loaders')
subdir('vg_savers')
subdir('vg_loaders')
-subdir('engines')