From fc41c576bdf77ff0b8f08db18ace866b8c88689f Mon Sep 17 00:00:00 2001
From: David Dormagen <czapper@gmx.de>
Date: Fri, 15 May 2009 19:24:06 +0200
Subject: [PATCH] Project files for the Code::Blocks project fixed

---
 engine/engine.cbp     | 35 ++++++++++++++++++-----------------
 standard/Standard.cbp | 15 ---------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/engine/engine.cbp b/engine/engine.cbp
index 699d63d6e..7d39035a9 100644
--- a/engine/engine.cbp
+++ b/engine/engine.cbp
@@ -190,6 +190,12 @@ A: Read http://forum.openclonk.org/topic_show.pl?pid=1405#pid1405 and install (a
 				</ResourceCompiler>
 				<Linker>
 					<Add library="..\obj\Standard\lib\libStandardDCon.a" />
+					<Add library="odbc32" />
+					<Add library="odbccp32" />
+					<Add library="wsock32" />
+					<Add library="dsound" />
+					<Add library="fmodvc" />
+					<Add library="libeay32" />
 					<Add directory="..\deps\lib" />
 				</Linker>
 			</Target>
@@ -201,28 +207,23 @@ A: Read http://forum.openclonk.org/topic_show.pl?pid=1405#pid1405 and install (a
 			<Add directory="..\standard\inc" />
 		</Compiler>
 		<Linker>
-			<Add option="-lfreetype6" />
-			<Add option="-ljpeg62" />
-			<Add option="-lglew32" />
+			<Add option="-mwindows" />
+			<Add option="-lws2_32" />
 			<Add option="-lcomdlg32" />
 			<Add option="-lgdi32" />
-			<Add option="-lz" />
+			<Add option="-ljpeg" />
 			<Add option="-lcrypto" />
-			<Add option="-mwindows" />
-			<Add option="-lpng12" />
-			<Add option="-lpng3" />
-			<Add library="winmm" />
-			<Add library="odbc32" />
-			<Add library="odbccp32" />
-			<Add library="vfw32" />
-			<Add library="wsock32" />
-			<Add library="dsound" />
-			<Add library="ws2_32" />
+			<Add option="-enable-auto-import" />
 			<Add library="fmodvc" />
-			<Add library="libeay32" />
-			<Add library="zlib1" />
-			<Add library="opengl32" />
+			<Add library="winmm" />
+			<Add library="glew32" />
 			<Add library="glu32" />
+			<Add library="freetype" />
+			<Add library="opengl32" />
+			<Add library="vfw32" />
+			<Add library="z" />
+			<Add library="png" />
+			<Add library="png12" />
 			<Add directory="..\planet" />
 		</Linker>
 		<Unit filename="inc\C4AList.h" />
diff --git a/standard/Standard.cbp b/standard/Standard.cbp
index 424fad7c5..ad899fbec 100644
--- a/standard/Standard.cbp
+++ b/standard/Standard.cbp
@@ -206,21 +206,6 @@
 		<Compiler>
 			<Add option="-DHAVE_STDINT_H" />
 		</Compiler>
-		<Linker>
-			<Add option="-lfreetype" />
-			<Add option="-lvfw32" />
-			<Add option="-lws2_32" />
-			<Add option="-lwinmm" />
-			<Add option="-lcomdlg32" />
-			<Add option="-lgdi32" />
-			<Add option="-lglew32" />
-			<Add option="-lglu32" />
-			<Add option="-lopengl32" />
-			<Add option="-lz" />
-			<Add option="-lpng" />
-			<Add option="-ljpeg" />
-			<Add option="-lcrypto" />
-		</Linker>
 		<Unit filename="inc\Bitmap256.h" />
 		<Unit filename="inc\CStdFile.h" />
 		<Unit filename="inc\DInputX.h" />