commit 33ebb6ea9d5d6d67eaedf1ea47b2d77b508b6ae0
Author: Russell Rice <rtc_marine@hotmail.com>
AuthorDate: Thu Sep 21 04:25:49 2006 +0000
Commit: Russell Rice <rtc_marine@hotmail.com>
CommitDate: Thu Sep 21 04:25:49 2006 +0000
Code::Blocks project and workspace.
* Rename workspace appropriately in editor.
* Update project files for new spin control and fix compilation of
certain projects caused by it.
* Create virtual targets (Debug/Release) for textscreen project.
Code:
* Fix the include in multiplayer.c, hopefully this does not break
anything.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 639
---
codeblocks/chocolate-doom.cbp | 12 ++++++++++++
codeblocks/chocolate-doom.workspace | 6 +++---
codeblocks/chocolate-setup.cbp | 17 +++++++++++++++++
codeblocks/textscreen.cbp | 18 ++++++++++++++++++
setup/multiplayer.c | 2 +-
5 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/codeblocks/chocolate-doom.cbp b/codeblocks/chocolate-doom.cbp
index 1f330572..b00f5515 100644
--- a/codeblocks/chocolate-doom.cbp
+++ b/codeblocks/chocolate-doom.cbp
@@ -1242,6 +1242,18 @@
<Option target="Debug" />
<Option target="Release" />
</Unit>
+ <Unit filename="..\textscreen\txt_spinctrl.c">
+ <Option compilerVar="CC" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="..\textscreen\txt_spinctrl.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
<Unit filename="..\textscreen\txt_strut.c">
<Option compilerVar="CC" />
<Option target="Debug" />
diff --git a/codeblocks/chocolate-doom.workspace b/codeblocks/chocolate-doom.workspace
index 3be39b12..997672a8 100644
--- a/codeblocks/chocolate-doom.workspace
+++ b/codeblocks/chocolate-doom.workspace
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
- <Workspace title="Workspace">
+ <Workspace title="chocolate-doom">
<Project filename="chocolate-doom.cbp" />
<Project filename="chocolate-server.cbp" />
- <Project filename="textscreen.cbp" active="1" />
- <Project filename="chocolate-setup.cbp" />
+ <Project filename="textscreen.cbp" />
+ <Project filename="chocolate-setup.cbp" active="1" />
</Workspace>
</CodeBlocks_workspace_file>
\ No newline at end of file
diff --git a/codeblocks/chocolate-setup.cbp b/codeblocks/chocolate-setup.cbp
index 664436b9..c8a195dc 100644
--- a/codeblocks/chocolate-setup.cbp
+++ b/codeblocks/chocolate-setup.cbp
@@ -73,6 +73,11 @@
<Option target="Debug" />
<Option target="Release" />
</Unit>
+ <Unit filename="..\setup\sound.c">
+ <Option compilerVar="CC" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
<Unit filename="..\setup\txt_keyinput.c">
<Option compilerVar="CC" />
<Option target="Debug" />
@@ -243,6 +248,18 @@
<Option target="Debug" />
<Option target="Release" />
</Unit>
+ <Unit filename="..\textscreen\txt_spinctrl.c">
+ <Option compilerVar="CC" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="..\textscreen\txt_spinctrl.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
<Unit filename="..\textscreen\txt_strut.c">
<Option compilerVar="CC" />
<Option target="Debug" />
diff --git a/codeblocks/textscreen.cbp b/codeblocks/textscreen.cbp
index 118b5604..d3d56fd5 100644
--- a/codeblocks/textscreen.cbp
+++ b/codeblocks/textscreen.cbp
@@ -65,6 +65,8 @@
</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;" />
</VirtualTargets>
<Compiler>
<Add directory="..\src" />
@@ -266,6 +268,22 @@
<Option target="Release-stc" />
<Option target="Debug-stc" />
</Unit>
+ <Unit filename="..\textscreen\txt_spinctrl.c">
+ <Option compilerVar="CC" />
+ <Option target="Debug-dyn" />
+ <Option target="Release-dyn" />
+ <Option target="Debug-stc" />
+ <Option target="Release-stc" />
+ </Unit>
+ <Unit filename="..\textscreen\txt_spinctrl.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug-dyn" />
+ <Option target="Release-dyn" />
+ <Option target="Debug-stc" />
+ <Option target="Release-stc" />
+ </Unit>
<Unit filename="..\textscreen\txt_strut.c">
<Option compilerVar="CC" />
<Option target="Debug-dyn" />
diff --git a/setup/multiplayer.c b/setup/multiplayer.c
index 27731f39..89450b3f 100644
--- a/setup/multiplayer.c
+++ b/setup/multiplayer.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
-#include "src/d_englsh.h"
+#include "d_englsh.h"
#include "textscreen.h"
#define NUM_WADS 10