3 files changed, 36 insertions, 9 deletions

diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt
index df9e8d57c..667804b9a 100644
--- a/lib/expat/CMakeLists.txt
+++ b/lib/expat/CMakeLists.txt
@@ -2,10 +2,15 @@
 cmake_minimum_required (VERSION 2.6)
 project (expat)
 
-include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
-
 file(GLOB SOURCE
     "*.c"
 )
 
+# add headers to MSVC project files:
+if (WIN32)
+	file(GLOB HEADERS "*.h")
+	set(SOURCE ${SOURCE} ${HEADERS})
+	source_group("Sources" FILES ${SOURCE})
+endif()
+
 add_library(expat ${SOURCE})
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
index 4787b6aa6..63ac18e90 100644
--- a/lib/lua/CMakeLists.txt
+++ b/lib/lua/CMakeLists.txt
@@ -8,12 +8,23 @@ file(GLOB SOURCE
 	"src/*.c"
 )
 
-if(${STATIC_LUA})
-add_library(lua ${SOURCE})
+list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.c" "${PROJECT_SOURCE_DIR}/src/luac.c")
+
+# add headers to MSVC project files:
+if (WIN32)
+	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})
 else()
-add_library(lua SHARED ${SOURCE})
+	add_library(lua ${SOURCE})
 endif()
 
-if(UNIX)
-target_link_libraries(lua m dl)
+if (UNIX)
+	target_link_libraries(lua m dl)
 endif()
diff --git a/lib/sqlite/CMakeLists.txt b/lib/sqlite/CMakeLists.txt
index 8596e2d9c..07e5a22cb 100644
--- a/lib/sqlite/CMakeLists.txt
+++ b/lib/sqlite/CMakeLists.txt
@@ -2,13 +2,24 @@
 cmake_minimum_required (VERSION 2.6)
 project (sqlite)
 
-include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 file(GLOB SOURCE
     "*.c"
 )
 
+
+# add headers to MSVC project files:
+if (WIN32)
+	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()
+
+
 add_library(sqlite ${SOURCE})
 
-target_link_libraries(sqlite dl)
+if (UNIX)
+	target_link_libraries(sqlite dl)
+endif()