libs: Make Lua a submodule and reuse the FreeType engine submodule.

Author: illwieckz

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "libs/glm"]
 	path = libs/glm
 	url = https://github.com/Unvanquished/glm.git
+[submodule "libs/lua"]
+	path = libs/lua
+	url = https://github.com/Unvanquished/lua.git

CMakeLists.txt

@@ -87,29 +87,6 @@ if ((BUILD_GAME_NATIVE_DLL OR BUILD_GAME_NATIVE_EXE OR NACL) AND (BUILD_CGAME OR
     set(BUILDING_ANY_GAMELOGIC 1)
 endif()
 
-#########################################
-# Externally built library dependencies #
-#########################################
-if (NACL)
-    set(FREETYPE_LIBRARY ${DEPS_DIR}/pnacl_deps/lib/libfreetype.a)
-    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} ${DEPS_DIR}/pnacl_deps/lib/libpng16.a)
-    set(FREETYPE_INCLUDE_DIRS ${DEPS_DIR}/pnacl_deps/include/freetype2)
-    set(LUA_INCLUDE_DIR ${DEPS_DIR}/pnacl_deps/include)
-    set(LUA_LIBRARY ${DEPS_DIR}/pnacl_deps/lib/liblua.a)
-elseif (BUILDING_ANY_GAMELOGIC)
-    find_package(Lua REQUIRED)
-
-    if (BUILD_CGAME)
-        # Freetype (RmlUi dependency)
-        find_package(Freetype REQUIRED)
-        if (APPLE OR WIN32)
-            find_package(ZLIB REQUIRED)
-            set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES})
-        endif()
-    endif()
-endif()
-include_directories(${LUA_INCLUDE_DIR})
-
 ##################################
 # Libraries we build from source #
 ##################################
@@ -122,13 +99,28 @@ set(NACL_VM_INHERITED_OPTIONS ${NACL_VM_INHERITED_OPTIONS} RC_MAX_LAYERS RC_MAX_
 
 if (BUILDING_ANY_GAMELOGIC)
     if (BUILD_CGAME)
-        # Freetype
+        # Freetype (RmlUi dependency), already found for a native game when the client is built.
+        if (NACL)
+            include(${DAEMON_DIR}/freetype.cmake)
+        elseif (NOT BUILD_CLIENT)
+            prefer_package(Freetype ${DAEMON_DIR}/freetype.cmake)
+
+            if (Freetype_FOUND AND (APPLE OR WIN32))
+                find_package(ZLIB REQUIRED)
+                set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES})
+            endif()
+        endif()
+
         include_directories(${FREETYPE_INCLUDE_DIRS})
 
         # RmlUi
         include(${CMAKE_CURRENT_SOURCE_DIR}/rmlui.cmake)
     endif()
 
+    # Lua
+    prefer_package(Lua ${CMAKE_CURRENT_SOURCE_DIR}/lua.cmake)
+    include_directories(${LUA_INCLUDE_DIR})
+
     # Fastlz
     add_library(srclibs-fastlz EXCLUDE_FROM_ALL ${FASTLZLIST})
     set_target_properties(srclibs-fastlz PROPERTIES POSITION_INDEPENDENT_CODE ${GAME_PIE} FOLDER "libs")

daemon

@@ -0,0 +1,89 @@
+set(LUA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/lua)
+
+set(LUA_INCLUDE_DIR ${LUA_DIR})
+
+set(LUA_SRC_FILES
+	${LUA_DIR}/lapi.c
+	${LUA_DIR}/lapi.h
+	${LUA_DIR}/lauxlib.c
+	${LUA_DIR}/lauxlib.h
+	${LUA_DIR}/lbaselib.c
+	${LUA_DIR}/lcode.c
+	${LUA_DIR}/lcode.h
+	${LUA_DIR}/lcorolib.c
+	${LUA_DIR}/lctype.c
+	${LUA_DIR}/lctype.h
+	${LUA_DIR}/ldblib.c
+	${LUA_DIR}/ldebug.c
+	${LUA_DIR}/ldebug.h
+	${LUA_DIR}/ldo.c
+	${LUA_DIR}/ldo.h
+	${LUA_DIR}/ldump.c
+	${LUA_DIR}/lfunc.c
+	${LUA_DIR}/lfunc.h
+	${LUA_DIR}/lgc.c
+	${LUA_DIR}/lgc.h
+	${LUA_DIR}/linit.c
+	${LUA_DIR}/liolib.c
+	${LUA_DIR}/ljumptab.h
+	${LUA_DIR}/llex.c
+	${LUA_DIR}/llex.h
+	${LUA_DIR}/llimits.h
+	${LUA_DIR}/lmathlib.c
+	${LUA_DIR}/lmem.c
+	${LUA_DIR}/lmem.h
+	${LUA_DIR}/loadlib.c
+	${LUA_DIR}/lobject.c
+	${LUA_DIR}/lobject.h
+	${LUA_DIR}/lopcodes.c
+	${LUA_DIR}/lopcodes.h
+	${LUA_DIR}/lopnames.h
+	${LUA_DIR}/loslib.c
+	${LUA_DIR}/lparser.c
+	${LUA_DIR}/lparser.h
+	${LUA_DIR}/lprefix.h
+	${LUA_DIR}/lstate.c
+	${LUA_DIR}/lstate.h
+	${LUA_DIR}/lstring.c
+	${LUA_DIR}/lstring.h
+	${LUA_DIR}/lstrlib.c
+	${LUA_DIR}/ltable.c
+	${LUA_DIR}/ltable.h
+	${LUA_DIR}/ltablib.c
+#	${LUA_DIR}/ltests.c
+#	${LUA_DIR}/ltests.h
+	${LUA_DIR}/ltm.c
+	${LUA_DIR}/ltm.h
+#	${LUA_DIR}/lua.c
+	${LUA_DIR}/luaconf.h
+	${LUA_DIR}/lua.h
+	${LUA_DIR}/lualib.h
+	${LUA_DIR}/lundump.c
+	${LUA_DIR}/lundump.h
+	${LUA_DIR}/lutf8lib.c
+	${LUA_DIR}/lvm.c
+	${LUA_DIR}/lvm.h
+	${LUA_DIR}/lzio.c
+	${LUA_DIR}/lzio.h
+#	${LUA_DIR}/onelua.c
+)
+
+set(LUA_LIBRARY srclibs-lua)
+
+add_library(${LUA_LIBRARY} STATIC ${LUA_SRC_FILES})
+
+unset(LUA_DEFINITIONS)
+
+if (NACL AND USE_NACL_SAIGO)
+	# Workaround for this Saigo Clang internal error:
+	# > fatal error: error in backend: Cannot select: t21: ch = brind t20, t19
+	# > error: Not enough scratch registers when expanding indirect jump.
+	# See: https://github.com/Unvanquished/Unvanquished/pull/3195#issuecomment-2484530883
+	list(APPEND LUA_DEFINITIONS LUA_USE_JUMPTABLE=0)
+endif()
+
+set_target_properties(${LUA_LIBRARY} PROPERTIES
+	POSITION_INDEPENDENT_CODE ${GAME_PIE}
+	COMPILE_DEFINITIONS "${LUA_DEFINITIONS}"
+	FOLDER "libs"
+)