diff --git a/mk/windoze/glest_game.cbp b/mk/windoze/glest_game.cbp
index 7b86dba1d..418e5d7d8 100644
--- a/mk/windoze/glest_game.cbp
+++ b/mk/windoze/glest_game.cbp
@@ -49,7 +49,7 @@
 					<Add directory="../../source/glest_game/types" />
 					<Add directory="../../source/glest_game/world" />
 					<Add directory="../../source/win32_deps/include" />
-					<Add directory="../../source/win32_deps/xerces-c-3.0.1/src" />
+					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/src" />
 					<Add directory="../../source/win32_deps/SDL-1.2.x/include" />
 					<Add directory="../../source/shared_lib/include/platform/sdl" />
 					<Add directory="../../source/shared_lib/include/sound/openal" />
@@ -59,7 +59,7 @@
 					<Add directory="../../source/shared_lib/include/platform/common" />
 					<Add directory="../../source/win32_deps/curl-7.21.3/include" />
 					<Add directory="../../source/shared_lib/include/map" />
-					<Add directory="../../source/win32_deps/libircclient/include" />
+					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/include" />
 				</Compiler>
 				<ResourceCompiler>
 					<Add directory="../../source/shared_lib/include/graphics" />
@@ -559,6 +559,8 @@
 		<Unit filename="../../source/glest_game/menu/menu_state_graphic_info.h" />
 		<Unit filename="../../source/glest_game/menu/menu_state_join_game.cpp" />
 		<Unit filename="../../source/glest_game/menu/menu_state_join_game.h" />
+		<Unit filename="../../source/glest_game/menu/menu_state_keysetup.cpp" />
+		<Unit filename="../../source/glest_game/menu/menu_state_keysetup.h" />
 		<Unit filename="../../source/glest_game/menu/menu_state_masterserver.cpp" />
 		<Unit filename="../../source/glest_game/menu/menu_state_masterserver.h" />
 		<Unit filename="../../source/glest_game/menu/menu_state_new_game.cpp" />
diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
index 2ebc2ddae..bb5661ea4 100644
--- a/source/configurator/CMakeLists.txt
+++ b/source/configurator/CMakeLists.txt
@@ -20,7 +20,6 @@ IF(NOT WIN32)
 	FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
 	# wxWidgets include (this will do all the magic to configure everything)
 	include( ${wxWidgets_USE_FILE} )
-	#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
 	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
 ELSE()
 	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.dll.a)
@@ -95,9 +94,6 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
 		ENDIF(APPLE)
 ENDFOREACH(DIR)
 
-# [RCL] FIXME: make it compiler-agnostic
-SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math  -fsignaling-nans -mfpmath=sse -msse -DSTREFLOP_SSE")
-
 SET(TARGET_NAME "glest_configurator")
 
 IF(UNIX AND NOT APPLE)
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 2bd9ec87f..e68802772 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -20,7 +20,6 @@ IF(NOT WIN32)
 	FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
 	# wxWidgets include (this will do all the magic to configure everything)
 	include( ${wxWidgets_USE_FILE} )
-	#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
 	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
 ELSE()
 	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.dll.a)
@@ -101,9 +100,6 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
 		ENDIF(APPLE)
 ENDFOREACH(DIR)
 
-# [RCL] FIXME: make it compiler-agnostic
-SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math  -fsignaling-nans -mfpmath=sse -msse -DSTREFLOP_SSE")
-
 SET(TARGET_NAME "glest_g3dviewer")
 
 IF(UNIX AND NOT APPLE)
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index eab922d3b..4b7fa7b6c 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -16,7 +16,6 @@ IF(NOT WIN32)
 
 	# wxWidgets include (this will do all the magic to configure everything)
 	include( ${wxWidgets_USE_FILE} )
-	#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
 	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
 ELSE()
 	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.dll.a)
@@ -86,13 +85,6 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
 		ENDIF(APPLE)
 ENDFOREACH(DIR)
 
-# [RCL] FIXME: make it compiler-agnostic
-SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math  -fsignaling-nans -mfpmath=sse -msse -DSTREFLOP_SSE")
-
-IF(WIN32)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINDOWS -D_WIN32 -D_STDCALL_SUPPORTED -D_M_IX86 -DXML_LIBRARY -DMWIN -D__WXMSW__ -DCURL_STATICLIB")
-ENDIF()
-
 SET(TARGET_NAME "glest_editor")
 
 IF(UNIX AND NOT APPLE)
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 5b6bca8d2..4e4731c01 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -233,16 +233,17 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
 
 IF(NOT WIN32)
 	ADD_LIBRARY(libglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
-	
+	MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]")
 ELSE()
 	SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
 	ADD_LIBRARY(libglest SHARED ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
+	MESSAGE(STATUS "Building shared game library as a SHARED library and saving to [${LIBRARY_OUTPUT_PATH}]")
 ENDIF()
 
 #ADD_LIBRARY(libglest SHARED ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
 #ADD_LIBRARY(libglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
 IF(WIN32)
-  TARGET_LINK_LIBRARIES(libglest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32  advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop libglest stdc++ moldname mingwex msvcrt user32 kernel32)
+  TARGET_LINK_LIBRARIES(libglest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32  advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop stdc++ moldname mingwex msvcrt user32 kernel32)
 ENDIF()
 TARGET_LINK_LIBRARIES(libglest streflop)
 TARGET_LINK_LIBRARIES(libglest ${EXTERNAL_LIBS})