From 77f8d3015ab64900b55f01ddecc917312c6d7807 Mon Sep 17 00:00:00 2001
From: Sergey Popov <loonycyborg@gmail.com>
Date: Wed, 21 Jan 2009 20:34:37 +0000
Subject: [PATCH] Removed some cruft from codeblocks-scons projectfile,

...made Build -> Compile current file command work.
---
 projectfiles/CodeBlocks-SCons/wesnoth.cbp  | 46 ++--------------------
 projectfiles/CodeBlocks-SCons/wesnothd.cbp | 29 ++------------
 2 files changed, 8 insertions(+), 67 deletions(-)

diff --git a/projectfiles/CodeBlocks-SCons/wesnoth.cbp b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
index 8db5a1d5e03..76a65f36fe6 100644
--- a/projectfiles/CodeBlocks-SCons/wesnoth.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
@@ -12,9 +12,10 @@
 				<Option working_dir="..\..\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
+				<Option object_output="." />
 				<MakeCommands>
 					<Build command="scons -C ../.. build=$target wesnoth" />
-					<CompileFile command="scons -C ../.. build=$target $file" />
+					<CompileFile command="TARGET=$file;scons -C ../.. build=$target build/$target/${TARGET:6}" />
 					<Clean command="scons -C ../.. build=$target wesnoth -c" />
 					<DistClean command="rm -rf ../../build" />
 				</MakeCommands>
@@ -24,54 +25,15 @@
 				<Option working_dir="..\..\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
+				<Option object_output="." />
 				<MakeCommands>
 					<Build command="scons -C ../.. build=$target wesnoth" />
-					<CompileFile command="scons -C ../.. build=$target $file" />
+					<CompileFile command="TARGET=$file;scons -C ../.. build=$target build/$target/${TARGET:6}" />
 					<Clean command="scons -C ../.. build=$target wesnoth -c" />
 					<DistClean command="rm -rf ../../build" />
 				</MakeCommands>
 			</Target>
 		</Build>
-		<Compiler>
-			<Add option="-O3" />
-			<Add option="-mthreads" />
-			<Add option="-march=native" />
-			<Add option="-fexceptions" />
-			<Add option="-DHAVE_PYTHON" />
-			<Add option="-DUSE_GZIP" />
-			<Add option="-DHAVE_FRIBIDI" />
-			<Add option="-DDISABLE_POOL_ALLOC" />
-			<Add directory="..\..\src" />
-			<Add directory="..\..\src\sdl_ttf" />
-			<Add directory="..\..\src\serialization" />
-			<Add directory="..\..\src\widgets" />
-		</Compiler>
-		<Linker>
-			<Add option="-mthreads" />
-			<Add library="mingwthrd" />
-			<Add library="mingw32" />
-			<Add library="SDLmain" />
-			<Add library="SDL" />
-			<Add library="SDL_image" />
-			<Add library="SDL_net" />
-			<Add library="SDL_mixer" />
-			<Add library="SDL_ttf" />
-			<Add library="freetype" />
-			<Add library="intl" />
-			<Add library="python25" />
-			<Add library="png" />
-			<Add library="boost_iostreams_dw2" />
-			<Add library="boost_regex_dw2" />
-			<Add library="z" />
-			<Add library="ws2_32" />
-			<Add library="jpeg" />
-			<Add library="fribidi" />
-			<Add library="pango-1.0" />
-			<Add library="pangocairo-1.0" />
-			<Add library="cairo" />
-			<Add library="gobject-2.0" />
-			<Add library="fontconfig" />
-		</Linker>
 		<Unit filename="..\..\packaging\windows\wesnoth.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
diff --git a/projectfiles/CodeBlocks-SCons/wesnothd.cbp b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
index b0b02aefb39..8d65c5f2339 100644
--- a/projectfiles/CodeBlocks-SCons/wesnothd.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
@@ -12,9 +12,10 @@
 				<Option working_dir="../../" />
 				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option object_output="." />
 				<MakeCommands>
 					<Build command="scons -C ../.. build=$target wesnothd" />
-					<CompileFile command="scons -C ../.. build=$target $file" />
+					<CompileFile command="TARGET=$file;scons -C ../.. build=$target build/$target/${TARGET:6}" />
 					<Clean command="scons -C ../.. build=$target -c" />
 					<DistClean command="rm -rf ../../build" />
 				</MakeCommands>
@@ -24,37 +25,15 @@
 				<Option working_dir="../../" />
 				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option object_output="." />
 				<MakeCommands>
 					<Build command="scons -C ../.. build=$target wesnothd" />
-					<CompileFile command="scons -C ../.. build=$target $file" />
+					<CompileFile command="TARGET=$file;scons -C ../.. build=$target build/$target/${TARGET:6}" />
 					<Clean command="scons -C ../.. build=$target -c" />
 					<DistClean command="rm -rf ../../build" />
 				</MakeCommands>
 			</Target>
 		</Build>
-		<Compiler>
-			<Add option="-DHAVE_PYTHON" />
-			<Add option="-DUSE_GZIP" />
-			<Add option="-mthreads" />
-			<Add option="-fexceptions" />
-			<Add option="-O3" />
-			<Add option="-march=native" />
-			<Add directory="../../src" />
-			<Add directory="../../src/server" />
-			<Add directory="../../src/serialization" />
-		</Compiler>
-		<Linker>
-			<Add option="-mthreads" />
-			<Add library="mingw32" />
-			<Add library="mingwthrd" />
-			<Add library="SDLmain" />
-			<Add library="SDL" />
-			<Add library="boost_iostreams_dw2" />
-			<Add library="intl" />
-			<Add library="SDL_net" />
-			<Add library="ws2_32" />
-			<Add library="z" />
-		</Linker>
 		<Unit filename="../../src/color_range.cpp" />
 		<Unit filename="../../src/config.cpp" />
 		<Unit filename="../../src/filesystem.cpp" />