- Create separate codeblocks project files for doom, heretic and hexen,

they all build except for hexen, which is currently WIP
- Fix build on windows

Subversion-branch: /branches/raven-branch
Subversion-revision: 1305

6 files changed, 892 insertions, 189 deletions

diff --git a/codeblocks/game.cbp b/codeblocks/doom.cbp
index bf1c249a..65797101 100644
--- a/codeblocks/game.cbp
+++ b/codeblocks/doom.cbp
@@ -2,14 +2,14 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="chocolate-doom" />
+		<Option title="Doom" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\$(PROJECT_NAME)-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="..\bin\chocolate-doom-dbg.exe" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\dbg" />
+				<Option object_output="..\obj\chocolate-doom\dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters="-iwad d:\russell\games\doom2\iwad\doom2.wad" />
@@ -23,9 +23,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\$(PROJECT_NAME).exe" prefix_auto="0" extension_auto="0" />
+				<Option output="..\bin\chocolate-doom.exe" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\rel" />
+				<Option object_output="..\obj\chocolate-doom\rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -42,8 +42,11 @@
 			<Add alias="All" targets="Debug;Release;" />
 		</VirtualTargets>
 		<Compiler>
+			<Add option='-DPROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;' />
+			<Add option='-DD_CDROM=&quot;\&quot;CD-ROM Version: default.cfg from c:\\doomdata\n\&quot;&quot;' />
 			<Add directory="." />
 			<Add directory="..\src" />
+			<Add directory="..\src\doom" />
 			<Add directory="..\textscreen" />
 			<Add directory="..\pcsound" />
 		</Compiler>
@@ -55,355 +58,386 @@
 		<Unit filename="game-res.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
-		<Unit filename="..\src\am_map.c">
+		<Unit filename="..\src\d_event.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\am_map.h" />
-		<Unit filename="..\src\d_englsh.h" />
 		<Unit filename="..\src\d_event.h" />
-		<Unit filename="..\src\d_items.c">
+		<Unit filename="..\src\d_mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_items.h" />
-		<Unit filename="..\src\d_iwad.c">
+		<Unit filename="..\src\d_mode.h" />
+		<Unit filename="..\src\d_ticcmd.h" />
+		<Unit filename="..\src\deh_str.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.h" />
-		<Unit filename="..\src\d_main.c">
+		<Unit filename="..\src\deh_str.h" />
+		<Unit filename="..\src\doom\am_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_main.h" />
-		<Unit filename="..\src\d_net.c">
+		<Unit filename="..\src\doom\am_map.h" />
+		<Unit filename="..\src\doom\d_englsh.h" />
+		<Unit filename="..\src\doom\d_items.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_net.h" />
-		<Unit filename="..\src\d_player.h" />
-		<Unit filename="..\src\d_textur.h" />
-		<Unit filename="..\src\d_think.h" />
-		<Unit filename="..\src\d_ticcmd.h" />
-		<Unit filename="..\src\deh_ammo.c">
+		<Unit filename="..\src\doom\d_items.h" />
+		<Unit filename="..\src\doom\d_iwad.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_cheat.c">
+		<Unit filename="..\src\doom\d_iwad.h" />
+		<Unit filename="..\src\doom\d_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_defs.h" />
-		<Unit filename="..\src\deh_frame.c">
+		<Unit filename="..\src\doom\d_main.h" />
+		<Unit filename="..\src\doom\d_net.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.c">
+		<Unit filename="..\src\doom\d_net.h" />
+		<Unit filename="..\src\doom\d_player.h" />
+		<Unit filename="..\src\doom\d_textur.h" />
+		<Unit filename="..\src\doom\d_think.h" />
+		<Unit filename="..\src\doom\deh_ammo.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.h" />
-		<Unit filename="..\src\deh_main.c">
+		<Unit filename="..\src\doom\deh_cheat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_main.h" />
-		<Unit filename="..\src\deh_mapping.c">
+		<Unit filename="..\src\doom\deh_defs.h" />
+		<Unit filename="..\src\doom\deh_frame.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_mapping.h" />
-		<Unit filename="..\src\deh_misc.c">
+		<Unit filename="..\src\doom\deh_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_misc.h" />
-		<Unit filename="..\src\deh_ptr.c">
+		<Unit filename="..\src\doom\deh_io.h" />
+		<Unit filename="..\src\doom\deh_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_sound.c">
+		<Unit filename="..\src\doom\deh_main.h" />
+		<Unit filename="..\src\doom\deh_mapping.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_text.c">
+		<Unit filename="..\src\doom\deh_mapping.h" />
+		<Unit filename="..\src\doom\deh_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_thing.c">
+		<Unit filename="..\src\doom\deh_misc.h" />
+		<Unit filename="..\src\doom\deh_ptr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_weapon.c">
+		<Unit filename="..\src\doom\deh_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doomdata.h" />
-		<Unit filename="..\src\doomdef.c">
+		<Unit filename="..\src\doom\deh_text.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doomdef.h" />
-		<Unit filename="..\src\doomfeatures.h" />
-		<Unit filename="..\src\doomkeys.h" />
-		<Unit filename="..\src\doomstat.c">
+		<Unit filename="..\src\doom\deh_thing.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doomstat.h" />
-		<Unit filename="..\src\doomtype.h" />
-		<Unit filename="..\src\dstrings.c">
+		<Unit filename="..\src\doom\deh_weapon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\dstrings.h" />
-		<Unit filename="..\src\f_finale.c">
+		<Unit filename="..\src\doom\doomdata.h" />
+		<Unit filename="..\src\doom\doomdef.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\f_finale.h" />
-		<Unit filename="..\src\f_wipe.c">
+		<Unit filename="..\src\doom\doomdef.h" />
+		<Unit filename="..\src\doom\doomstat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\f_wipe.h" />
-		<Unit filename="..\src\g_game.c">
+		<Unit filename="..\src\doom\doomstat.h" />
+		<Unit filename="..\src\doom\dstrings.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\g_game.h" />
-		<Unit filename="..\src\hu_lib.c">
+		<Unit filename="..\src\doom\dstrings.h" />
+		<Unit filename="..\src\doom\f_finale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hu_lib.h" />
-		<Unit filename="..\src\hu_stuff.c">
+		<Unit filename="..\src\doom\f_finale.h" />
+		<Unit filename="..\src\doom\f_wipe.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hu_stuff.h" />
-		<Unit filename="..\src\i_joystick.c">
+		<Unit filename="..\src\doom\f_wipe.h" />
+		<Unit filename="..\src\doom\g_game.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_joystick.h" />
-		<Unit filename="..\src\i_main.c">
+		<Unit filename="..\src\doom\g_game.h" />
+		<Unit filename="..\src\doom\hu_lib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_pcsound.c">
+		<Unit filename="..\src\doom\hu_lib.h" />
+		<Unit filename="..\src\doom\hu_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.c">
+		<Unit filename="..\src\doom\hu_stuff.h" />
+		<Unit filename="..\src\doom\info.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.h" />
-		<Unit filename="..\src\i_sdlmusic.c">
+		<Unit filename="..\src\doom\info.h" />
+		<Unit filename="..\src\doom\m_menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sdlsound.c">
+		<Unit filename="..\src\doom\m_menu.h" />
+		<Unit filename="..\src\doom\m_random.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_swap.h" />
-		<Unit filename="..\src\i_system.c">
+		<Unit filename="..\src\doom\m_random.h" />
+		<Unit filename="..\src\doom\p_ceilng.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_system.h" />
-		<Unit filename="..\src\i_timer.c">
+		<Unit filename="..\src\doom\p_doors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_timer.h" />
-		<Unit filename="..\src\i_video.c">
+		<Unit filename="..\src\doom\p_enemy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_video.h" />
-		<Unit filename="..\src\info.c">
+		<Unit filename="..\src\doom\p_floor.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\info.h" />
-		<Unit filename="..\src\m_argv.c">
+		<Unit filename="..\src\doom\p_inter.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.h" />
-		<Unit filename="..\src\m_bbox.c">
+		<Unit filename="..\src\doom\p_inter.h" />
+		<Unit filename="..\src\doom\p_lights.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_bbox.h" />
-		<Unit filename="..\src\m_cheat.c">
+		<Unit filename="..\src\doom\p_local.h" />
+		<Unit filename="..\src\doom\p_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_cheat.h" />
-		<Unit filename="..\src\m_config.c">
+		<Unit filename="..\src\doom\p_maputl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_config.h" />
-		<Unit filename="..\src\m_fixed.c">
+		<Unit filename="..\src\doom\p_mobj.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_fixed.h" />
-		<Unit filename="..\src\m_menu.c">
+		<Unit filename="..\src\doom\p_mobj.h" />
+		<Unit filename="..\src\doom\p_plats.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_menu.h" />
-		<Unit filename="..\src\m_misc.c">
+		<Unit filename="..\src\doom\p_pspr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_misc.h" />
-		<Unit filename="..\src\m_random.c">
+		<Unit filename="..\src\doom\p_pspr.h" />
+		<Unit filename="..\src\doom\p_saveg.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_random.h" />
-		<Unit filename="..\src\md5.c">
+		<Unit filename="..\src\doom\p_saveg.h" />
+		<Unit filename="..\src\doom\p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\md5.h" />
-		<Unit filename="..\src\memio.c">
+		<Unit filename="..\src\doom\p_setup.h" />
+		<Unit filename="..\src\doom\p_sight.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\memio.h" />
-		<Unit filename="..\src\mus2mid.c">
+		<Unit filename="..\src\doom\p_spec.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\mus2mid.h" />
-		<Unit filename="..\src\net_client.c">
+		<Unit filename="..\src\doom\p_spec.h" />
+		<Unit filename="..\src\doom\p_switch.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_client.h" />
-		<Unit filename="..\src\net_common.c">
+		<Unit filename="..\src\doom\p_telept.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_common.h" />
-		<Unit filename="..\src\net_dedicated.c">
+		<Unit filename="..\src\doom\p_tick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_dedicated.h" />
-		<Unit filename="..\src\net_defs.h" />
-		<Unit filename="..\src\net_gui.c">
+		<Unit filename="..\src\doom\p_tick.h" />
+		<Unit filename="..\src\doom\p_user.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_gui.h" />
-		<Unit filename="..\src\net_io.c">
+		<Unit filename="..\src\doom\r_bsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_io.h" />
-		<Unit filename="..\src\net_loop.c">
+		<Unit filename="..\src\doom\r_bsp.h" />
+		<Unit filename="..\src\doom\r_data.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_loop.h" />
-		<Unit filename="..\src\net_packet.c">
+		<Unit filename="..\src\doom\r_data.h" />
+		<Unit filename="..\src\doom\r_defs.h" />
+		<Unit filename="..\src\doom\r_draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_packet.h" />
-		<Unit filename="..\src\net_query.c">
+		<Unit filename="..\src\doom\r_draw.h" />
+		<Unit filename="..\src\doom\r_local.h" />
+		<Unit filename="..\src\doom\r_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_query.h" />
-		<Unit filename="..\src\net_sdl.c">
+		<Unit filename="..\src\doom\r_main.h" />
+		<Unit filename="..\src\doom\r_plane.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_sdl.h" />
-		<Unit filename="..\src\net_server.c">
+		<Unit filename="..\src\doom\r_plane.h" />
+		<Unit filename="..\src\doom\r_segs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_server.h" />
-		<Unit filename="..\src\net_structrw.c">
+		<Unit filename="..\src\doom\r_segs.h" />
+		<Unit filename="..\src\doom\r_sky.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\p_ceilng.c">
+		<Unit filename="..\src\doom\r_sky.h" />
+		<Unit filename="..\src\doom\r_state.h" />
+		<Unit filename="..\src\doom\r_things.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\doom\r_things.h" />
+		<Unit filename="..\src\doom\s_sound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\doom\s_sound.h" />
+		<Unit filename="..\src\doom\sounds.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\doom\sounds.h" />
+		<Unit filename="..\src\doom\st_lib.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\doom\st_lib.h" />
+		<Unit filename="..\src\doom\st_stuff.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\doom\st_stuff.h" />
+		<Unit filename="..\src\doom\wi_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_doors.c">
+		<Unit filename="..\src\doom\wi_stuff.h" />
+		<Unit filename="..\src\doomfeatures.h" />
+		<Unit filename="..\src\doomkeys.h" />
+		<Unit filename="..\src\doomtype.h" />
+		<Unit filename="..\src\i_cdmus.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_enemy.c">
+		<Unit filename="..\src\i_cdmus.h" />
+		<Unit filename="..\src\i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_floor.c">
+		<Unit filename="..\src\i_joystick.h" />
+		<Unit filename="..\src\i_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_inter.c">
+		<Unit filename="..\src\i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_inter.h" />
-		<Unit filename="..\src\p_lights.c">
+		<Unit filename="..\src\i_scale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_local.h" />
-		<Unit filename="..\src\p_map.c">
+		<Unit filename="..\src\i_scale.h" />
+		<Unit filename="..\src\i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_maputl.c">
+		<Unit filename="..\src\i_sdlsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_mobj.c">
+		<Unit filename="..\src\i_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_mobj.h" />
-		<Unit filename="..\src\p_plats.c">
+		<Unit filename="..\src\i_sound.h" />
+		<Unit filename="..\src\i_swap.h" />
+		<Unit filename="..\src\i_system.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_pspr.c">
+		<Unit filename="..\src\i_system.h" />
+		<Unit filename="..\src\i_timer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_pspr.h" />
-		<Unit filename="..\src\p_saveg.c">
+		<Unit filename="..\src\i_timer.h" />
+		<Unit filename="..\src\i_video.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_saveg.h" />
-		<Unit filename="..\src\p_setup.c">
+		<Unit filename="..\src\i_video.h" />
+		<Unit filename="..\src\icon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_setup.h" />
-		<Unit filename="..\src\p_sight.c">
+		<Unit filename="..\src\m_argv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_spec.c">
+		<Unit filename="..\src\m_argv.h" />
+		<Unit filename="..\src\m_bbox.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_spec.h" />
-		<Unit filename="..\src\p_switch.c">
+		<Unit filename="..\src\m_bbox.h" />
+		<Unit filename="..\src\m_cheat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_telept.c">
+		<Unit filename="..\src\m_cheat.h" />
+		<Unit filename="..\src\m_config.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_config.h" />
+		<Unit filename="..\src\m_controls.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_controls.h" />
+		<Unit filename="..\src\m_fixed.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_fixed.h" />
+		<Unit filename="..\src\m_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_tick.c">
+		<Unit filename="..\src\m_misc.h" />
+		<Unit filename="..\src\md5.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_tick.h" />
-		<Unit filename="..\src\p_user.c">
+		<Unit filename="..\src\md5.h" />
+		<Unit filename="..\src\memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_bsp.c">
+		<Unit filename="..\src\memio.h" />
+		<Unit filename="..\src\mus2mid.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_bsp.h" />
-		<Unit filename="..\src\r_data.c">
+		<Unit filename="..\src\mus2mid.h" />
+		<Unit filename="..\src\net_client.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_data.h" />
-		<Unit filename="..\src\r_defs.h" />
-		<Unit filename="..\src\r_draw.c">
+		<Unit filename="..\src\net_client.h" />
+		<Unit filename="..\src\net_common.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_draw.h" />
-		<Unit filename="..\src\r_local.h" />
-		<Unit filename="..\src\r_main.c">
+		<Unit filename="..\src\net_common.h" />
+		<Unit filename="..\src\net_dedicated.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_main.h" />
-		<Unit filename="..\src\r_plane.c">
+		<Unit filename="..\src\net_dedicated.h" />
+		<Unit filename="..\src\net_defs.h" />
+		<Unit filename="..\src\net_gui.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_plane.h" />
-		<Unit filename="..\src\r_segs.c">
+		<Unit filename="..\src\net_gui.h" />
+		<Unit filename="..\src\net_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_segs.h" />
-		<Unit filename="..\src\r_sky.c">
+		<Unit filename="..\src\net_io.h" />
+		<Unit filename="..\src\net_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_sky.h" />
-		<Unit filename="..\src\r_state.h" />
-		<Unit filename="..\src\r_things.c">
+		<Unit filename="..\src\net_loop.h" />
+		<Unit filename="..\src\net_packet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_things.h" />
-		<Unit filename="..\src\s_sound.c">
+		<Unit filename="..\src\net_packet.h" />
+		<Unit filename="..\src\net_query.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\s_sound.h" />
-		<Unit filename="..\src\sounds.c">
+		<Unit filename="..\src\net_query.h" />
+		<Unit filename="..\src\net_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\sounds.h" />
-		<Unit filename="..\src\st_lib.c">
+		<Unit filename="..\src\net_sdl.h" />
+		<Unit filename="..\src\net_server.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\st_lib.h" />
-		<Unit filename="..\src\st_stuff.c">
+		<Unit filename="..\src\net_server.h" />
+		<Unit filename="..\src\net_structrw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\st_stuff.h" />
+		<Unit filename="..\src\net_structrw.h" />
 		<Unit filename="..\src\tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\src\tables.h" />
+		<Unit filename="..\src\v_patch.h" />
 		<Unit filename="..\src\v_video.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -416,6 +450,9 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\src\w_file.h" />
+		<Unit filename="..\src\w_file_posix.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\w_file_stdc.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -430,10 +467,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\src\w_wad.h" />
-		<Unit filename="..\src\wi_stuff.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\src\wi_stuff.h" />
 		<Unit filename="..\src\z_zone.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/codeblocks/heretic.cbp b/codeblocks/heretic.cbp
new file mode 100644
index 00000000..3a580e48
--- /dev/null
+++ b/codeblocks/heretic.cbp
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="Heretic" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="..\bin\chocolate-heretic-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="..\bin" />
+				<Option object_output="..\obj\chocolate-heretic\dbg" />
+				<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="-gdwarf-2" />
+				</Compiler>
+				<Linker>
+					<Add option="-lpcsound-dbg -ltextscreen-dbg" />
+				</Linker>
+			</Target>
+			<Target title="Release">
+				<Option output="..\bin\chocolate-heretic.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="..\bin" />
+				<Option object_output="..\obj\chocolate-heretic\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>
+		<VirtualTargets>
+			<Add alias="All" targets="Debug;Release;" />
+		</VirtualTargets>
+		<Compiler>
+			<Add option='-DPROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;' />
+			<Add option='-DD_CDROM=&quot;\&quot;CD-ROM Version: default.cfg from c:\\doomdata\n\&quot;&quot;' />
+			<Add directory="." />
+			<Add directory="..\src" />
+			<Add directory="..\src\heretic" />
+			<Add directory="..\textscreen" />
+			<Add directory="..\pcsound" />
+		</Compiler>
+		<Linker>
+			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
+			<Add directory="..\lib" />
+		</Linker>
+		<Unit filename="config.h" />
+		<Unit filename="game-res.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
+		<Unit filename="..\src\d_event.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\d_event.h" />
+		<Unit filename="..\src\d_mode.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\d_mode.h" />
+		<Unit filename="..\src\d_ticcmd.h" />
+		<Unit filename="..\src\deh_str.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\deh_str.h" />
+		<Unit filename="..\src\doomfeatures.h" />
+		<Unit filename="..\src\doomkeys.h" />
+		<Unit filename="..\src\doomtype.h" />
+		<Unit filename="..\src\heretic\am_data.h" />
+		<Unit filename="..\src\heretic\am_map.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\am_map.h" />
+		<Unit filename="..\src\heretic\ct_chat.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\ct_chat.h" />
+		<Unit filename="..\src\heretic\d_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\d_net.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\doomdata.h" />
+		<Unit filename="..\src\heretic\doomdef.h" />
+		<Unit filename="..\src\heretic\dstrings.h" />
+		<Unit filename="..\src\heretic\f_finale.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\g_game.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\in_lude.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\info.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\info.h" />
+		<Unit filename="..\src\heretic\m_misc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\m_random.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\m_random.h" />
+		<Unit filename="..\src\heretic\mn_menu.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_ceilng.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_doors.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_enemy.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_floor.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_inter.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_lights.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_local.h" />
+		<Unit filename="..\src\heretic\p_map.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_maputl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_mobj.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_plats.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_pspr.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_setup.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_sight.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_spec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_spec.h" />
+		<Unit filename="..\src\heretic\p_switch.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_telept.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_tick.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\p_user.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\r_bsp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\r_data.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\r_draw.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\r_local.h" />
+		<Unit filename="..\src\heretic\r_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\r_plane.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\r_segs.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\r_things.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\s_sound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\s_sound.h" />
+		<Unit filename="..\src\heretic\sb_bar.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\sounds.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\heretic\sounds.h" />
+		<Unit filename="..\src\i_cdmus.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_cdmus.h" />
+		<Unit filename="..\src\i_joystick.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_joystick.h" />
+		<Unit filename="..\src\i_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_pcsound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_scale.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_scale.h" />
+		<Unit filename="..\src\i_sdlmusic.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_sdlsound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_sound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_sound.h" />
+		<Unit filename="..\src\i_swap.h" />
+		<Unit filename="..\src\i_system.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_system.h" />
+		<Unit filename="..\src\i_timer.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_timer.h" />
+		<Unit filename="..\src\i_video.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_video.h" />
+		<Unit filename="..\src\icon.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_argv.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_argv.h" />
+		<Unit filename="..\src\m_bbox.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_bbox.h" />
+		<Unit filename="..\src\m_cheat.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_cheat.h" />
+		<Unit filename="..\src\m_config.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_config.h" />
+		<Unit filename="..\src\m_controls.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_controls.h" />
+		<Unit filename="..\src\m_fixed.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_fixed.h" />
+		<Unit filename="..\src\m_misc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_misc.h" />
+		<Unit filename="..\src\md5.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\md5.h" />
+		<Unit filename="..\src\memio.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\memio.h" />
+		<Unit filename="..\src\mus2mid.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\mus2mid.h" />
+		<Unit filename="..\src\tables.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\tables.h" />
+		<Unit filename="..\src\v_patch.h" />
+		<Unit filename="..\src\v_video.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\v_video.h" />
+		<Unit filename="..\src\w_checksum.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_checksum.h" />
+		<Unit filename="..\src\w_file.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_file.h" />
+		<Unit filename="..\src\w_file_posix.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_file_stdc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_file_win32.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_merge.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_merge.h" />
+		<Unit filename="..\src\w_wad.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_wad.h" />
+		<Unit filename="..\src\z_zone.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\z_zone.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/codeblocks/hexen.cbp b/codeblocks/hexen.cbp
new file mode 100644
index 00000000..689b6f34
--- /dev/null
+++ b/codeblocks/hexen.cbp
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="Hexen" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="..\bin\chocolate-hexen-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="..\bin" />
+				<Option object_output="..\obj\chocolate-hexen\dbg" />
+				<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="-gdwarf-2" />
+				</Compiler>
+				<Linker>
+					<Add option="-lpcsound-dbg -ltextscreen-dbg" />
+				</Linker>
+			</Target>
+			<Target title="Release">
+				<Option output="..\bin\chocolate-hexen.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="..\bin" />
+				<Option object_output="..\obj\chocolate-hexen\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>
+		<VirtualTargets>
+			<Add alias="All" targets="Debug;Release;" />
+		</VirtualTargets>
+		<Compiler>
+			<Add option='-DPROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;' />
+			<Add option='-DD_CDROM=&quot;\&quot;CD-ROM Version: default.cfg from c:\\doomdata\n\&quot;&quot;' />
+			<Add directory="." />
+			<Add directory="..\src" />
+			<Add directory="..\src\hexen" />
+			<Add directory="..\textscreen" />
+			<Add directory="..\pcsound" />
+		</Compiler>
+		<Linker>
+			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
+			<Add directory="..\lib" />
+		</Linker>
+		<Unit filename="config.h" />
+		<Unit filename="game-res.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
+		<Unit filename="..\src\d_event.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\d_event.h" />
+		<Unit filename="..\src\d_mode.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\d_mode.h" />
+		<Unit filename="..\src\d_ticcmd.h" />
+		<Unit filename="..\src\deh_str.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\deh_str.h" />
+		<Unit filename="..\src\doomfeatures.h" />
+		<Unit filename="..\src\doomkeys.h" />
+		<Unit filename="..\src\doomtype.h" />
+		<Unit filename="..\src\hexen\a_action.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\am_data.h" />
+		<Unit filename="..\src\hexen\am_map.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\am_map.h" />
+		<Unit filename="..\src\hexen\ct_chat.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\ct_chat.h" />
+		<Unit filename="..\src\hexen\d_net.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\f_finale.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\g_game.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\h2_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\h2def.h" />
+		<Unit filename="..\src\hexen\i_header.h" />
+		<Unit filename="..\src\hexen\i_sound.h" />
+		<Unit filename="..\src\hexen\in_lude.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\info.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\info.h" />
+		<Unit filename="..\src\hexen\m_misc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\mn_menu.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_acs.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_anim.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_ceilng.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_doors.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_enemy.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_floor.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_inter.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_lights.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_local.h" />
+		<Unit filename="..\src\hexen\p_map.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_maputl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_mobj.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_plats.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_pspr.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_setup.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_sight.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_spec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_spec.h" />
+		<Unit filename="..\src\hexen\p_switch.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_telept.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_things.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_tick.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\p_user.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\po_man.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\r_bsp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\r_data.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\r_draw.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\r_local.h" />
+		<Unit filename="..\src\hexen\r_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\r_plane.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\r_segs.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\r_things.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\sb_bar.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\sc_man.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\sn_sonix.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\sounds.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\sounds.h" />
+		<Unit filename="..\src\hexen\soundst.h" />
+		<Unit filename="..\src\hexen\st_start.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\st_start.h" />
+		<Unit filename="..\src\hexen\sv_save.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\textdefs.h" />
+		<Unit filename="..\src\hexen\v_video.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\hexen\xddefs.h" />
+		<Unit filename="..\src\i_cdmus.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_cdmus.h" />
+		<Unit filename="..\src\i_joystick.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_joystick.h" />
+		<Unit filename="..\src\i_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_pcsound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_scale.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_scale.h" />
+		<Unit filename="..\src\i_sdlmusic.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_sdlsound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_sound.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_sound.h" />
+		<Unit filename="..\src\i_swap.h" />
+		<Unit filename="..\src\i_system.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_system.h" />
+		<Unit filename="..\src\i_timer.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_timer.h" />
+		<Unit filename="..\src\i_video.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\i_video.h" />
+		<Unit filename="..\src\icon.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_cheat.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_cheat.h" />
+		<Unit filename="..\src\m_controls.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\m_controls.h" />
+		<Unit filename="..\src\md5.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\md5.h" />
+		<Unit filename="..\src\memio.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\memio.h" />
+		<Unit filename="..\src\mus2mid.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\mus2mid.h" />
+		<Unit filename="..\src\v_patch.h" />
+		<Unit filename="..\src\w_checksum.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_checksum.h" />
+		<Unit filename="..\src\w_file.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_file.h" />
+		<Unit filename="..\src\w_file_posix.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_file_stdc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_file_win32.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_merge.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_merge.h" />
+		<Unit filename="..\src\w_wad.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\w_wad.h" />
+		<Unit filename="..\src\z_zone.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\z_zone.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/codeblocks/main.workspace b/codeblocks/main.workspace
index ae56d450..29a36953 100644
--- a/codeblocks/main.workspace
+++ b/codeblocks/main.workspace
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
-	<Workspace title="chocolate-doom">
-		<Project filename="game.cbp" active="1">
+	<Workspace title="Chocolate">
+		<Project filename="doom.cbp" active="1">
 			<Depends filename="textscreen.cbp" />
 			<Depends filename="libpcsound.cbp" />
 		</Project>
+		<Project filename="heretic.cbp" />
+		<Project filename="hexen.cbp" />
 		<Project filename="server.cbp" />
 		<Project filename="setup.cbp">
 			<Depends filename="textscreen.cbp" />
diff --git a/codeblocks/server.cbp b/codeblocks/server.cbp
index c15d3d96..e36e347d 100644
--- a/codeblocks/server.cbp
+++ b/codeblocks/server.cbp
@@ -2,14 +2,14 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="chocolate-server" />
+		<Option title="Server" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\$(PROJECT_NAME)-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="..\bin\chocolate-server-dbg.exe" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\dbg" />
+				<Option object_output="..\obj\chocolate-server\dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -18,9 +18,9 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\$(PROJECT_NAME).exe" prefix_auto="0" extension_auto="0" />
+				<Option output="..\bin\chocolate-server.exe" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\rel" />
+				<Option object_output="..\obj\chocolate-server\rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
diff --git a/codeblocks/setup.cbp b/codeblocks/setup.cbp
index 4cfe39e4..dca964f9 100644
--- a/codeblocks/setup.cbp
+++ b/codeblocks/setup.cbp
@@ -2,14 +2,14 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="chocolate-setup" />
+		<Option title="Setup" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\$(PROJECT_NAME)-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="..\bin\chocolate-setup-dbg.exe" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\dbg\" />
+				<Option object_output="..\obj\chocolate-setup\dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -23,9 +23,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\$(PROJECT_NAME).exe" prefix_auto="0" extension_auto="0" />
+				<Option output="..\bin\chocolate-setup.exe" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\rel\" />
+				<Option object_output="..\obj\chocolate-setup\rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />