[EGIT] [laugh] 03/04: Cleanup, prepare for EFL

[Enlightenment Git]

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch efl
in repository laugh.

View the commit online.

commit a90f12f25b4f11f85bcc4254edc41f2d75595f77
Author: melerva <m...@minacious.net>
AuthorDate: Sun Sep 21 12:59:14 2025 -0400

    Cleanup, prepare for EFL
---
 meson.build                 | 32 ++++++++++++++++++--------------
 src/modules/laugh_ui.c      |  2 +-
 src/modules/mod_packagegc.c |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index a0053d7..82699f7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,7 @@
 project('laugh', 'c')
 
+prog_xxd = find_program('xxd')
+
 lua_dep = dependency('lua-5.4', required: true)
 physfs_dep = dependency('physfs', required: true)
 efl_core_dep = dependency('efl-core', required: get_option('use_efl'))
@@ -17,18 +19,6 @@ add_project_dependencies(
   language: 'c',
 )
 
-conf = configuration_data()
-conf.set('LAUGH_VERSION_MAJOR', 0)
-conf.set('LAUGH_VERSION_MINOR', 0)
-conf.set('LAUGH_VERSION_PATCH', 0)
-
-conf.set('EFL_BETA_API_SUPPORT', 1)
-conf.set('LAUGH_USE_EFL_CORE', efl_core_dep.found())
-conf.set('LAUGH_USE_EFL_NET', efl_net_dep.found())
-conf.set('LAUGH_USE_EFL_UI', efl_ui_dep.found())
-
-prog_xxd = find_program('xxd')
-
 laugh_sources = [
   'src/main.c',
   'src/modules/laugh.c',
@@ -38,17 +28,31 @@ laugh_sources = [
   custom_target('laugh_ui.lua.h',
     output: 'laugh_ui.lua.h',
     input: 'src/modules/laugh_ui.lua',
-    command: [prog_xxd, '-i', '-n', 'laugh_ui_str', '@INPUT@', '@OUTPUT@'],
+    command: [prog_xxd, '-i', '-n', 'laugh_ui_s', '@INPUT@', '@OUTPUT@'],
   ),
 ]
 
+conf = configuration_data()
+conf.set('LAUGH_VERSION_MAJOR', 0)
+conf.set('LAUGH_VERSION_MINOR', 0)
+conf.set('LAUGH_VERSION_PATCH', 0)
+
+conf.set('EFL_BETA_API_SUPPORT', 1) # harmless if unused
+conf.set('LAUGH_USE_EFL_CORE', efl_core_dep.found())
+conf.set('LAUGH_USE_EFL_NET', efl_net_dep.found())
+
+if efl_ui_dep.found()
+  conf.set('LAUGH_USE_EFL_UI', true)
+  laugh_sources += 'src/modules/laugh_ui_efl.c'
+endif
+
 if get_option('mod_packagegc')
   conf.set('LAUGH_MOD_PACKAGEGC', true)
   laugh_sources += 'src/modules/mod_packagegc.c'
   laugh_sources += custom_target('mod_packagegc.lua.h',
     output: 'mod_packagegc.lua.h',
     input: 'src/modules/mod_packagegc.lua',
-    command: [prog_xxd, '-i', '-n', 'mod_packagegc_str', '@INPUT@', '@OUTPUT@'],
+    command: [prog_xxd, '-i', '-n', 'mod_packagegc_s', '@INPUT@', '@OUTPUT@'],
   )
 endif
 
diff --git a/src/modules/laugh_ui.c b/src/modules/laugh_ui.c
index b92491e..c0c85a1 100644
--- a/src/modules/laugh_ui.c
+++ b/src/modules/laugh_ui.c
@@ -9,7 +9,7 @@ int luaopen_laugh_ui(lua_State *const L) {
 #include "laugh_ui.lua.h"
 #undef int
 #undef unsigned
-  luaL_loadbuffer(L, laugh_ui_str, laugh_ui_str_len, "laugh.ui");
+  luaL_loadbuffer(L, laugh_ui_s, laugh_ui_s_len, "laugh.ui");
   lua_call(L, 0, 1);
   return 1;
 }
diff --git a/src/modules/mod_packagegc.c b/src/modules/mod_packagegc.c
index 5f402c1..536804b 100644
--- a/src/modules/mod_packagegc.c
+++ b/src/modules/mod_packagegc.c
@@ -9,7 +9,7 @@ int luaopen_mod_packagegc(lua_State *const L) {
 #include "mod_packagegc.lua.h"
 #undef int
 #undef unsigned
-  luaL_loadbuffer(L, mod_packagegc_str, mod_packagegc_str_len, "mod_packagegc");
+  luaL_loadbuffer(L, mod_packagegc_s, mod_packagegc_s_len, "mod_packagegc");
   lua_call(L, 0, 1);
   return 1;
 }


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.