This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit 5d5d8073db5a8a765e5a319992e9cba3729814de
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 14:10:51 2024 +0500
meson: join_path - clean src/static_libs
---
src/static_libs/buildsystem/meson.build | 6 +++---
src/static_libs/draw/meson.build | 8 ++++----
src/static_libs/triangulator/meson.build | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/static_libs/buildsystem/meson.build b/src/static_libs/buildsystem/meson.build
index dd3b1f6dab..2c12802e01 100644
--- a/src/static_libs/buildsystem/meson.build
+++ b/src/static_libs/buildsystem/meson.build
@@ -8,17 +8,17 @@ buildsystem_src = [
buildsystem_lib = static_library('buildsystem',
buildsystem_src,
dependencies : [eina, efl],
- include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
+ include_directories : config_dir + [include_directories('../../lib')],
install: false,
c_args : ['-DPACKAGE_SRC_DIR="'+ meson.source_root() +'"'],
)
buildsystem = declare_dependency(
- include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
+ include_directories: [include_directories('.'), include_directories('../../lib')],
link_with: buildsystem_lib,
dependencies: [eina],
)
buildsystem_simple = declare_dependency(
- include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
+ include_directories: [include_directories('.'), include_directories('../../lib')],
)
diff --git a/src/static_libs/draw/meson.build b/src/static_libs/draw/meson.build
index f9fbc96a83..2497b5cafc 100644
--- a/src/static_libs/draw/meson.build
+++ b/src/static_libs/draw/meson.build
@@ -12,7 +12,7 @@ draw_opt_lib = [ ]
if cpu_sse3 == true
draw_opt = static_library('draw_opt',
sources: [ 'draw_main_sse2.c' ],
- include_directories: config_dir + [include_directories(join_paths('..', '..', 'lib'))],
+ include_directories: config_dir + [include_directories('../../lib')],
c_args: native_arch_opt_c_args,
dependencies : [eina, efl]
)
@@ -22,19 +22,19 @@ else
endif
draw = declare_dependency(
- include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
+ include_directories: [include_directories('.'), include_directories('../../lib')],
dependencies: [eina, efl, rg_etc],
sources : draw_src,
link_with : draw_opt_lib
)
draw_without_deps = declare_dependency(
- include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
+ include_directories: [include_directories('.'), include_directories('../../lib')],
dependencies: [rg_etc_simple],
sources : draw_src,
link_with : draw_opt_lib
)
draw_simple = declare_dependency(
- include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
+ include_directories: [include_directories('.'), include_directories('../../lib')],
)
diff --git a/src/static_libs/triangulator/meson.build b/src/static_libs/triangulator/meson.build
index 1a1af2ac0e..e5bf956079 100644
--- a/src/static_libs/triangulator/meson.build
+++ b/src/static_libs/triangulator/meson.build
@@ -10,7 +10,7 @@ triangulator_src = [
triangulator_lib = static_library('triangulator',
triangulator_src,
dependencies : [eina, efl],
- include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
+ include_directories : config_dir + [include_directories('../../lib')],
install: false,
)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
