foxygit / doom Log in
commit cb3c1cbb8621ab257c503cb05c2a62730b4697bd
Author:     Russell Rice <rtc_marine@hotmail.com>
AuthorDate: Sat Mar 10 07:48:21 2007 +0000
Commit:     Russell Rice <rtc_marine@hotmail.com>
CommitDate: Sat Mar 10 07:48:21 2007 +0000

    Minor changes:
    * No more shared libraries on windows, because they suck anyway and
      complicate things
    * Fix build virtual targets

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 854
---
 codeblocks/libpcsound.cbp |  2 +-
 codeblocks/textscreen.cbp | 40 +++++-----------------------------------
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/codeblocks/libpcsound.cbp b/codeblocks/libpcsound.cbp
index 36b78bc4..fb9b47ae 100644
--- a/codeblocks/libpcsound.cbp
+++ b/codeblocks/libpcsound.cbp
@@ -31,7 +31,7 @@
 			</Target>
 		</Build>
 		<VirtualTargets>
-			<Add alias="All" targets="Debug-dyn;Release-dyn;Debug-stc;Release-stc;" />
+			<Add alias="All" targets="Debug;Release;" />
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-Wall" />
diff --git a/codeblocks/textscreen.cbp b/codeblocks/textscreen.cbp
index ce6d70c9..74987a52 100644
--- a/codeblocks/textscreen.cbp
+++ b/codeblocks/textscreen.cbp
@@ -6,38 +6,10 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug-dyn">
-				<Option output="..\lib\libtextscreen-dbg.dll" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\libtextscreen\dbg-dyn" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release-dyn">
-				<Option output="..\lib\libtextscreen.dll" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\libtextscreen\rel-dyn" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="Debug-stc">
+			<Target title="Debug">
 				<Option output="..\lib\libtextscreen-dbg.a" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libtextscreen\dbg-stc" />
+				<Option object_output="..\obj\libtextscreen\debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -46,10 +18,10 @@
 					<Add option="-g" />
 				</Compiler>
 			</Target>
-			<Target title="Release-stc">
+			<Target title="Release">
 				<Option output="..\lib\libtextscreen.a" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libtextscreen\rel-stc" />
+				<Option object_output="..\obj\libtextscreen\release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -62,9 +34,7 @@
 			</Target>
 		</Build>
 		<VirtualTargets>
-			<Add alias="All" targets="Debug-dyn;Release-dyn;Debug-stc;Release-stc;" />
-			<Add alias="Debug" targets="Debug-dyn;Debug-stc;" />
-			<Add alias="Release" targets="Release-dyn;Release-stc;" />
+			<Add alias="All" targets="Debug;Release;" />
 		</VirtualTargets>
 		<Compiler>
 			<Add directory="..\src" />