8 files changed, 243 insertions, 324 deletions

diff --git a/.travis.yml b/.travis.yml
index 38dd2f280..c6537cf47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ compiler:
   - gcc
   - clang
 # Build MCServer
-script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DSELF_TEST=1 && make -j 2 && cd MCServer/ && (echo stop | ./MCServer)
+script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_TOOLS=1 -DSELF_TEST=1 && make -j 2 && cd MCServer/ && (echo stop | ./MCServer)
 
 # Notification Settings
 notifications:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57b200a2a..05b6d879b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,105 +3,20 @@ cmake_minimum_required (VERSION 2.6)
 # Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html )
 enable_language(CXX C)
 
-macro (add_flags_lnk FLAGS)
-	set(CMAKE_EXE_LINKER_FLAGS            "${CMAKE_EXE_LINKER_FLAGS}            ${FLAGS}")
-	set(CMAKE_EXE_LINKER_FLAGS_DEBUG      "${CMAKE_EXE_LINKER_FLAGS_DEBUG}      ${FLAGS}")
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}    ${FLAGS}")
-	set(CMAKE_SHARED_LINKER_FLAGS         "${CMAKE_SHARED_LINKER_FLAGS}         ${FLAGS}")
-	set(CMAKE_SHARED_LINKER_FLAGS_DEBUG   "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}   ${FLAGS}")
-	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${FLAGS}")
-	set(CMAKE_MODULE_LINKER_FLAGS         "${CMAKE_MODULE_LINKER_FLAGS}         ${FLAGS}")
-	set(CMAKE_MODULE_LINKER_FLAGS_DEBUG   "${CMAKE_MODULE_LINKER_FLAGS_DEBUG}   ${FLAGS}")
-	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${FLAGS}")
-endmacro()
-
-macro(add_flags_cxx FLAGS)
-	set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         ${FLAGS}")
-	set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS}           ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   ${FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   ${FLAGS}")
-endmacro()
-
-# Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC):
-if (NOT MSVC)
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -D_DEBUG")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     -D_DEBUG")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   -DNDEBUG")
-endif()
-
-if(MSVC)
-	# Make build use multiple threads under MSVC:
-	add_flags_cxx("/MP")
-
-	# Make release builds use link-time code generation:
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GL")
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}    /LTCG")
-	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
-elseif(APPLE)
-	#on os x clang adds pthread for us but we need to add it for gcc
-	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         -std=c++11")
-		set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -std=c++11")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11")
-	else()
-		add_flags_cxx("-pthread")
-	endif()
-
-else()
-	# Let gcc / clang know that we're compiling a multi-threaded app:
-	add_flags_cxx("-pthread")
-	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         -std=c++11")
-		set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -std=c++11")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11")
-	endif()
-
-	# We use a signed char (fixes #640 on RasPi)
-	add_flags_cxx("-fsigned-char")
-endif()
-
-
-# Allow for a forced 32-bit build under 64-bit OS:
-if (FORCE_32)
-	add_flags_cxx("-m32")
-	add_flags_lnk("-m32")
-endif()
-
-
-# Have the compiler generate code specifically targeted at the current machine on Linux
-if(LINUX AND NOT CROSSCOMPILE)
-	add_flags_cxx("-march=native")
-endif()
-
-
-# Use static CRT in MSVC builds:
-if (MSVC)
-	string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
+# This has to be done before any flags have been set up.
+if(${BUILD_TOOLS})
+	add_subdirectory(Tools/MCADefrag/)
+	add_subdirectory(Tools/ProtoProxy/)
 endif()
 
-
-# Set lower warnings-level for the libraries:
-if (MSVC)
-	# Remove /W3 from command line -- cannot just cancel it later with /w like in unix, MSVC produces a D9025 warning (option1 overriden by option2)
-	string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	string(REPLACE "/W3" "" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
-	string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
-	string(REPLACE "/W3" "" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
-else()
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -w")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   -w")
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -w")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     -w")
+if(${BUILD_UNSTABLE_TOOLS})
+	add_subdirectory(Tools/GeneratorPerformanceTest/)
 endif()
 
+include(SetFlags.cmake)
+set_flags()
+set_lib_flags()
+enable_profile()
 
 # Under Windows, we need Lua as DLL; on *nix we need it linked statically:
 if (WIN32)
@@ -109,18 +24,6 @@ if (WIN32)
 endif()
 
 
-# On Unix we use two dynamic loading libraries dl and ltdl.
-# Preference is for dl on unknown systems as it is specified in POSIX
-# the dynamic loader is used by lua and sqllite.
-if (UNIX)
-	if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-		set(DYNAMIC_LOADER ltdl)
-	else()
-		set(DYNAMIC_LOADER dl)
-	endif()
-endif()
-
-
 # The Expat library is linked in statically, make the source files aware of that:
 add_definitions(-DXML_STATIC)
 
@@ -129,64 +32,10 @@ if(${SELF_TEST})
 	add_definitions(-DSELF_TEST)
 endif()
 
-# Declare the flags used for profiling builds:
-if (MSVC)
-	set (CXX_PROFILING "")
-	set (LNK_PROFILING "/PROFILE")
-else()
-	set (CXX_PROFILING "-pg")
-	set (LNK_PROFILING "-pg")
-endif()
 
 
-# Declare the profiling configurations:
-SET(CMAKE_CXX_FLAGS_DEBUGPROFILE
-    "${CMAKE_CXX_FLAGS_DEBUG} ${PCXX_ROFILING}"
-    CACHE STRING "Flags used by the C++ compiler during profile builds."
-    FORCE )
-SET(CMAKE_C_FLAGS_DEBUGPROFILE
-    "${CMAKE_C_FLAGS_DEBUG} ${CXX_PROFILING}"
-    CACHE STRING "Flags used by the C compiler during profile builds."
-    FORCE )
-SET(CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE
-    "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
-    CACHE STRING "Flags used for linking binaries during profile builds."
-    FORCE )
-SET(CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE
-    "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
-    CACHE STRING "Flags used by the shared libraries linker during profile builds."
-    FORCE )
-MARK_AS_ADVANCED(
-    CMAKE_CXX_FLAGS_DEBUGPROFILE
-    CMAKE_C_FLAGS_DEBUGPROFILE
-    CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE
-    CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE )
-
-SET(CMAKE_CXX_FLAGS_RELEASEPROFILE
-    "${CMAKE_CXX_FLAGS_RELEASE} ${CXX_PROFILING}"
-    CACHE STRING "Flags used by the C++ compiler during profile builds."
-    FORCE )
-SET(CMAKE_C_FLAGS_RELEASEPROFILE
-    "${CMAKE_C_FLAGS_RELEASE} ${CXX_PROFILING}"
-    CACHE STRING "Flags used by the C compiler during profile builds."
-    FORCE )
-SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
-    "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
-    CACHE STRING "Flags used for linking binaries during profile builds."
-    FORCE )
-SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE
-    "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
-    CACHE STRING "Flags used by the shared libraries linker during profile builds."
-    FORCE )
-MARK_AS_ADVANCED(
-    CMAKE_CXX_FLAGS_RELEASEPROFILE
-    CMAKE_C_FLAGS_RELEASEPROFILE
-    CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
-    CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE )
-
-
-# The configuration types need to be set after their respective c/cxx/linker flags and before the project directive
-set(CMAKE_CONFIGURATION_TYPES "Debug;Release;DebugProfile;ReleaseProfile" CACHE STRING "" FORCE)
+
+
 project (MCServer)
 
 # Include all the libraries:
@@ -203,24 +52,9 @@ add_subdirectory(lib/md5/)
 
 # We use EXCLUDE_FROM_ALL so that only the explicit dependencies are used
 # (PolarSSL also has test and example programs in their CMakeLists.txt, we don't want those)
-add_subdirectory(lib/polarssl/ EXCLUDE_FROM_ALL)
-
-
-# Remove disabling the maximum warning level:
-# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
-# We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers;
-# the important warnings are turned on using #pragma in Globals.h
-if (NOT MSVC)
-	string(REPLACE "-w" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	string(REPLACE "-w" "" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
-	string(REPLACE "-w" "" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
-	string(REPLACE "-w" "" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
-	add_flags_cxx("-Wall")
-endif()
+include(lib/polarssl.cmake)
 
-if(${BUILD_TOOLS})
-add_subdirectory(Tools/GeneratorPerformanceTest/)
-endif()
+set_exe_flags()
 
 add_subdirectory (src)
 
diff --git a/SetFlags.cmake b/SetFlags.cmake
new file mode 100644
index 000000000..162560c90
--- /dev/null
+++ b/SetFlags.cmake
@@ -0,0 +1,189 @@
+
+
+macro (add_flags_lnk FLAGS)
+	set(CMAKE_EXE_LINKER_FLAGS            "${CMAKE_EXE_LINKER_FLAGS}            ${FLAGS}")
+	set(CMAKE_EXE_LINKER_FLAGS_DEBUG      "${CMAKE_EXE_LINKER_FLAGS_DEBUG}      ${FLAGS}")
+	set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}    ${FLAGS}")
+	set(CMAKE_SHARED_LINKER_FLAGS         "${CMAKE_SHARED_LINKER_FLAGS}         ${FLAGS}")
+	set(CMAKE_SHARED_LINKER_FLAGS_DEBUG   "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}   ${FLAGS}")
+	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${FLAGS}")
+	set(CMAKE_MODULE_LINKER_FLAGS         "${CMAKE_MODULE_LINKER_FLAGS}         ${FLAGS}")
+	set(CMAKE_MODULE_LINKER_FLAGS_DEBUG   "${CMAKE_MODULE_LINKER_FLAGS_DEBUG}   ${FLAGS}")
+	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${FLAGS}")
+endmacro()
+
+macro(add_flags_cxx FLAGS)
+	set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         ${FLAGS}")
+	set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS}           ${FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   ${FLAGS}")
+	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     ${FLAGS}")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
+	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   ${FLAGS}")
+endmacro()
+
+
+macro(set_flags)
+	# Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC):
+	if (NOT MSVC)
+		set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -D_DEBUG")
+		set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     -D_DEBUG")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+		set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   -DNDEBUG")
+	endif()
+
+	if(MSVC)
+		# Make build use multiple threads under MSVC:
+		add_flags_cxx("/MP")
+
+		# Make release builds use link-time code generation:
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
+		set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GL")
+		set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}    /LTCG")
+		set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
+		set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
+	elseif(APPLE)
+		#on os x clang adds pthread for us but we need to add it for gcc
+		if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         -std=c++11")
+			set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -std=c++11")
+			set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11")
+		else()
+			add_flags_cxx("-pthread")
+		endif()
+
+	else()
+		# Let gcc / clang know that we're compiling a multi-threaded app:
+		add_flags_cxx("-pthread")
+		if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         -std=c++11")
+			set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -std=c++11")
+			set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11")
+		endif()
+
+		# We use a signed char (fixes #640 on RasPi)
+		add_flags_cxx("-fsigned-char")
+	endif()
+
+
+	# Allow for a forced 32-bit build under 64-bit OS:
+	if (FORCE_32)
+		add_flags_cxx("-m32")
+		add_flags_lnk("-m32")
+	endif()
+
+
+	# Have the compiler generate code specifically targeted at the current machine on Linux
+	if(LINUX AND NOT CROSSCOMPILE)
+		add_flags_cxx("-march=native")
+	endif()
+
+
+	# Use static CRT in MSVC builds:
+	if (MSVC)
+		string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+		string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
+		string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
+		string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
+	endif()
+endmacro()
+
+macro(set_lib_flags)
+	# Set lower warnings-level for the libraries:
+	if (MSVC)
+		# Remove /W3 from command line -- cannot just cancel it later with /w like in unix, MSVC produces a D9025 warning (option1 overriden by option2)
+		string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+		string(REPLACE "/W3" "" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
+		string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
+		string(REPLACE "/W3" "" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
+	else()
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -w")
+		set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   -w")
+		set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -w")
+		set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     -w")
+	endif()
+
+	# On Unix we use two dynamic loading libraries dl and ltdl.
+	# Preference is for dl on unknown systems as it is specified in POSIX
+	# the dynamic loader is used by lua and sqllite.
+	if (UNIX)
+		if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+			set(DYNAMIC_LOADER ltdl)
+		else()
+			set(DYNAMIC_LOADER dl)
+		endif()
+	endif()
+endmacro()
+
+macro(enable_profile)
+	# Declare the flags used for profiling builds:
+	if (MSVC)
+		set (CXX_PROFILING "")
+		set (LNK_PROFILING "/PROFILE")
+	else()
+		set (CXX_PROFILING "-pg")
+		set (LNK_PROFILING "-pg")
+	endif()
+
+
+	# Declare the profiling configurations:
+	SET(CMAKE_CXX_FLAGS_DEBUGPROFILE
+		"${CMAKE_CXX_FLAGS_DEBUG} ${PCXX_ROFILING}"
+		CACHE STRING "Flags used by the C++ compiler during profile builds."
+		FORCE )
+	SET(CMAKE_C_FLAGS_DEBUGPROFILE
+		"${CMAKE_C_FLAGS_DEBUG} ${CXX_PROFILING}"
+		CACHE STRING "Flags used by the C compiler during profile builds."
+		FORCE )
+	SET(CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE
+		"${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
+		CACHE STRING "Flags used for linking binaries during profile builds."
+		FORCE )
+	SET(CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE
+		"${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
+		CACHE STRING "Flags used by the shared libraries linker during profile builds."
+		FORCE )
+	MARK_AS_ADVANCED(
+		CMAKE_CXX_FLAGS_DEBUGPROFILE
+		CMAKE_C_FLAGS_DEBUGPROFILE
+		CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE
+		CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE )
+
+	SET(CMAKE_CXX_FLAGS_RELEASEPROFILE
+		"${CMAKE_CXX_FLAGS_RELEASE} ${CXX_PROFILING}"
+		CACHE STRING "Flags used by the C++ compiler during profile builds."
+		FORCE )
+	SET(CMAKE_C_FLAGS_RELEASEPROFILE
+		"${CMAKE_C_FLAGS_RELEASE} ${CXX_PROFILING}"
+		CACHE STRING "Flags used by the C compiler during profile builds."
+		FORCE )
+	SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
+		"${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
+		CACHE STRING "Flags used for linking binaries during profile builds."
+		FORCE )
+	SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE
+		"${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
+		CACHE STRING "Flags used by the shared libraries linker during profile builds."
+		FORCE )
+	MARK_AS_ADVANCED(
+		CMAKE_CXX_FLAGS_RELEASEPROFILE
+		CMAKE_C_FLAGS_RELEASEPROFILE
+		CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
+		CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE )
+	# The configuration types need to be set after their respective c/cxx/linker flags and before the project directive
+	set(CMAKE_CONFIGURATION_TYPES "Debug;Release;DebugProfile;ReleaseProfile" CACHE STRING "" FORCE)
+endmacro()
+    
+macro(set_exe_flags)
+	# Remove disabling the maximum warning level:
+	# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
+	# We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers;
+	# the important warnings are turned on using #pragma in Globals.h
+	if (NOT MSVC)
+		string(REPLACE "-w" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+		string(REPLACE "-w" "" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
+		string(REPLACE "-w" "" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
+		string(REPLACE "-w" "" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
+		add_flags_cxx("-Wall")
+	endif()
+
+endmacro()
diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt
index 7296b8ddc..2a021049f 100644
--- a/Tools/MCADefrag/CMakeLists.txt
+++ b/Tools/MCADefrag/CMakeLists.txt
@@ -3,60 +3,13 @@ cmake_minimum_required (VERSION 2.6)
 
 project (MCADefrag)
 
+# Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html )
+enable_language(CXX C)
 
-
-macro(add_flags_cxx FLAGS)
-	set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         ${FLAGS}")
-	set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS}           ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   ${FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   ${FLAGS}")
-endmacro()
-
-
-
-
-# Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC):
-if (NOT MSVC)
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -D_DEBUG")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     -D_DEBUG")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   -DNDEBUG")
-endif()
-
-
-
-if(MSVC)
-	# Make build use multiple threads under MSVC:
-	add_flags_cxx("/MP")
-
-	# Make release builds use link-time code generation:
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GL")
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}    /LTCG")
-	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
-elseif(APPLE)
-	#on os x clang adds pthread for us but we need to add it for gcc
-	if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		add_flags_cxx("-pthread")
-	endif()
-else()
-	# Let gcc / clang know that we're compiling a multi-threaded app:
-	add_flags_cxx("-pthread")
-endif()
-
-
-
-
-# Use static CRT in MSVC builds:
-if (MSVC)
-	string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
-endif()
+include(../../SetFlags.cmake)
+set_flags()
+set_lib_flags()
+enable_profile()
 
 
 
@@ -66,7 +19,6 @@ include_directories("../../lib")
 include_directories("../../src")
 
 
-
 function(flatten_files arg1)
 	set(res "")
 	foreach(f ${${arg1}})
@@ -78,12 +30,10 @@ endfunction()
 
 
 # Include the libraries:
-file(GLOB ZLIB_SRC "../../lib/zlib/*.c")
-file(GLOB ZLIB_HDR "../../lib/zlib/*.h")
-flatten_files(ZLIB_SRC)
-flatten_files(ZLIB_HDR)
-source_group("ZLib" FILES ${ZLIB_SRC} ${ZLIB_HDR})
 
+add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib)
+
+set_exe_flags()
 
 # Include the shared files:
 set(SHARED_SRC
@@ -98,6 +48,10 @@ set(SHARED_HDR
 	../../src/Log.h
 	../../src/MCLogger.h
 )
+flatten_files(SHARED_SRC)
+flatten_files(SHARED_HDR)
+source_group("Shared" FILES ${SHARED_SRC} ${SHARED_HDR})
+
 set(SHARED_OSS_SRC
 	../../src/OSSupport/CriticalSection.cpp
 	../../src/OSSupport/File.cpp
@@ -110,11 +64,10 @@ set(SHARED_OSS_HDR
 	../../src/OSSupport/IsThread.h
 	../../src/OSSupport/Timer.h
 )
-flatten_files(SHARED_SRC)
-flatten_files(SHARED_HDR)
+
 flatten_files(SHARED_OSS_SRC)
 flatten_files(SHARED_OSS_HDR)
-source_group("Shared" FILES ${SHARED_SRC} ${SHARED_HDR})
+
 source_group("Shared\\OSSupport" FILES ${SHARED_OSS_SRC} ${SHARED_OSS_HDR})
 
 
@@ -138,7 +91,7 @@ add_executable(MCADefrag
 	${SHARED_HDR}
 	${SHARED_OSS_SRC}
 	${SHARED_OSS_HDR}
-	${ZLIB_SRC}
-	${ZLIB_HDR}
 )
 
+target_link_libraries(MCADefrag zlib)
+
diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt
index 9e233a688..01f1e88ad 100644
--- a/Tools/ProtoProxy/CMakeLists.txt
+++ b/Tools/ProtoProxy/CMakeLists.txt
@@ -3,62 +3,10 @@ cmake_minimum_required (VERSION 2.6)
 
 project (ProtoProxy)
 
+include(../../SetFlags.cmake)
 
-
-macro(add_flags_cxx FLAGS)
-	set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         ${FLAGS}")
-	set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS}           ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   ${FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   ${FLAGS}")
-endmacro()
-
-
-
-
-# Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC):
-if (NOT MSVC)
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -D_DEBUG")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     -D_DEBUG")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   -DNDEBUG")
-endif()
-
-
-
-if(MSVC)
-	# Make build use multiple threads under MSVC:
-	add_flags_cxx("/MP")
-
-	# Make release builds use link-time code generation:
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GL")
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}    /LTCG")
-	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
-elseif(APPLE)
-	#on os x clang adds pthread for us but we need to add it for gcc
-	if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		add_flags_cxx("-pthread")
-	endif()
-else()
-	# Let gcc / clang know that we're compiling a multi-threaded app:
-	add_flags_cxx("-pthread")
-endif()
-
-
-
-
-# Use static CRT in MSVC builds:
-if (MSVC)
-	string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
-endif()
-
-
+set_flags()
+set_lib_flags()
 
 
 # Set include paths to the used libraries:
@@ -77,20 +25,10 @@ function(flatten_files arg1)
 	set(${arg1} "${res}" PARENT_SCOPE)
 endfunction()
 
+include(../../lib/polarssl.cmake)
+add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib)
 
-# Include the libraries:
-file(GLOB POLARSSL_SRC "../../lib/polarssl/library/*.c")
-file(GLOB POLARSSL_HDR "../../lib/polarssl/include/polarssl/*.h")
-flatten_files(POLARSSL_SRC)
-flatten_files(POLARSSL_HDR)
-source_group("PolarSSL" FILES ${POLARSSL_SRC} ${POLARSSL_HDR})
-
-file(GLOB ZLIB_SRC "../../lib/zlib/*.c")
-file(GLOB ZLIB_HDR "../../lib/zlib/*.h")
-flatten_files(ZLIB_SRC)
-flatten_files(ZLIB_HDR)
-source_group("ZLib" FILES ${ZLIB_SRC} ${ZLIB_HDR})
-
+set_exe_flags()
 
 # Include the shared files:
 set(SHARED_SRC
@@ -149,9 +87,7 @@ add_executable(ProtoProxy
 	${SHARED_HDR}
 	${SHARED_OSS_SRC}
 	${SHARED_OSS_HDR}
-	${POLARSSL_SRC}
-	${POLARSSL_HDR}
-	${ZLIB_SRC}
-	${ZLIB_HDR}
 )
 
+target_link_libraries(ProtoProxy zlib polarssl)
+
diff --git a/lib/polarssl.cmake b/lib/polarssl.cmake
new file mode 100644
index 000000000..d57cc9220
--- /dev/null
+++ b/lib/polarssl.cmake
@@ -0,0 +1,5 @@
+
+if(NOT TARGET polarssl)
+	message("including polarssl")
+	add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL )
+endif()
diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt
index 239232c38..5ec8ee822 100644
--- a/lib/tolua++/CMakeLists.txt
+++ b/lib/tolua++/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(tolualib ${LIB_SOURCE})
 
 #m is the standard math librarys
 if(UNIX)
-target_link_libraries(tolua m)
+target_link_libraries(tolua m ${DYNAMIC_LOADER})
 endif()
 
 target_link_libraries(tolua lua tolualib)
diff --git a/lib/zlib/CMakeLists.txt b/lib/zlib/CMakeLists.txt
index b1b74031d..6c52578ee 100644
--- a/lib/zlib/CMakeLists.txt
+++ b/lib/zlib/CMakeLists.txt
@@ -8,12 +8,14 @@ file(GLOB SOURCE
     "*.c"
 )
 
-add_library(zlib ${SOURCE})
+if(NOT TARGET zlib)
+	add_library(zlib ${SOURCE})
 
-if (MSVC)
-	# Remove SCL warnings, we expect this library to have been tested safe
-	SET_TARGET_PROPERTIES(
-		zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS"
-	)
+	if (MSVC)
+		# Remove SCL warnings, we expect this library to have been tested safe
+		SET_TARGET_PROPERTIES(
+			zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS"
+		)
+	endif()
 endif()