diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
index 984749f3c..6e762b187 100644
--- a/source/configurator/CMakeLists.txt
+++ b/source/configurator/CMakeLists.txt
@@ -55,23 +55,20 @@ ENDIF()
 
 # stupid hack because cmake WILL NOT find libircclient for some reason
 if(WIN32)
-
 	if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h)
-		set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
-	  	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
+	  set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
+	  link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
 	endif()
-
 else()
-	#CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
-	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h)
+	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
+	link_directories(/usr/local/include)	
+	link_directories(/usr/local/lib)
 endif()
 
-#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
 if(NOT LIBIRCCLIENT_INCLUDE_DIR)
-       message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]")
+       message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
 endif()
 INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
-#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
 
 #########################################################################################
 # glest configurator
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 15465fc4a..349388fae 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -55,24 +55,20 @@ ENDIF()
 
 # stupid hack because cmake WILL NOT find libircclient for some reason
 if(WIN32)
-
 	if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h)
-		set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
-	  	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
+	  set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
+	  link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
 	endif()
-
 else()
-	#CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
-	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h)
+	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
+	link_directories(/usr/local/include)	
+	link_directories(/usr/local/lib)
 endif()
 
-#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
 if(NOT LIBIRCCLIENT_INCLUDE_DIR)
-       message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]")
+       message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
 endif()
 INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
-#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
-
 
 #########################################################################################
 # glest G3d Model Viewer
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index e825f7bd5..239dc04fa 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -36,15 +36,19 @@ else()
 	#CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
 	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
 	link_directories(/usr/local/include)	
-	link_directories(/usr/local/lib/libircclient)
+	link_directories(/usr/local/lib)
 endif()
 
 #check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
 if(NOT LIBIRCCLIENT_INCLUDE_DIR)
        message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
 endif()
+
 INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
-SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
+
+if(NOT WIN32)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
+ENDIF()
 
 FIND_PACKAGE(SDL REQUIRED)
 INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 64170a5a9..a08df513d 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -51,24 +51,20 @@ ENDIF()
 
 # stupid hack because cmake WILL NOT find libircclient for some reason
 if(WIN32)
-
 	if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h)
-		set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
-	  	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
+	  set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
+	  link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
 	endif()
-
 else()
-	#CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
-	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h)
+	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
+	link_directories(/usr/local/include)	
+	link_directories(/usr/local/lib)
 endif()
 
-#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
 if(NOT LIBIRCCLIENT_INCLUDE_DIR)
-       message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]")
+       message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
 endif()
 INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
-#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
-
 
 #########################################################################################
 # glest map editor
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index d996e63d4..ccca7d31c 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -51,7 +51,7 @@ else()
 	#CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
 	FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
 	link_directories(/usr/local/include)	
-	link_directories(/usr/local/lib/libircclient)
+	link_directories(/usr/local/lib)
 endif()
 
 #check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
@@ -59,7 +59,7 @@ if(NOT LIBIRCCLIENT_INCLUDE_DIR)
        message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
 endif()
 INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
-SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
+#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
 
 FIND_PACKAGE(SDL REQUIRED)
 INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})