From 4f60f5aef4517d6d3eaf2ea9f7aae30e6a97da25 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 1 Jul 2014 06:40:38 +0200
Subject: Fixed linking order under MinGW.

Ref.: #1044
---
 lib/sqlite/CMakeLists.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/lib/sqlite/CMakeLists.txt b/lib/sqlite/CMakeLists.txt
index 9add2280b..48bb5f15c 100644
--- a/lib/sqlite/CMakeLists.txt
+++ b/lib/sqlite/CMakeLists.txt
@@ -9,8 +9,14 @@ file(GLOB SOURCE
 )
 
 
-# add headers to MSVC project files:
+# Lua is required as a DLL for LuaSQLite:
 if (WIN32)
+	add_definitions(-DLUA_BUILD_AS_DLL)
+endif()
+
+
+# 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})
@@ -25,5 +31,5 @@ endif()
 add_library(sqlite ${SOURCE})
 
 if (UNIX)
-	target_link_libraries(sqlite ${DYNAMIC_LOADER})
+	target_link_libraries(sqlite ${DYNAMIC_LOADER} lua)
 endif()
-- 
cgit v1.2.3


From eb8244f1c286ec33c30ba205eb5cebc1f2a0430d Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 1 Jul 2014 08:01:39 +0200
Subject: Proper sqlite dependency fix.

---
 lib/sqlite/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/lib/sqlite/CMakeLists.txt b/lib/sqlite/CMakeLists.txt
index 48bb5f15c..993dac146 100644
--- a/lib/sqlite/CMakeLists.txt
+++ b/lib/sqlite/CMakeLists.txt
@@ -29,7 +29,8 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
 endif()
 
 add_library(sqlite ${SOURCE})
+target_link_libraries(sqlite lua)
 
 if (UNIX)
-	target_link_libraries(sqlite ${DYNAMIC_LOADER} lua)
+	target_link_libraries(sqlite ${DYNAMIC_LOADER})
 endif()
-- 
cgit v1.2.3