From 7aa9e19a4835e7b8f1c3e2906a2942f6592f3b92 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@gmail.com>
Date: Tue, 16 Aug 2022 10:45:31 -0700
Subject: [PATCH] Define luabins as a valid subproject

---
 meson.build                         | 10 +++-------
 subprojects/luabins/meson.build     | 13 +++++++++++++
 subprojects/luabins/src/meson.build | 11 -----------
 3 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 subprojects/luabins/meson.build
 delete mode 100644 subprojects/luabins/src/meson.build

diff --git a/meson.build b/meson.build
index 4e44e265a..4834c8224 100644
--- a/meson.build
+++ b/meson.build
@@ -292,13 +292,9 @@ else
 endif
 
 if not deps.contains(luajit)
-    luajit_sp = subproject('luajit')
-    luajit_inc = luajit_sp.get_variable('src_inc')
-    deps += luajit_sp.get_variable('luajit_dep')
-else
-    luajit_inc = include_directories(luajit.get_variable('includedir'))
+    deps += subproject('luajit').get_variable('luajit_dep')
 endif
-subdir('subprojects/luabins/src')
+deps += subproject('luabins').get_variable('luabins_dep')
 
 dep_gl = dependency('gl', required: false)
 if not dep_gl.found()
@@ -342,7 +338,7 @@ aegisub_cpp_pch = ['src/include/agi_pre.h']
 aegisub_c_pch = ['src/include/agi_pre_c.h']
 
 aegisub = executable('aegisub', aegisub_src, version_h, acconf,
-                     link_with: [libresrc, libluabins, libaegisub],
+                     link_with: [libresrc, libaegisub],
                      include_directories: [libaegisub_inc, libresrc_inc, version_inc, deps_inc, include_directories('src')],
                      cpp_pch: aegisub_cpp_pch,
                      c_pch: aegisub_c_pch,
diff --git a/subprojects/luabins/meson.build b/subprojects/luabins/meson.build
new file mode 100644
index 000000000..a4ccf852a
--- /dev/null
+++ b/subprojects/luabins/meson.build
@@ -0,0 +1,13 @@
+project('luabins', ['c'])
+luabins_src = files(
+    'src/fwrite.c',
+    'src/load.c',
+    'src/luabins.c',
+    'src/luainternals.c',
+    'src/savebuffer.c',
+    'src/save.c',
+    'src/write.c',
+)
+
+luabins = static_library('luabins', luabins_src, dependencies: dependency('luajit'))
+luabins_dep = declare_dependency(link_with: luabins)
diff --git a/subprojects/luabins/src/meson.build b/subprojects/luabins/src/meson.build
deleted file mode 100644
index 3861eb6d2..000000000
--- a/subprojects/luabins/src/meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
-luabins_src = files(
-    'fwrite.c',
-    'load.c',
-    'luabins.c',
-    'luainternals.c',
-    'savebuffer.c',
-    'save.c',
-    'write.c',
-)
-
-libluabins = static_library('luabins', luabins_src, include_directories: luajit_inc)