From 3d368b015e2032f86130b8a3f4d05ca72287c63a Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 15:41:42 -0700
Subject: [PATCH] Blocks/CMakeLists.txt: Fixed header list after merge of
 master

---
 src/Blocks/CMakeLists.txt |  3 ++-
 src/CMakeLists.txt        | 13 ++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index d7edf7f29..05b7bfab4 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -75,7 +75,7 @@ SET (HDRS
 	BlockSand.h
 	BlockSapling.h
 	BlockSideways.h
-	BlockSign.h
+	BlockSignPost.h
 	BlockSlab.h
 	BlockSnow.h
 	BlockStairs.h
@@ -89,6 +89,7 @@ SET (HDRS
 	BlockTripwire.h
 	BlockTripwireHook.h
 	BlockVine.h
+	BlockWallSign.h
 	BlockWorkbench.h
 	BroadcastInterface.h
 	ChunkInterface.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index afe766f13..2fe436125 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -248,17 +248,10 @@ 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
-
 	include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include")
 
-	foreach(folder ${FOLDERS})
-		add_subdirectory(${folder})
-	endforeach(folder)
-
 	#clear file
 	file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt)
 	foreach(dependecy ${BINDING_DEPENDECIES})
@@ -268,6 +261,10 @@ 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}")
 
@@ -275,8 +272,6 @@ if (NOT MSVC)
 	if (WIN32)
 		list(APPEND SOURCE "Resources/MCServer.rc")
 	endif()
-
-
 else ()
 	# MSVC-specific handling: Put all files into one project, separate by the folders: