1 files changed, 7 insertions, 115 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2fe436125..6008d3174 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,78 +10,6 @@ set(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/gen_LuaState_Call.lua
-	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/EntityEffect.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
-)
-
 SET (SRCS
 	BiomeDef.cpp
 	BlockArea.cpp
@@ -207,51 +135,19 @@ SET (HDRS
 	World.h
 	XMLParser.h)
 
-# List all the files that are generated as part of the Bindings build process
-set (BINDING_OUTPUTS
-	${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.h
-	${CMAKE_CURRENT_SOURCE_DIR}/Bindings/LuaState_Call.inc
-)
-
-include_directories(Bindings)
-include_directories(.)
-
-if (WIN32)
-	ADD_CUSTOM_COMMAND(
-		OUTPUT ${BINDING_OUTPUTS}
-
-		# Copy the Lua DLL into the Bindings folder, so that tolua can run from there:
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different ../../MCServer/lua51.dll ./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}
-	)
-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
-
-		# 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)
+include_directories(".")
 
 if (NOT MSVC)
 	# Bindings need to reference other folders, so they are done here instead
 	# lib dependencies are not included
 	include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include")
 
+	foreach(folder ${FOLDERS})
+		add_subdirectory(${folder})
+	endforeach(folder)
+
+	get_directory_property(BINDING_DEPENDENCIES DIRECTORY "Bindings" DEFINITION BINDING_DEPENDENCIES)
+
 	#clear file
 	file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt)
 	foreach(dependecy ${BINDING_DEPENDECIES})
@@ -261,10 +157,6 @@ if (NOT MSVC)
 
 	set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "Bindings.cpp Bindings.h")
 
-	foreach(folder ${FOLDERS})
-		add_subdirectory(${folder})
-	endforeach(folder)
-
 	list(APPEND SOURCE "${SRCS}")
 	list(APPEND SOURCE "${HDRS}")