summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2018-10-11 18:13:03 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2018-10-11 18:13:03 +0200
commit707d4d2d7f5df3ac9efb333b35a1f049514ce248 (patch)
tree9093804ec4947675f9e9f82edf12db3fd19a5411
parentb2d53d7379fc1f38523af6a3a448943e73ab1d96 (diff)
efl is mesonized
-rwxr-xr-xbuild-box.sh4
-rwxr-xr-xbuild-fcts.sh20
-rw-r--r--clang-flags.conf1
3 files changed, 2 insertions, 23 deletions
diff --git a/build-box.sh b/build-box.sh
index aee32f8..df4a321 100755
--- a/build-box.sh
+++ b/build-box.sh
@@ -25,8 +25,8 @@ source "${_BASE_}/build-fcts.sh"
25declare -a cfgs=(efl e terminology evisum clouseau profiler evisum ephoto rage extra eruler enventor edi eflete theme_viewer) 25declare -a cfgs=(efl e terminology evisum clouseau profiler evisum ephoto rage extra eruler enventor edi eflete theme_viewer)
26declare -A build_cfgs=( 26declare -A build_cfgs=(
27 ["efl",0]="core/efl" 27 ["efl",0]="core/efl"
28 ["efl",1]="$EFL_FLAGS" 28 ["efl",1]="-Doptimization=2 -Dharfbuzz=true -Dbuild-examples=false -Dbuild-tests=false -Ddrm=true" #-Dwl=true"
29 ["efl",2]="NO_CMAKE" 29 ["efl",2]="USE_MESON"
30 ["e",0]="core/enlightenment" 30 ["e",0]="core/enlightenment"
31 ["e",1]="-Dwayland=true" 31 ["e",1]="-Dwayland=true"
32 ["e",2]="USE_MESON" 32 ["e",2]="USE_MESON"
diff --git a/build-fcts.sh b/build-fcts.sh
index a725e20..9445b64 100755
--- a/build-fcts.sh
+++ b/build-fcts.sh
@@ -10,12 +10,6 @@
10# export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$EFLDIR/lib/pkgconfig 10# export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$EFLDIR/lib/pkgconfig
11# #export XDG_DATA_DIRS=$XDG_DATA_DIRS:$EFLDIR/share 11# #export XDG_DATA_DIRS=$XDG_DATA_DIRS:$EFLDIR/share
12 12
13#
14# EFL_API=(legacy|eo|both)
15# EFL_TESTS=(none|regular|coverage)
16# EFL_PROFILE=(release|dev|debug)
17#
18
19set -e 13set -e
20shopt -s expand_aliases 14shopt -s expand_aliases
21 15
@@ -49,20 +43,6 @@ TRY_CMAKE=${TRY_CMAKE:-1}
49 43
50TAGS_PATH=$HOME"/share/ctags/efl.tags" 44TAGS_PATH=$HOME"/share/ctags/efl.tags"
51 45
52EFL_API=${EFL_API:-"both"}
53EFL_TESTS=${EFL_TESTS:-"regular"}
54EFL_PROFILE=${EFL_PROFILE:-"dev"}
55EFL_DBUS_DIR=${EFL_DBUS_DIR:-"/usr/share/dbus-1/services"}
56
57EFL_FLAGS="--disable-static --disable-doc"
58EFL_FLAGS+=" --with-api=${EFL_API} --with-tests=${EFL_TESTS} --with-profile=${EFL_PROFILE} --with-dbus-services=${EFL_DBUS_DIR}"
59EFL_FLAGS+=" --enable-harfbuzz --enable-elput --enable-gstreamer1" #--enable-alsa --enable-libvlc"
60EFL_FLAGS+=" --with-x11=xlib --with-opengl=es --enable-egl --enable-drm --enable-gl-drm --enable-wayland"
61
62E_FLAGS=" --enable-pam --enable-device-udev --enable-mount-udisks --enable-mount-eeze"
63E_FLAGS+=" --enable-egl --enable-wayland --enable-wayland-egl --enable-xwayland --enable-wl-x11"
64E_FLAGS+=" --enable-wl-desktop-shell -enable-wl-drm --enable-wl-text-input --enable-wl-weekeyboard"
65
66CLEAN_LEVEL=0 46CLEAN_LEVEL=0
67for arg in $@; do 47for arg in $@; do
68 if [ "x$arg" = "x+c" ]; then CLEAN_LEVEL=$(($CLEAN_LEVEL+1)); fi 48 if [ "x$arg" = "x+c" ]; then CLEAN_LEVEL=$(($CLEAN_LEVEL+1)); fi
diff --git a/clang-flags.conf b/clang-flags.conf
index a70a0dc..f752f45 100644
--- a/clang-flags.conf
+++ b/clang-flags.conf
@@ -6,5 +6,4 @@ CFLAGS="-O2 -march=native -ffast-math -W -Wall -Wextra -Wshadow"
6#CFLAGS="-g3 -ggdb3 -O2 -march=native -ffast-math -W -Wall -Wextra -Wshadow" 6#CFLAGS="-g3 -ggdb3 -O2 -march=native -ffast-math -W -Wall -Wextra -Wshadow"
7#CFLAGS="-g3 -ggdb3 -O0" 7#CFLAGS="-g3 -ggdb3 -O0"
8CFLAGS+=" -Qunused-arguments -Wno-parentheses-equality -Wno-array-bounds -Wno-unused-const-variable -Wno-missing-field-initializers -fvisibility=hidden" 8CFLAGS+=" -Qunused-arguments -Wno-parentheses-equality -Wno-array-bounds -Wno-unused-const-variable -Wno-missing-field-initializers -fvisibility=hidden"
9EFL_TESTS="regular"
10 9