1 files changed, 104 insertions, 91 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 900577526..335ce8315 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,98 +8,118 @@ include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/polarssl/include")
 set(FOLDERS OSSupport HTTPServer Items Blocks Protocol Generating PolarSSL++)
 set(FOLDERS ${FOLDERS} WorldStorage Mobs Entities Simulator UI BlockEntities Generating/Prefabs)
 
+set(BINDING_DEPENDECIES
+	tolua
+	${CMAKE_CURRENT_SOURCE_DIR}/Bindings/virtual_method_hooks.lua
+	${CMAKE_CURRENT_SOURCE_DIR}/Bindings/AllToLua.pkg
+	Bindings/LuaFunctions.h
+	Bindings/LuaWindow.h
+	Bindings/Plugin.h
+	Bindings/PluginLua.h
+	Bindings/PluginManager.h
+	Bindings/WebPlugin.h
+	BiomeDef.h
+	BlockArea.h
+	BlockEntities/BlockEntity.h
+	BlockEntities/BlockEntityWithItems.h
+	BlockEntities/ChestEntity.h
+	BlockEntities/DispenserEntity.h
+	BlockEntities/DropSpenserEntity.h
+	BlockEntities/DropperEntity.h
+	BlockEntities/FurnaceEntity.h
+	BlockEntities/HopperEntity.h
+	BlockEntities/JukeboxEntity.h
+	BlockEntities/NoteEntity.h
+	BlockEntities/SignEntity.h
+	BlockEntities/MobHeadEntity.h
+	BlockEntities/FlowerPotEntity.h
+	BlockID.h
+	BoundingBox.h
+	ChatColor.h
+	ChunkDef.h
+	ClientHandle.h
+	CraftingRecipes.h
+	Cuboid.h
+	Defines.h
+	Enchantments.h
+	Entities/Effects.h
+	Entities/Entity.h
+	Entities/Floater.h
+	Entities/Pawn.h
+	Entities/Painting.h
+	Entities/Pickup.h
+	Entities/Player.h
+	Entities/ProjectileEntity.h
+	Entities/ArrowEntity.h
+	Entities/ThrownEggEntity.h
+	Entities/ThrownEnderPearlEntity.h
+	Entities/ExpBottleEntity.h
+	Entities/ThrownSnowballEntity.h
+	Entities/FireChargeEntity.h
+	Entities/FireworkEntity.h
+	Entities/GhastFireballEntity.h
+	Entities/TNTEntity.h
+	Entities/ExpOrb.h
+	Entities/HangingEntity.h
+	Entities/ItemFrame.h
+	Generating/ChunkDesc.h
+	Group.h
+	Inventory.h
+	Item.h
+	ItemGrid.h
+	Mobs/Monster.h
+	OSSupport/File.h
+	Root.h
+	Server.h
+	StringUtils.h
+	Tracer.h
+	UI/Window.h
+	Vector3.h
+	WebAdmin.h
+	World.h
+)
 
-if (NOT MSVC)
+include_directories(Bindings)
+include_directories(.)
 
-	# Bindings need to reference other folders, so they are done here instead
-	
-	# lib dependencies are not included
-	
-	set(BINDING_DEPENDECIES
-		tolua
-		${CMAKE_CURRENT_SOURCE_DIR}/Bindings/virtual_method_hooks.lua
-		${CMAKE_CURRENT_SOURCE_DIR}/Bindings/AllToLua.pkg
-		Bindings/LuaFunctions.h
-		Bindings/LuaWindow.h
-		Bindings/Plugin.h
-		Bindings/PluginLua.h
-		Bindings/PluginManager.h
-		Bindings/WebPlugin.h
-		BiomeDef.h
-		BlockArea.h
-		BlockEntities/BlockEntity.h
-		BlockEntities/BlockEntityWithItems.h
-		BlockEntities/ChestEntity.h
-		BlockEntities/DispenserEntity.h
-		BlockEntities/DropSpenserEntity.h
-		BlockEntities/DropperEntity.h
-		BlockEntities/FurnaceEntity.h
-		BlockEntities/HopperEntity.h
-		BlockEntities/JukeboxEntity.h
-		BlockEntities/NoteEntity.h
-		BlockEntities/SignEntity.h
-		BlockEntities/MobHeadEntity.h
-		BlockEntities/FlowerPotEntity.h
-		BlockID.h
-		BoundingBox.h
-		ChatColor.h
-		ChunkDef.h
-		ClientHandle.h
-		CraftingRecipes.h
-		Cuboid.h
-		Defines.h
-		Enchantments.h
-		Entities/Effects.h
-		Entities/Entity.h
-		Entities/Floater.h
-		Entities/Pawn.h
-		Entities/Painting.h
-		Entities/Pickup.h
-		Entities/Player.h
-		Entities/ProjectileEntity.h
-		Entities/ArrowEntity.h
-		Entities/ThrownEggEntity.h
-		Entities/ThrownEnderPearlEntity.h
-		Entities/ExpBottleEntity.h
-		Entities/ThrownSnowballEntity.h
-		Entities/FireChargeEntity.h
-		Entities/FireworkEntity.h
-		Entities/GhastFireballEntity.h
-		Entities/TNTEntity.h
-		Entities/ExpOrb.h
-		Entities/HangingEntity.h
-		Entities/ItemFrame.h
-		Generating/ChunkDesc.h
-		Group.h
-		Inventory.h
-		Item.h
-		ItemGrid.h
-		Mobs/Monster.h
-		OSSupport/File.h
-		Root.h
-		Server.h
-		StringUtils.h
-		Tracer.h
-		UI/Window.h
-		Vector3.h
-		WebAdmin.h
-		World.h
+if (WIN32)
+	ADD_CUSTOM_COMMAND(
+		# add any new generated bindings here
+		OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.h
+
+		# Copy the Lua DLL into the Bindings folder, so that tolua can run from there:
+		COMMAND copy /y ..\\..\\MCServer\\lua51.dll .
+
+		# Regenerate bindings:
+		COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/
+
+		# add any new generation dependencies here
+		DEPENDS ${BINDING_DEPENDECIES}
 	)
-	
-	include_directories(Bindings)
-	include_directories(.)
-	
+else ()
 	ADD_CUSTOM_COMMAND(
 		# add any new generated bindings here
 		OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.h
-	
-		# command execuded to regerate bindings
+
+		# Regenerate bindings:
 		COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/
-	
+
 		# add any new generation dependencies here
 		DEPENDS ${BINDING_DEPENDECIES}
 	)
+endif ()
+set_source_files_properties(Bindings/Bindings.cpp PROPERTIES GENERATED TRUE)
+set_source_files_properties(Bindings/Bindings.h PROPERTIES GENERATED TRUE)
+
+if (NOT MSVC)
+
+	# Bindings need to reference other folders, so they are done here instead
+	
+	# lib dependencies are not included
+	
+	
 	#add cpp files here
 	add_library(Bindings
 		Bindings/Bindings
@@ -148,16 +168,6 @@ if (NOT MSVC)
 else ()
 	# MSVC-specific handling: Put all files into one project, separate by the folders:
 
-	# Generate the Bindings if they don't exist:
-	if (NOT EXISTS "${PROJECT_SOURCE_DIR}/Bindings/Bindings.cpp")
-		message("Bindings.cpp not found, generating now")
-		set(tolua_executable ${PROJECT_SOURCE_DIR}/Bindings/tolua++.exe)
-		execute_process(
-			COMMAND ${tolua_executable} -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
-			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/Bindings
-		)
-	endif()
-
 	# Get all files in this folder:
 	file(GLOB_RECURSE SOURCE
 		"*.cpp"
@@ -166,6 +176,9 @@ else ()
 	)
 	source_group("" FILES ${SOURCE})
 
+	LIST(APPEND SOURCE "Bindings/Bindings.cpp" "Bindings/Bindings.h")
+	source_group(Bindings FILES "Bindings/Bindings.cpp" "Bindings/Bindings.h")
+
 	# Add all subfolders as solution-folders:
 	list(APPEND FOLDERS "Resources")
 	list(APPEND FOLDERS "Bindings")