From 0305ae91528ae5ff00a56f7e7cd9ebc57ec6937c Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Sat, 8 Jan 2011 02:06:18 +0000
Subject: [PATCH] - more cleanup of codeblocks project files

---
 mk/windoze/glest_game.cbp | 10 +++-------
 mk/windoze/shared_lib.cbp | 14 +++++++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mk/windoze/glest_game.cbp b/mk/windoze/glest_game.cbp
index 418e5d7d8..89958ff10 100644
--- a/mk/windoze/glest_game.cbp
+++ b/mk/windoze/glest_game.cbp
@@ -105,9 +105,11 @@
 					<Add library="ddraw" />
 					<Add library="dsound" />
 					<Add library="dxguid" />
+					<Add library="opengl32" />
+					<Add library="glu32" />
+					<Add library="wsock32" />
 					<Add library="ws2_32" />
 					<Add library="iphlpapi" />
-					<Add library="wsock32" />
 					<Add library="liblibogg" />
 					<Add library="liblibvorbis" />
 					<Add library="liblibvorbisfile" />
@@ -119,14 +121,11 @@
 					<Add library="liblibcurl" />
 					<Add library="winmm" />
 					<Add library="gdi32" />
-					<Add library="opengl32" />
-					<Add library="glu32" />
 					<Add library="SDL" />
 					<Add library="SDLmain" />
 					<Add library="lua5.1" />
 					<Add library="streflop" />
 					<Add library="glest" />
-					<Add library="ircclient" />
 					<Add directory="../../source/win32_deps/lib" />
 					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
 					<Add directory="../../data/glest_game/" />
@@ -255,7 +254,6 @@
 					<Add library="lua5.1" />
 					<Add library="streflop" />
 					<Add library="glest" />
-					<Add library="ircclient" />
 					<Add directory="../../source/win32_deps/lib" />
 					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
 					<Add directory="../../data/glest_game/" />
@@ -355,7 +353,6 @@
 					<Add library="lua5.1" />
 					<Add library="glest" />
 					<Add library="streflop" />
-					<Add library="ircclient" />
 					<Add directory="../../source/linux_deps/lib" />
 				</Linker>
 				<Environment>
@@ -458,7 +455,6 @@
 					<Add library="lua5.1" />
 					<Add library="glest" />
 					<Add library="streflop" />
-					<Add library="ircclient" />
 					<Add directory="../../source/linux_deps/lib" />
 				</Linker>
 				<Environment>
diff --git a/mk/windoze/shared_lib.cbp b/mk/windoze/shared_lib.cbp
index 644c3afe8..61f096145 100644
--- a/mk/windoze/shared_lib.cbp
+++ b/mk/windoze/shared_lib.cbp
@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Debug Win32">
 				<Option output="../../data/glest_game/libglest.dll" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="../../data/glest_game/" />
+				<Option working_dir="../../data/glest_game" />
 				<Option object_output="Debug Win32/shared_lib" />
 				<Option type="3" />
 				<Option compiler="mingw32_compiler" />
@@ -102,7 +102,11 @@
 					<Add library="liblibvorbis" />
 					<Add library="liblibvorbisfile" />
 					<Add library="liblibvorbisenc" />
-					<Add library="ircclient" />
+					<Add library="wsock32" />
+					<Add library="opengl32" />
+					<Add library="glu32" />
+					<Add library="winmm" />
+					<Add library="ws2_32" />
 					<Add directory="./" />
 					<Add directory="../../source/win32_deps/lib" />
 					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
@@ -205,7 +209,6 @@
 					<Add library="liblibvorbis" />
 					<Add library="liblibvorbisfile" />
 					<Add library="liblibvorbisenc" />
-					<Add library="ircclient" />
 					<Add directory="./" />
 					<Add directory="../../source/win32_deps/lib" />
 					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
@@ -283,7 +286,6 @@
 					<Add library="vorbisfile" />
 					<Add library="vorbisenc" />
 					<Add library="streflop" />
-					<Add library="ircclient" />
 					<Add directory="./" />
 					<Add directory="../../source/linux_deps/lib" />
 				</Linker>
@@ -375,7 +377,6 @@
 					<Add library="vorbisfile" />
 					<Add library="vorbisenc" />
 					<Add library="streflop" />
-					<Add library="ircclient" />
 					<Add directory="./" />
 					<Add directory="../../source/linux_deps/lib" />
 				</Linker>
@@ -558,6 +559,9 @@
 		<Unit filename="../../source/shared_lib/sources/graphics/shader_manager.cpp" />
 		<Unit filename="../../source/shared_lib/sources/graphics/texture.cpp" />
 		<Unit filename="../../source/shared_lib/sources/graphics/texture_manager.cpp" />
+		<Unit filename="../../source/shared_lib/sources/libircclient/src/libircclient.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../source/shared_lib/sources/lua/lua_script.cpp" />
 		<Unit filename="../../source/shared_lib/sources/map/map_preview.cpp" />
 		<Unit filename="../../source/shared_lib/sources/platform/common/base_thread.cpp" />