2 files changed, 30 insertions, 18 deletions

diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index 41c641d9d..50b81e42a 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -2,17 +2,22 @@
 cmake_minimum_required (VERSION 2.6)
 project (MCServer)
 
+# NOTE: This CMake file is processed only for Unix builds; Windows(MSVC) builds handle all the subfolders in /src in a single file, /src/CMakeLists.txt
+
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
- ADD_CUSTOM_COMMAND(
-#add any new generated bindings here
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Bindings.cpp ${CMAKE_CURRENT_BINARY_DIR}/Bindings.h
-#command execuded to regerate bindings
-   COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
-#add any new generation dependencies here
-   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/AllToLua.pkg tolua
-   )
-   
+ADD_CUSTOM_COMMAND(
+	# add any new generated bindings here
+	OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Bindings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Bindings.h
+	
+	# command execuded to regerate bindings
+	COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
+	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+	
+	# add any new generation dependencies here
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/AllToLua.pkg tolua
+)
+
 #add cpp files here
 add_library(Bindings PluginManager LuaState WebPlugin Bindings ManualBindings LuaWindow Plugin PluginLua WebPlugin)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88e469b74..bd06798ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ set(FOLDERS ${FOLDERS} WorldStorage Mobs Entities Simulator UI BlockEntities)
 
 
 
-if (NOT WIN32)
+if (NOT MSVC)
 	foreach(folder ${FOLDERS})
 		add_subdirectory(${folder})
 	endforeach(folder)
@@ -62,18 +62,25 @@ else ()
 endif()
 
 
-if (UNIX)
-	set(EXECUTABLE ../MCServer/MCServer)
-else ()
-	set(EXECUTABLE MCServer)
-endif ()
-
+set(EXECUTABLE MCServer)
 
 add_executable(${EXECUTABLE} ${SOURCE})
 
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/MCServer)
+
+if (MSVC)
+	# MSVC generator adds a "Debug" or "Release" postfixes to the EXECUTABLE_OUTPUT_PATH, we need to cancel them:
+	SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES PREFIX "../")
+	SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES IMPORT_PREFIX "../")
+endif()
+
+
+# Make the debug executable have a "_debug" suffix
+SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES DEBUG_POSTFIX "_debug")
+
 
 # Precompiled headers (2nd part)
-if (WIN32)
+if (MSVC)
 	SET_TARGET_PROPERTIES(
 		${EXECUTABLE} PROPERTIES COMPILE_FLAGS "/Yu\"Globals.h\""
 		OBJECT_DEPENDS "$(IntDir)/$(TargetName.pch)"
@@ -81,7 +88,7 @@ if (WIN32)
 endif ()
 
 
-if (NOT WIN32)
+if (NOT MSVC)
 	target_link_libraries(${EXECUTABLE} OSSupport HTTPServer Bindings Items Blocks)
 	target_link_libraries(${EXECUTABLE} Protocol Generating WorldStorage)
 	target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI BlockEntities)