From 303f94ed4972476cb08d75ace12f25fb0fca3196 Mon Sep 17 00:00:00 2001
From: Russell Rice
Date: Tue, 16 Sep 2008 00:17:20 +0000
Subject: - Force use of dwarf-2 debugging information - Fix an age-old problem
 of not being able to find -lpcsound, the debug target was looking for it
 rather than -lpcsound-dbg

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1233
---
 codeblocks/game.cbp       | 10 ++++++++--
 codeblocks/libpcsound.cbp |  2 +-
 codeblocks/server.cbp     |  2 +-
 codeblocks/setup.cbp      |  9 ++++++++-
 codeblocks/textscreen.cbp |  3 ++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/codeblocks/game.cbp b/codeblocks/game.cbp
index 05b32d25..bf1c249a 100644
--- a/codeblocks/game.cbp
+++ b/codeblocks/game.cbp
@@ -13,10 +13,14 @@
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters="-iwad d:\russell\games\doom2\iwad\doom2.wad" />
+				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-W" />
-					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 				</Compiler>
+				<Linker>
+					<Add option="-lpcsound-dbg -ltextscreen-dbg" />
+				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="..\bin\$(PROJECT_NAME).exe" prefix_auto="0" extension_auto="0" />
@@ -24,11 +28,13 @@
 				<Option object_output="..\obj\rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
+				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-O2" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-lpcsound -ltextscreen" />
 				</Linker>
 			</Target>
 		</Build>
@@ -42,7 +48,7 @@
 			<Add directory="..\pcsound" />
 		</Compiler>
 		<Linker>
-			<Add option="-lpcsound -ltextscreen -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
+			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
 			<Add directory="..\lib" />
 		</Linker>
 		<Unit filename="config.h" />
diff --git a/codeblocks/libpcsound.cbp b/codeblocks/libpcsound.cbp
index ce526ee5..9ae9843b 100644
--- a/codeblocks/libpcsound.cbp
+++ b/codeblocks/libpcsound.cbp
@@ -13,7 +13,7 @@
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 				</Compiler>
 			</Target>
 			<Target title="Release">
diff --git a/codeblocks/server.cbp b/codeblocks/server.cbp
index 1b30bcfa..c15d3d96 100644
--- a/codeblocks/server.cbp
+++ b/codeblocks/server.cbp
@@ -14,7 +14,7 @@
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-W" />
-					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 				</Compiler>
 			</Target>
 			<Target title="Release">
diff --git a/codeblocks/setup.cbp b/codeblocks/setup.cbp
index 816693fe..4cfe39e4 100644
--- a/codeblocks/setup.cbp
+++ b/codeblocks/setup.cbp
@@ -12,10 +12,15 @@
 				<Option object_output="..\obj\dbg\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
+				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 				</Compiler>
+				<Linker>
+					<Add option="-ltextscreen-dbg" />
+				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="..\bin\$(PROJECT_NAME).exe" prefix_auto="0" extension_auto="0" />
@@ -23,11 +28,13 @@
 				<Option object_output="..\obj\rel\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
+				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-O2" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-ltextscreen" />
 				</Linker>
 			</Target>
 		</Build>
@@ -45,7 +52,7 @@
 			<Add directory="..\setup" />
 		</ResourceCompiler>
 		<Linker>
-			<Add option="-ltextscreen -lmingw32 -lSDLmain -lSDL -mwindows" />
+			<Add option="-lmingw32 -lSDLmain -lSDL -mwindows" />
 			<Add directory="..\lib" />
 		</Linker>
 		<Unit filename="setup-res.rc">
diff --git a/codeblocks/textscreen.cbp b/codeblocks/textscreen.cbp
index 96869dca..bee3040a 100644
--- a/codeblocks/textscreen.cbp
+++ b/codeblocks/textscreen.cbp
@@ -15,7 +15,7 @@
 				<Option createDefFile="1" />
 				<Compiler>
 					<Add option="-W" />
-					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 				</Compiler>
 			</Target>
 			<Target title="Release">
@@ -116,6 +116,7 @@
 		<Extensions>
 			<code_completion />
 			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
-- 
cgit v1.2.3