From ed9c052d57e1a591dd6606d184483d56bb1bb34a Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Wed, 16 Nov 2022 19:16:20 +0000
Subject: [PATCH] COMMON: Split Lua into a separate module

---
 Makefile.common                            |  4 +++
 common/lua/module.mk                       | 38 ++++++++++++++++++++++
 common/module.mk                           | 36 --------------------
 devtools/create_project/create_project.cpp |  1 +
 4 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 common/lua/module.mk

diff --git a/Makefile.common b/Makefile.common
index c8ad209e463..c20e08cfc6a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -39,6 +39,10 @@ MODULES += \
 	po \
 	doc
 
+ifdef USE_LUA
+MODULES += common/lua
+endif
+
 ifdef USE_MT32EMU
 MODULES += audio/softsynth/mt32
 endif
diff --git a/common/lua/module.mk b/common/lua/module.mk
new file mode 100644
index 00000000000..2b2c782e3af
--- /dev/null
+++ b/common/lua/module.mk
@@ -0,0 +1,38 @@
+MODULE := common/lua
+
+MODULE_OBJS := \
+	double_serialization.o \
+	lapi.o \
+	lauxlib.o \
+	lbaselib.o \
+	lcode.o \
+	ldblib.o \
+	ldebug.o \
+	ldo.o \
+	lfunc.o \
+	lgc.o \
+	linit.o \
+	liolib.o \
+	llex.o \
+	lmathlib.o \
+	lmem.o \
+	loadlib.o \
+	lobject.o \
+	lopcodes.o \
+	loslib.o \
+	lparser.o \
+	lstate.o \
+	lstring.o \
+	lstrlib.o \
+	ltable.o \
+	ltablib.o \
+	ltm.o \
+	lua_persist.o \
+	lua_persistence_util.o \
+	lua_unpersist.o \
+	lvm.o \
+	lzio.o \
+	scummvm_file.o
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/common/module.mk b/common/module.mk
index 0d27c0d145b..7045ff87edf 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -75,41 +75,5 @@ MODULE_OBJS += \
 	updates.o
 endif
 
-ifdef USE_LUA
-MODULE_OBJS += \
-	lua/double_serialization.o \
-	lua/lapi.o \
-	lua/lauxlib.o \
-	lua/lbaselib.o \
-	lua/lcode.o \
-	lua/ldblib.o \
-	lua/ldebug.o \
-	lua/ldo.o \
-	lua/lfunc.o \
-	lua/lgc.o \
-	lua/linit.o \
-	lua/liolib.o \
-	lua/llex.o \
-	lua/lmathlib.o \
-	lua/lmem.o \
-	lua/loadlib.o \
-	lua/lobject.o \
-	lua/lopcodes.o \
-	lua/loslib.o \
-	lua/lparser.o \
-	lua/lstate.o \
-	lua/lstring.o \
-	lua/lstrlib.o \
-	lua/ltable.o \
-	lua/ltablib.o \
-	lua/ltm.o \
-	lua/lua_persist.o \
-	lua/lua_persistence_util.o \
-	lua/lua_unpersist.o \
-	lua/lvm.o \
-	lua/lzio.o \
-	lua/scummvm_file.o
-endif
-
 # Include common rules
 include $(srcdir)/rules.mk
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 4863343e0c4..7387d0239f9 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1608,6 +1608,7 @@ void ProjectProvider::createProject(BuildSetup &setup) {
 		createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/base", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/common", setup.defines, setup.testDirs, in, ex);
+		createModuleList(setup.srcDir + "/common/lua", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/gui", setup.defines, setup.testDirs, in, ex);