diff --git a/CMakeLists.txt b/CMakeLists.txt
index 826fa576..79999f76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,6 +92,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
 	# Win32 specific Compiler Flags
 	IF(WIN32)
 		ADD_DEFINITIONS("-D_WINDOWS -D_WIN32 -D_STDCALL_SUPPORTED -D_M_IX86 -DXML_LIBRARY -D_LIB -DUSE_STREFLOP -DSTREFLOP_SSE -DSTREFLOP_RANDOM_GEN_SIZE=32 -DLIBM_COMPILING_FLT32 -DCURL_STATICLIB")
+	ELSE()
+		ADD_DEFINITIONS("-DCURL_STATICLIB")
 	ENDIF()
 
 ENDIF()
diff --git a/mk/cmake/Modules/FindCURL.cmake b/mk/cmake/Modules/FindCURL.cmake
index 38d7c447..72c78dd1 100644
--- a/mk/cmake/Modules/FindCURL.cmake
+++ b/mk/cmake/Modules/FindCURL.cmake
@@ -35,9 +35,8 @@ IF(CURL_FOUND)
         OUTPUT_VARIABLE CURL_STATIC_LIBS
         RETURN_VALUE RET)
 
-      SET(CURL_LIBRARIES "-static ${CURL_STATIC_LIBS}")
+      SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}")
     ENDIF()
-
 ENDIF()
 ELSE(CURL_FOUND)
   SET(CURL_LIBRARIES)
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 6294bb85..c37eee16 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -158,29 +158,6 @@ add_custom_target(run ALL
     DEPENDS mg.tmp)
 ENDIF()
 
-# [RCL] FIXME: make it compiler-agnostic
-#SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math  -fsignaling-nans -mfpmath=sse -msse -DUSE_STREFLOP -DSTREFLOP_SSE")
-
-#IF(WIN32)
-#	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINDOWS -D_WIN32 -D_STDCALL_SUPPORTED -D_M_IX86 -DXML_LIBRARY -DCURL_STATICLIB")
-#ENDIF()
-
-# The stuff below gets SVN Global Revision # but ONLY when calling cmake!
-# the FindSubversion.cmake module is part of the standard distribution
-#include(FindSubversion)
-# extract working copy information for SOURCE_DIR into MY_XXX variables
-#Subversion_WC_INFO(${PROJECT_SOURCE_DIR} MG)
-#add_definitions(-DSVNVERSION="${MG_WC_REVISION}")
-#SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"${MG_WC_REVISION}\\\"'")
-
-#IF(UNIX AND NOT APPLE)
-	# We do some funky character escaping to get the right stuff written out to 
-	# the final Makefile so we get the SVN Global Revsion #
-#	SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"`svnversion -n ${PROJECT_SOURCE_DIR}`\\\"'")
-#ENDIF()
-
-#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SVN_VERSION_CMD}")
-
 IF(WIN32)
 	SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wl,-subsystem,console -mconsole")
 	SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wl,-subsystem,console -mconsole")
@@ -189,15 +166,6 @@ IF(WIN32)
 
 ENDIF()
 
-
-#IF(UNIX AND NOT APPLE)
-	# We do some funky character escaping to get the right stuff written out to 
-	# the final Makefile so we get the SVN Global Revsion #
-#	string(REPLACE "'" "\"" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-##ENDIF()
-
-#message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
-
 IF(WIN32)
 	SET(TARGET_NAME "glest_game")
 ELSE()
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 2a12d89d..5b6bca8d 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -39,6 +39,39 @@ IF(WIN32)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/win32)
 ENDIF()
 
+FIND_PACKAGE(CURL REQUIRED)
+INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+IF(UNIX)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES})
+ENDIF()
+# check libcurl version #
+IF(WIN32)
+	file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS)
+ELSE()
+	file (READ ${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS)
+ENDIF()
+
+string (REGEX MATCH "LIBCURL_VERSION_MAJOR[ \t]+([0-9]+)" LIBCURL_VERSION_MJ ${CURL_VERSION_H_CONTENTS})
+string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_MJ ${LIBCURL_VERSION_MJ})
+string (REGEX MATCH "LIBCURL_VERSION_MINOR[ \t]+([0-9]+)" LIBCURL_VERSION_MI ${CURL_VERSION_H_CONTENTS})
+string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_MI ${LIBCURL_VERSION_MI})
+string (REGEX MATCH "LIBCURL_VERSION_PATCH[ \t]+([0-9]+)" LIBCURL_VERSION_PT ${CURL_VERSION_H_CONTENTS})
+string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_PT ${LIBCURL_VERSION_PT})
+set (CURL_MAJOR_VERSION ${LIBCURL_VERSION_MJ})
+set (CURL_MINOR_VERSION ${LIBCURL_VERSION_MI})
+set (CURL_PATCH_VERSION ${LIBCURL_VERSION_PT})
+include_regular_expression("^.*$")
+# Setup package meta-data
+set(CURL_VERSION ${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION})
+message(STATUS "curl version=[${CURL_VERSION}]")
+IF( ${CURL_VERSION} VERSION_LESS 7.21.0)
+	message(STATUS "(please visit http://curl.haxx.se/libcurl/ to find a newer version)")	
+	message(FATAL_ERROR " CURL version = [${CURL_VERSION}] we require AT LEAST [7.21.0]")
+ENDIF()
+
+
+
+
 FIND_PACKAGE(SDL REQUIRED)
 INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
 IF(UNIX)
@@ -89,37 +122,6 @@ IF(UNIX)
 	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PNG_LIBRARY})
 ENDIF()
 
-FIND_PACKAGE(CURL REQUIRED)
-INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
-IF(UNIX)
-	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES})
-ENDIF()
-
-# check libcurl version #
-IF(WIN32)
-	file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS)
-ELSE()
-	file (READ ${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS)
-ENDIF()
-
-string (REGEX MATCH "LIBCURL_VERSION_MAJOR[ \t]+([0-9]+)" LIBCURL_VERSION_MJ ${CURL_VERSION_H_CONTENTS})
-string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_MJ ${LIBCURL_VERSION_MJ})
-string (REGEX MATCH "LIBCURL_VERSION_MINOR[ \t]+([0-9]+)" LIBCURL_VERSION_MI ${CURL_VERSION_H_CONTENTS})
-string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_MI ${LIBCURL_VERSION_MI})
-string (REGEX MATCH "LIBCURL_VERSION_PATCH[ \t]+([0-9]+)" LIBCURL_VERSION_PT ${CURL_VERSION_H_CONTENTS})
-string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_PT ${LIBCURL_VERSION_PT})
-set (CURL_MAJOR_VERSION ${LIBCURL_VERSION_MJ})
-set (CURL_MINOR_VERSION ${LIBCURL_VERSION_MI})
-set (CURL_PATCH_VERSION ${LIBCURL_VERSION_PT})
-include_regular_expression("^.*$")
-# Setup package meta-data
-set(CURL_VERSION ${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION})
-message(STATUS "curl version=[${CURL_VERSION}]")
-IF( ${CURL_VERSION} VERSION_LESS 7.21.0)
-	message(STATUS "(please visit http://curl.haxx.se/libcurl/ to find a newer version)")	
-	message(FATAL_ERROR " CURL version = [${CURL_VERSION}] we require AT LEAST [7.21.0]")
-ENDIF()
-
 #########################################################################################
 # glest lib