From 9a7dd0a0770178529c704c08bc446e3533b1f3e5 Mon Sep 17 00:00:00 2001
From: Julian Laubstein <julianlaubstein@yahoo.de>
Date: Wed, 4 Nov 2015 22:32:11 +0100
Subject: Outsourced all libraries into submodules

---
 lib/lua                |  1 +
 lib/lua/CMakeLists.txt | 70 --------------------------------------------------
 2 files changed, 1 insertion(+), 70 deletions(-)
 create mode 160000 lib/lua
 delete mode 100644 lib/lua/CMakeLists.txt

(limited to 'lib/lua/CMakeLists.txt')

diff --git a/lib/lua b/lib/lua
new file mode 160000
index 000000000..dd27acefc
--- /dev/null
+++ b/lib/lua
@@ -0,0 +1 @@
+Subproject commit dd27acefcd98a28c68e686f414a42302113471fc
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
deleted file mode 100644
index 8017a7a3c..000000000
--- a/lib/lua/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.2)
-project (lua)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
-
-file(GLOB SOURCE
-	"src/*.c"
-)
-
-list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.c" "${PROJECT_SOURCE_DIR}/src/luac.c")
-
-# add headers to MSVC project files:
-if (MSVC)
-	file(GLOB HEADERS "src/*.h")
-	list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.h" "${PROJECT_SOURCE_DIR}/src/luac.h")
-	set(SOURCE ${SOURCE} ${HEADERS})
-	source_group("Sources" FILES ${SOURCE})
-endif()
-
-
-# Lua needs to be linked dynamically on Windows and statically on *nix, so that LuaRocks work
-if (WIN32)
-	add_library(lua SHARED ${SOURCE})
-	set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Server)
-
-	# Output the executable into the $/Server folder, so that Cuberite can find it:
-	set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Server)
-	SET_TARGET_PROPERTIES(lua PROPERTIES
-		ARCHIVE_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_SOURCE_DIR}/Server
-		ARCHIVE_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_SOURCE_DIR}/Server
-		ARCHIVE_OUTPUT_DIRECTORY_DEBUGPROFILE   ${CMAKE_SOURCE_DIR}/Server
-		ARCHIVE_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/Server
-		LIBRARY_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_SOURCE_DIR}/Server
-		LIBRARY_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_SOURCE_DIR}/Server
-		LIBRARY_OUTPUT_DIRECTORY_DEBUGPROFILE   ${CMAKE_SOURCE_DIR}/Server
-		LIBRARY_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/Server
-		RUNTIME_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_SOURCE_DIR}/Server
-		RUNTIME_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_SOURCE_DIR}/Server
-		RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE   ${CMAKE_SOURCE_DIR}/Server
-		RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/Server
-	)
-
-	if (MSVC)
-		# Remove SCL warnings, we expect this library to have been tested safe
-		SET_TARGET_PROPERTIES(
-			lua PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS"
-		)
-	endif()
-
-	set_target_properties(lua PROPERTIES OUTPUT_NAME "lua51" PREFIX "")
-
-	# NOTE: The DLL for each configuration is stored at the same place, thus overwriting each other.
-	# This is known, however such behavior is needed for LuaRocks - they always load "lua5.1.dll" or "lua51.dll"
-	# We make it work by compiling to "lua51.dll" and providing a proxy-DLL "lua5.1.dll"
-	# See http://lua-users.org/wiki/LuaProxyDllFour for details
-else()
-	add_library(lua ${SOURCE})
-endif()
-
-
-# Tell Lua what dynamic loader to use (for LuaRocks):
-if (UNIX)
-	add_definitions(-DLUA_USE_DLOPEN)
-endif()
-
-if (UNIX)
-	target_link_libraries(lua m ${DYNAMIC_LOADER})
-endif()
-
-- 
cgit v1.2.3