- Update codeblocks projects

Subversion-branch: /branches/v2-branch
Subversion-revision: 2609

5 files changed, 914 insertions, 885 deletions

diff --git a/codeblocks/doom.cbp b/codeblocks/doom.cbp
index bba39b74..41cb7d2d 100644
--- a/codeblocks/doom.cbp
+++ b/codeblocks/doom.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\chocolate-doom-dbg.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-doom\dbg" />
+				<Option output="../bin/chocolate-doom-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-doom/dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -22,9 +22,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\chocolate-doom.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-doom\rel" />
+				<Option output="../bin/chocolate-doom.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-doom/rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -44,463 +44,468 @@
 			<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" />
-			<Add directory="..\opl" />
+			<Add directory="../src" />
+			<Add directory="../src/doom" />
+			<Add directory="../textscreen" />
+			<Add directory="../pcsound" />
+			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
 			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
-			<Add directory="..\lib" />
+			<Add directory="../lib" />
 		</Linker>
-		<Unit filename="config.h" />
-		<Unit filename="game-res.rc">
-			<Option compilerVar="WINDRES" />
+		<Unit filename="../src/d_event.c">
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.c">
+		<Unit filename="../src/d_event.h" />
+		<Unit filename="../src/d_iwad.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.h" />
-		<Unit filename="..\src\d_iwad.c">
+		<Unit filename="../src/d_iwad.h" />
+		<Unit filename="../src/d_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.h" />
-		<Unit filename="..\src\d_loop.c">
+		<Unit filename="../src/d_loop.h" />
+		<Unit filename="../src/d_mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_loop.h" />
-		<Unit filename="..\src\d_mode.c">
+		<Unit filename="../src/d_mode.h" />
+		<Unit filename="../src/d_ticcmd.h" />
+		<Unit filename="../src/deh_defs.h" />
+		<Unit filename="../src/deh_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_mode.h" />
-		<Unit filename="..\src\d_ticcmd.h" />
-		<Unit filename="..\src\deh_defs.h" />
-		<Unit filename="..\src\deh_io.c">
+		<Unit filename="../src/deh_io.h" />
+		<Unit filename="../src/deh_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.h" />
-		<Unit filename="..\src\deh_main.c">
+		<Unit filename="../src/deh_main.h" />
+		<Unit filename="../src/deh_mapping.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_main.h" />
-		<Unit filename="..\src\deh_mapping.c">
+		<Unit filename="../src/deh_mapping.h" />
+		<Unit filename="../src/deh_str.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_mapping.h" />
-		<Unit filename="..\src\deh_str.c">
+		<Unit filename="../src/deh_str.h" />
+		<Unit filename="../src/deh_text.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_str.h" />
-		<Unit filename="..\src\deh_text.c">
+		<Unit filename="../src/doom/am_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\am_map.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\doom\am_map.h" />
-		<Unit filename="..\src\doom\d_englsh.h" />
-		<Unit filename="..\src\doom\d_items.c">
+		<Unit filename="../src/doom/d_items.h" />
+		<Unit filename="../src/doom/d_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\d_items.h" />
-		<Unit filename="..\src\doom\d_main.c">
+		<Unit filename="../src/doom/d_main.h" />
+		<Unit filename="../src/doom/d_net.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\d_main.h" />
-		<Unit filename="..\src\doom\d_net.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\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">
+		<Unit filename="../src/doom/deh_cheat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_cheat.c">
+		<Unit filename="../src/doom/deh_doom.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_doom.c">
+		<Unit filename="../src/doom/deh_frame.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_frame.c">
+		<Unit filename="../src/doom/deh_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_misc.c">
+		<Unit filename="../src/doom/deh_misc.h" />
+		<Unit filename="../src/doom/deh_ptr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_misc.h" />
-		<Unit filename="..\src\doom\deh_ptr.c">
+		<Unit filename="../src/doom/deh_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_sound.c">
+		<Unit filename="../src/doom/deh_thing.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_thing.c">
+		<Unit filename="../src/doom/deh_weapon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\deh_weapon.c">
+		<Unit filename="../src/doom/doomdata.h" />
+		<Unit filename="../src/doom/doomdef.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\doomdata.h" />
-		<Unit filename="..\src\doom\doomdef.c">
+		<Unit filename="../src/doom/doomdef.h" />
+		<Unit filename="../src/doom/doomstat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\doomdef.h" />
-		<Unit filename="..\src\doom\doomstat.c">
+		<Unit filename="../src/doom/doomstat.h" />
+		<Unit filename="../src/doom/dstrings.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\doomstat.h" />
-		<Unit filename="..\src\doom\dstrings.c">
+		<Unit filename="../src/doom/dstrings.h" />
+		<Unit filename="../src/doom/f_finale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\dstrings.h" />
-		<Unit filename="..\src\doom\f_finale.c">
+		<Unit filename="../src/doom/f_finale.h" />
+		<Unit filename="../src/doom/f_wipe.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\f_finale.h" />
-		<Unit filename="..\src\doom\f_wipe.c">
+		<Unit filename="../src/doom/f_wipe.h" />
+		<Unit filename="../src/doom/g_game.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\f_wipe.h" />
-		<Unit filename="..\src\doom\g_game.c">
+		<Unit filename="../src/doom/g_game.h" />
+		<Unit filename="../src/doom/hu_lib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\g_game.h" />
-		<Unit filename="..\src\doom\hu_lib.c">
+		<Unit filename="../src/doom/hu_lib.h" />
+		<Unit filename="../src/doom/hu_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\hu_lib.h" />
-		<Unit filename="..\src\doom\hu_stuff.c">
+		<Unit filename="../src/doom/hu_stuff.h" />
+		<Unit filename="../src/doom/info.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\hu_stuff.h" />
-		<Unit filename="..\src\doom\info.c">
+		<Unit filename="../src/doom/info.h" />
+		<Unit filename="../src/doom/m_menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\info.h" />
-		<Unit filename="..\src\doom\m_menu.c">
+		<Unit filename="../src/doom/m_menu.h" />
+		<Unit filename="../src/doom/m_random.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\m_menu.h" />
-		<Unit filename="..\src\doom\m_random.c">
+		<Unit filename="../src/doom/m_random.h" />
+		<Unit filename="../src/doom/p_ceilng.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\m_random.h" />
-		<Unit filename="..\src\doom\p_ceilng.c">
+		<Unit filename="../src/doom/p_doors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_doors.c">
+		<Unit filename="../src/doom/p_enemy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_enemy.c">
+		<Unit filename="../src/doom/p_floor.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_floor.c">
+		<Unit filename="../src/doom/p_inter.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_inter.c">
+		<Unit filename="../src/doom/p_inter.h" />
+		<Unit filename="../src/doom/p_lights.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_inter.h" />
-		<Unit filename="..\src\doom\p_lights.c">
+		<Unit filename="../src/doom/p_local.h" />
+		<Unit filename="../src/doom/p_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_local.h" />
-		<Unit filename="..\src\doom\p_map.c">
+		<Unit filename="../src/doom/p_maputl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_maputl.c">
+		<Unit filename="../src/doom/p_mobj.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_mobj.c">
+		<Unit filename="../src/doom/p_mobj.h" />
+		<Unit filename="../src/doom/p_plats.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_mobj.h" />
-		<Unit filename="..\src\doom\p_plats.c">
+		<Unit filename="../src/doom/p_pspr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_pspr.c">
+		<Unit filename="../src/doom/p_pspr.h" />
+		<Unit filename="../src/doom/p_saveg.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_pspr.h" />
-		<Unit filename="..\src\doom\p_saveg.c">
+		<Unit filename="../src/doom/p_saveg.h" />
+		<Unit filename="../src/doom/p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_saveg.h" />
-		<Unit filename="..\src\doom\p_setup.c">
+		<Unit filename="../src/doom/p_setup.h" />
+		<Unit filename="../src/doom/p_sight.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_setup.h" />
-		<Unit filename="..\src\doom\p_sight.c">
+		<Unit filename="../src/doom/p_spec.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_spec.c">
+		<Unit filename="../src/doom/p_spec.h" />
+		<Unit filename="../src/doom/p_switch.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_spec.h" />
-		<Unit filename="..\src\doom\p_switch.c">
+		<Unit filename="../src/doom/p_telept.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_telept.c">
+		<Unit filename="../src/doom/p_tick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_tick.c">
+		<Unit filename="../src/doom/p_tick.h" />
+		<Unit filename="../src/doom/p_user.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\p_tick.h" />
-		<Unit filename="..\src\doom\p_user.c">
+		<Unit filename="../src/doom/r_bsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\r_bsp.c">
+		<Unit filename="../src/doom/r_bsp.h" />
+		<Unit filename="../src/doom/r_data.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\r_bsp.h" />
-		<Unit filename="..\src\doom\r_data.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\doom\r_data.h" />
-		<Unit filename="..\src\doom\r_defs.h" />
-		<Unit filename="..\src\doom\r_draw.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\doom\r_draw.h" />
-		<Unit filename="..\src\doom\r_local.h" />
-		<Unit filename="..\src\doom\r_main.c">
+		<Unit filename="../src/doom/r_main.h" />
+		<Unit filename="../src/doom/r_plane.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\r_main.h" />
-		<Unit filename="..\src\doom\r_plane.c">
+		<Unit filename="../src/doom/r_plane.h" />
+		<Unit filename="../src/doom/r_segs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\r_plane.h" />
-		<Unit filename="..\src\doom\r_segs.c">
+		<Unit filename="../src/doom/r_segs.h" />
+		<Unit filename="../src/doom/r_sky.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\r_segs.h" />
-		<Unit filename="..\src\doom\r_sky.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_sky.h" />
-		<Unit filename="..\src\doom\r_state.h" />
-		<Unit filename="..\src\doom\r_things.c">
+		<Unit filename="../src/doom/r_things.h" />
+		<Unit filename="../src/doom/s_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\r_things.h" />
-		<Unit filename="..\src\doom\s_sound.c">
+		<Unit filename="../src/doom/s_sound.h" />
+		<Unit filename="../src/doom/sounds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\s_sound.h" />
-		<Unit filename="..\src\doom\sounds.c">
+		<Unit filename="../src/doom/sounds.h" />
+		<Unit filename="../src/doom/st_lib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\sounds.h" />
-		<Unit filename="..\src\doom\st_lib.c">
+		<Unit filename="../src/doom/st_lib.h" />
+		<Unit filename="../src/doom/st_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\st_lib.h" />
-		<Unit filename="..\src\doom\st_stuff.c">
+		<Unit filename="../src/doom/st_stuff.h" />
+		<Unit filename="../src/doom/statdump.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\st_stuff.h" />
-		<Unit filename="..\src\doom\statdump.c">
+		<Unit filename="../src/doom/statdump.h" />
+		<Unit filename="../src/doom/wi_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doom\statdump.h" />
-		<Unit filename="..\src\doom\wi_stuff.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/gusconf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<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">
+		<Unit filename="../src/gusconf.h" />
+		<Unit filename="../src/i_cdmus.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_cdmus.h" />
-		<Unit filename="..\src\i_endoom.c">
+		<Unit filename="../src/i_cdmus.h" />
+		<Unit filename="../src/i_endoom.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_endoom.h" />
-		<Unit filename="..\src\i_joystick.c">
+		<Unit filename="../src/i_endoom.h" />
+		<Unit filename="../src/i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_joystick.h" />
-		<Unit filename="..\src\i_main.c">
+		<Unit filename="../src/i_joystick.h" />
+		<Unit filename="../src/i_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_oplmusic.c">
+		<Unit filename="../src/i_oplmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_pcsound.c">
+		<Unit filename="../src/i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.c">
+		<Unit filename="../src/i_scale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.h" />
-		<Unit filename="..\src\i_sdlmusic.c">
+		<Unit filename="../src/i_scale.h" />
+		<Unit filename="../src/i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sdlsound.c">
+		<Unit filename="../src/i_sdlsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sound.c">
+		<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">
+		<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">
+		<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">
+		<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\i_videohr.c">
+		<Unit filename="../src/i_video.h" />
+		<Unit filename="../src/i_videohr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_videohr.h" />
-		<Unit filename="..\src\icon.c">
+		<Unit filename="../src/i_videohr.h" />
+		<Unit filename="../src/icon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.c">
+		<Unit filename="../src/m_argv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.h" />
-		<Unit filename="..\src\m_bbox.c">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/m_misc.h" />
+		<Unit filename="../src/md5.h" />
+		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\md5.h" />
-		<Unit filename="..\src\memio.c">
+		<Unit filename="../src/memio.h" />
+		<Unit filename="../src/midifile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\memio.h" />
-		<Unit filename="..\src\midifile.c">
+		<Unit filename="../src/midifile.h" />
+		<Unit filename="../src/mus2mid.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\midifile.h" />
-		<Unit filename="..\src\mus2mid.c">
+		<Unit filename="../src/mus2mid.h" />
+		<Unit filename="../src/net_client.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\mus2mid.h" />
-		<Unit filename="..\src\net_client.c">
+		<Unit filename="../src/net_client.h" />
+		<Unit filename="../src/net_common.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_client.h" />
-		<Unit filename="..\src\net_common.c">
+		<Unit filename="../src/net_common.h" />
+		<Unit filename="../src/net_dedicated.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_common.h" />
-		<Unit filename="..\src\net_dedicated.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\net_dedicated.h" />
-		<Unit filename="..\src\net_defs.h" />
-		<Unit filename="..\src\net_gui.c">
+		<Unit filename="../src/net_gui.h" />
+		<Unit filename="../src/net_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_gui.h" />
-		<Unit filename="..\src\net_io.c">
+		<Unit filename="../src/net_io.h" />
+		<Unit filename="../src/net_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_io.h" />
-		<Unit filename="..\src\net_loop.c">
+		<Unit filename="../src/net_loop.h" />
+		<Unit filename="../src/net_packet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_loop.h" />
-		<Unit filename="..\src\net_packet.c">
+		<Unit filename="../src/net_packet.h" />
+		<Unit filename="../src/net_query.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_packet.h" />
-		<Unit filename="..\src\net_query.c">
+		<Unit filename="../src/net_query.h" />
+		<Unit filename="../src/net_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_query.h" />
-		<Unit filename="..\src\net_sdl.c">
+		<Unit filename="../src/net_sdl.h" />
+		<Unit filename="../src/net_server.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_sdl.h" />
-		<Unit filename="..\src\net_server.c">
+		<Unit filename="../src/net_server.h" />
+		<Unit filename="../src/net_structrw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_server.h" />
-		<Unit filename="..\src\net_structrw.c">
+		<Unit filename="../src/net_structrw.h" />
+		<Unit filename="../src/sha1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\tables.c">
+		<Unit filename="../src/sha1.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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/w_file.h" />
+		<Unit filename="../src/w_file_posix.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_stdc.c">
+		<Unit filename="../src/w_file_stdc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_win32.c">
+		<Unit filename="../src/w_file_win32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.c">
+		<Unit filename="../src/w_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.h" />
-		<Unit filename="..\src\w_merge.c">
+		<Unit filename="../src/w_main.h" />
+		<Unit filename="../src/w_merge.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_merge.h" />
-		<Unit filename="..\src\w_wad.c">
+		<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">
+		<Unit filename="../src/w_wad.h" />
+		<Unit filename="../src/z_zone.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\z_zone.h" />
+		<Unit filename="../src/z_zone.h" />
+		<Unit filename="config.h" />
+		<Unit filename="game-res.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/codeblocks/heretic.cbp b/codeblocks/heretic.cbp
index 0322f7e9..e1f7ec7b 100644
--- a/codeblocks/heretic.cbp
+++ b/codeblocks/heretic.cbp
@@ -7,9 +7,9 @@
 		<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 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 projectLinkerOptionsRelation="2" />
@@ -22,9 +22,9 @@
 				</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 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" />
@@ -44,397 +44,402 @@
 			<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="..\src\heretic" />
-			<Add directory="..\textscreen" />
-			<Add directory="..\pcsound" />
-			<Add directory="..\opl" />
+			<Add directory="../src" />
+			<Add directory="../src/doom" />
+			<Add directory="../src/heretic" />
+			<Add directory="../textscreen" />
+			<Add directory="../pcsound" />
+			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
 			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
-			<Add directory="..\lib" />
+			<Add directory="../lib" />
 		</Linker>
-		<Unit filename="config.h" />
-		<Unit filename="game-res.rc">
-			<Option compilerVar="WINDRES" />
+		<Unit filename="../src/d_event.c">
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.c">
+		<Unit filename="../src/d_event.h" />
+		<Unit filename="../src/d_iwad.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.h" />
-		<Unit filename="..\src\d_iwad.c">
+		<Unit filename="../src/d_iwad.h" />
+		<Unit filename="../src/d_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.h" />
-		<Unit filename="..\src\d_loop.c">
+		<Unit filename="../src/d_loop.h" />
+		<Unit filename="../src/d_mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_loop.h" />
-		<Unit filename="..\src\d_mode.c">
+		<Unit filename="../src/d_mode.h" />
+		<Unit filename="../src/d_ticcmd.h" />
+		<Unit filename="../src/deh_defs.h" />
+		<Unit filename="../src/deh_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_mode.h" />
-		<Unit filename="..\src\d_ticcmd.h" />
-		<Unit filename="..\src\deh_defs.h" />
-		<Unit filename="..\src\deh_io.c">
+		<Unit filename="../src/deh_io.h" />
+		<Unit filename="../src/deh_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.h" />
-		<Unit filename="..\src\deh_main.c">
+		<Unit filename="../src/deh_main.h" />
+		<Unit filename="../src/deh_mapping.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_main.h" />
-		<Unit filename="..\src\deh_mapping.c">
+		<Unit filename="../src/deh_mapping.h" />
+		<Unit filename="../src/deh_str.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_mapping.h" />
-		<Unit filename="..\src\deh_str.c">
+		<Unit filename="../src/deh_str.h" />
+		<Unit filename="../src/deh_text.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_str.h" />
-		<Unit filename="..\src\deh_text.c">
+		<Unit filename="../src/doomfeatures.h" />
+		<Unit filename="../src/doomkeys.h" />
+		<Unit filename="../src/doomtype.h" />
+		<Unit filename="../src/gusconf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<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">
+		<Unit filename="../src/gusconf.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">
+		<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">
+		<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">
+		<Unit filename="../src/heretic/d_net.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\deh_ammo.c">
+		<Unit filename="../src/heretic/deh_ammo.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\deh_frame.c">
+		<Unit filename="../src/heretic/deh_frame.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\deh_htext.c">
+		<Unit filename="../src/heretic/deh_htext.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\deh_htic.c">
+		<Unit filename="../src/heretic/deh_htic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\deh_htic.h" />
-		<Unit filename="..\src\heretic\deh_sound.c">
+		<Unit filename="../src/heretic/deh_htic.h" />
+		<Unit filename="../src/heretic/deh_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\deh_thing.c">
+		<Unit filename="../src/heretic/deh_thing.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\deh_weapon.c">
+		<Unit filename="../src/heretic/deh_weapon.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">
+		<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">
+		<Unit filename="../src/heretic/g_game.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\in_lude.c">
+		<Unit filename="../src/heretic/in_lude.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\info.c">
+		<Unit filename="../src/heretic/info.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\info.h" />
-		<Unit filename="..\src\heretic\m_random.c">
+		<Unit filename="../src/heretic/info.h" />
+		<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">
+		<Unit filename="../src/heretic/m_random.h" />
+		<Unit filename="../src/heretic/mn_menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_action.h" />
-		<Unit filename="..\src\heretic\p_ceilng.c">
+		<Unit filename="../src/heretic/p_action.h" />
+		<Unit filename="../src/heretic/p_ceilng.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_doors.c">
+		<Unit filename="../src/heretic/p_doors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_enemy.c">
+		<Unit filename="../src/heretic/p_enemy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_floor.c">
+		<Unit filename="../src/heretic/p_floor.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_inter.c">
+		<Unit filename="../src/heretic/p_inter.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_lights.c">
+		<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">
+		<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">
+		<Unit filename="../src/heretic/p_maputl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_mobj.c">
+		<Unit filename="../src/heretic/p_mobj.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_plats.c">
+		<Unit filename="../src/heretic/p_plats.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_pspr.c">
+		<Unit filename="../src/heretic/p_pspr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_setup.c">
+		<Unit filename="../src/heretic/p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_sight.c">
+		<Unit filename="../src/heretic/p_sight.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_spec.c">
+		<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">
+		<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">
+		<Unit filename="../src/heretic/p_telept.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_tick.c">
+		<Unit filename="../src/heretic/p_tick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\p_user.c">
+		<Unit filename="../src/heretic/p_user.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\r_bsp.c">
+		<Unit filename="../src/heretic/r_bsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\r_data.c">
+		<Unit filename="../src/heretic/r_data.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\r_draw.c">
+		<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">
+		<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">
+		<Unit filename="../src/heretic/r_plane.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\r_segs.c">
+		<Unit filename="../src/heretic/r_segs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\r_things.c">
+		<Unit filename="../src/heretic/r_things.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\s_sound.c">
+		<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">
+		<Unit filename="../src/heretic/s_sound.h" />
+		<Unit filename="../src/heretic/sb_bar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\sounds.c">
+		<Unit filename="../src/heretic/sounds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\heretic\sounds.h" />
-		<Unit filename="..\src\i_cdmus.c">
+		<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_endoom.c">
+		<Unit filename="../src/i_cdmus.h" />
+		<Unit filename="../src/i_endoom.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_endoom.h" />
-		<Unit filename="..\src\i_joystick.c">
+		<Unit filename="../src/i_endoom.h" />
+		<Unit filename="../src/i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_joystick.h" />
-		<Unit filename="..\src\i_main.c">
+		<Unit filename="../src/i_joystick.h" />
+		<Unit filename="../src/i_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_oplmusic.c">
+		<Unit filename="../src/i_oplmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_pcsound.c">
+		<Unit filename="../src/i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.c">
+		<Unit filename="../src/i_scale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.h" />
-		<Unit filename="..\src\i_sdlmusic.c">
+		<Unit filename="../src/i_scale.h" />
+		<Unit filename="../src/i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sdlsound.c">
+		<Unit filename="../src/i_sdlsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sound.c">
+		<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">
+		<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">
+		<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">
+		<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\i_videohr.c">
+		<Unit filename="../src/i_video.h" />
+		<Unit filename="../src/i_videohr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_videohr.h" />
-		<Unit filename="..\src\icon.c">
+		<Unit filename="../src/i_videohr.h" />
+		<Unit filename="../src/icon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.c">
+		<Unit filename="../src/m_argv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.h" />
-		<Unit filename="..\src\m_bbox.c">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/m_misc.h" />
+		<Unit filename="../src/md5.h" />
+		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\md5.h" />
-		<Unit filename="..\src\memio.c">
+		<Unit filename="../src/memio.h" />
+		<Unit filename="../src/midifile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\memio.h" />
-		<Unit filename="..\src\midifile.c">
+		<Unit filename="../src/midifile.h" />
+		<Unit filename="../src/mus2mid.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\midifile.h" />
-		<Unit filename="..\src\mus2mid.c">
+		<Unit filename="../src/mus2mid.h" />
+		<Unit filename="../src/net_client.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\mus2mid.h" />
-		<Unit filename="..\src\net_client.c">
+		<Unit filename="../src/net_client.h" />
+		<Unit filename="../src/net_common.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_client.h" />
-		<Unit filename="..\src\net_common.c">
+		<Unit filename="../src/net_common.h" />
+		<Unit filename="../src/net_dedicated.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_common.h" />
-		<Unit filename="..\src\net_dedicated.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\net_dedicated.h" />
-		<Unit filename="..\src\net_defs.h" />
-		<Unit filename="..\src\net_gui.c">
+		<Unit filename="../src/net_gui.h" />
+		<Unit filename="../src/net_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_gui.h" />
-		<Unit filename="..\src\net_io.c">
+		<Unit filename="../src/net_io.h" />
+		<Unit filename="../src/net_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_io.h" />
-		<Unit filename="..\src\net_loop.c">
+		<Unit filename="../src/net_loop.h" />
+		<Unit filename="../src/net_packet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_loop.h" />
-		<Unit filename="..\src\net_packet.c">
+		<Unit filename="../src/net_packet.h" />
+		<Unit filename="../src/net_query.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_packet.h" />
-		<Unit filename="..\src\net_query.c">
+		<Unit filename="../src/net_query.h" />
+		<Unit filename="../src/net_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_query.h" />
-		<Unit filename="..\src\net_sdl.c">
+		<Unit filename="../src/net_sdl.h" />
+		<Unit filename="../src/net_server.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_sdl.h" />
-		<Unit filename="..\src\net_server.c">
+		<Unit filename="../src/net_server.h" />
+		<Unit filename="../src/net_structrw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_server.h" />
-		<Unit filename="..\src\net_structrw.c">
+		<Unit filename="../src/net_structrw.h" />
+		<Unit filename="../src/sha1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\tables.c">
+		<Unit filename="../src/sha1.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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/w_file.h" />
+		<Unit filename="../src/w_file_posix.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_stdc.c">
+		<Unit filename="../src/w_file_stdc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_win32.c">
+		<Unit filename="../src/w_file_win32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.c">
+		<Unit filename="../src/w_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.h" />
-		<Unit filename="..\src\w_merge.c">
+		<Unit filename="../src/w_main.h" />
+		<Unit filename="../src/w_merge.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_merge.h" />
-		<Unit filename="..\src\w_wad.c">
+		<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">
+		<Unit filename="../src/w_wad.h" />
+		<Unit filename="../src/z_zone.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\z_zone.h" />
+		<Unit filename="../src/z_zone.h" />
+		<Unit filename="config.h" />
+		<Unit filename="game-res.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/codeblocks/hexen.cbp b/codeblocks/hexen.cbp
index 00ea3770..9fc58d8e 100644
--- a/codeblocks/hexen.cbp
+++ b/codeblocks/hexen.cbp
@@ -7,9 +7,9 @@
 		<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 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 projectLinkerOptionsRelation="2" />
@@ -22,9 +22,9 @@
 				</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 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" />
@@ -44,400 +44,405 @@
 			<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="..\src\hexen" />
-			<Add directory="..\textscreen" />
-			<Add directory="..\pcsound" />
-			<Add directory="..\opl" />
+			<Add directory="../src" />
+			<Add directory="../src/doom" />
+			<Add directory="../src/hexen" />
+			<Add directory="../textscreen" />
+			<Add directory="../pcsound" />
+			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
 			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
-			<Add directory="..\lib" />
+			<Add directory="../lib" />
 		</Linker>
-		<Unit filename="config.h" />
-		<Unit filename="game-res.rc">
-			<Option compilerVar="WINDRES" />
+		<Unit filename="../src/d_event.c">
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.c">
+		<Unit filename="../src/d_event.h" />
+		<Unit filename="../src/d_iwad.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.h" />
-		<Unit filename="..\src\d_iwad.c">
+		<Unit filename="../src/d_iwad.h" />
+		<Unit filename="../src/d_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.h" />
-		<Unit filename="..\src\d_loop.c">
+		<Unit filename="../src/d_loop.h" />
+		<Unit filename="../src/d_mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_loop.h" />
-		<Unit filename="..\src\d_mode.c">
+		<Unit filename="../src/d_mode.h" />
+		<Unit filename="../src/d_ticcmd.h" />
+		<Unit filename="../src/deh_defs.h" />
+		<Unit filename="../src/deh_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_mode.h" />
-		<Unit filename="..\src\d_ticcmd.h" />
-		<Unit filename="..\src\deh_defs.h" />
-		<Unit filename="..\src\deh_io.c">
+		<Unit filename="../src/deh_io.h" />
+		<Unit filename="../src/deh_main.h" />
+		<Unit filename="../src/deh_mapping.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.h" />
-		<Unit filename="..\src\deh_main.h" />
-		<Unit filename="..\src\deh_mapping.c">
+		<Unit filename="../src/deh_mapping.h" />
+		<Unit filename="../src/deh_str.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_mapping.h" />
-		<Unit filename="..\src\deh_str.c">
+		<Unit filename="../src/deh_str.h" />
+		<Unit filename="../src/doomfeatures.h" />
+		<Unit filename="../src/doomkeys.h" />
+		<Unit filename="../src/doomtype.h" />
+		<Unit filename="../src/gusconf.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">
+		<Unit filename="../src/gusconf.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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/hexen/f_finale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\g_game.c">
+		<Unit filename="../src/hexen/g_game.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\h2_main.c">
+		<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\in_lude.c">
+		<Unit filename="../src/hexen/h2def.h" />
+		<Unit filename="../src/hexen/i_header.h" />
+		<Unit filename="../src/hexen/in_lude.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\info.c">
+		<Unit filename="../src/hexen/info.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\info.h" />
-		<Unit filename="..\src\hexen\m_misc.c">
+		<Unit filename="../src/hexen/info.h" />
+		<Unit filename="../src/hexen/m_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\m_random.c">
+		<Unit filename="../src/hexen/m_random.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\m_random.h" />
-		<Unit filename="..\src\hexen\mn_menu.c">
+		<Unit filename="../src/hexen/m_random.h" />
+		<Unit filename="../src/hexen/mn_menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_acs.c">
+		<Unit filename="../src/hexen/p_acs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_anim.c">
+		<Unit filename="../src/hexen/p_anim.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_ceilng.c">
+		<Unit filename="../src/hexen/p_ceilng.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_doors.c">
+		<Unit filename="../src/hexen/p_doors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_enemy.c">
+		<Unit filename="../src/hexen/p_enemy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_floor.c">
+		<Unit filename="../src/hexen/p_floor.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_inter.c">
+		<Unit filename="../src/hexen/p_inter.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_lights.c">
+		<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">
+		<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">
+		<Unit filename="../src/hexen/p_maputl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_mobj.c">
+		<Unit filename="../src/hexen/p_mobj.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_plats.c">
+		<Unit filename="../src/hexen/p_plats.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_pspr.c">
+		<Unit filename="../src/hexen/p_pspr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_setup.c">
+		<Unit filename="../src/hexen/p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_sight.c">
+		<Unit filename="../src/hexen/p_sight.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_spec.c">
+		<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">
+		<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">
+		<Unit filename="../src/hexen/p_telept.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_things.c">
+		<Unit filename="../src/hexen/p_things.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_tick.c">
+		<Unit filename="../src/hexen/p_tick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\p_user.c">
+		<Unit filename="../src/hexen/p_user.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\po_man.c">
+		<Unit filename="../src/hexen/po_man.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\r_bsp.c">
+		<Unit filename="../src/hexen/r_bsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\r_data.c">
+		<Unit filename="../src/hexen/r_data.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\r_draw.c">
+		<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">
+		<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">
+		<Unit filename="../src/hexen/r_plane.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\r_segs.c">
+		<Unit filename="../src/hexen/r_segs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\r_things.c">
+		<Unit filename="../src/hexen/r_things.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\s_sound.c">
+		<Unit filename="../src/hexen/s_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\s_sound.h" />
-		<Unit filename="..\src\hexen\sb_bar.c">
+		<Unit filename="../src/hexen/s_sound.h" />
+		<Unit filename="../src/hexen/sb_bar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\sc_man.c">
+		<Unit filename="../src/hexen/sc_man.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\sn_sonix.c">
+		<Unit filename="../src/hexen/sn_sonix.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\sounds.c">
+		<Unit filename="../src/hexen/sounds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hexen\sounds.h" />
-		<Unit filename="..\src\hexen\st_start.c">
+		<Unit filename="../src/hexen/sounds.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">
+		<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\xddefs.h" />
-		<Unit filename="..\src\i_cdmus.c">
+		<Unit filename="../src/hexen/textdefs.h" />
+		<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_endoom.c">
+		<Unit filename="../src/i_cdmus.h" />
+		<Unit filename="../src/i_endoom.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_endoom.h" />
-		<Unit filename="..\src\i_joystick.c">
+		<Unit filename="../src/i_endoom.h" />
+		<Unit filename="../src/i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_joystick.h" />
-		<Unit filename="..\src\i_main.c">
+		<Unit filename="../src/i_joystick.h" />
+		<Unit filename="../src/i_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_oplmusic.c">
+		<Unit filename="../src/i_oplmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_pcsound.c">
+		<Unit filename="../src/i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.c">
+		<Unit filename="../src/i_scale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.h" />
-		<Unit filename="..\src\i_sdlmusic.c">
+		<Unit filename="../src/i_scale.h" />
+		<Unit filename="../src/i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sdlsound.c">
+		<Unit filename="../src/i_sdlsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sound.c">
+		<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">
+		<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">
+		<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">
+		<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\i_videohr.c">
+		<Unit filename="../src/i_video.h" />
+		<Unit filename="../src/i_videohr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_videohr.h" />
-		<Unit filename="..\src\icon.c">
+		<Unit filename="../src/i_videohr.h" />
+		<Unit filename="../src/icon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.c">
+		<Unit filename="../src/m_argv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.h" />
-		<Unit filename="..\src\m_bbox.c">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/m_misc.h" />
+		<Unit filename="../src/md5.h" />
+		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\md5.h" />
-		<Unit filename="..\src\memio.c">
+		<Unit filename="../src/memio.h" />
+		<Unit filename="../src/midifile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\memio.h" />
-		<Unit filename="..\src\midifile.c">
+		<Unit filename="../src/midifile.h" />
+		<Unit filename="../src/mus2mid.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\midifile.h" />
-		<Unit filename="..\src\mus2mid.c">
+		<Unit filename="../src/mus2mid.h" />
+		<Unit filename="../src/net_client.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\mus2mid.h" />
-		<Unit filename="..\src\net_client.c">
+		<Unit filename="../src/net_client.h" />
+		<Unit filename="../src/net_common.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_client.h" />
-		<Unit filename="..\src\net_common.c">
+		<Unit filename="../src/net_common.h" />
+		<Unit filename="../src/net_dedicated.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_common.h" />
-		<Unit filename="..\src\net_dedicated.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\net_dedicated.h" />
-		<Unit filename="..\src\net_defs.h" />
-		<Unit filename="..\src\net_gui.c">
+		<Unit filename="../src/net_gui.h" />
+		<Unit filename="../src/net_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_gui.h" />
-		<Unit filename="..\src\net_io.c">
+		<Unit filename="../src/net_io.h" />
+		<Unit filename="../src/net_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_io.h" />
-		<Unit filename="..\src\net_loop.c">
+		<Unit filename="../src/net_loop.h" />
+		<Unit filename="../src/net_packet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_loop.h" />
-		<Unit filename="..\src\net_packet.c">
+		<Unit filename="../src/net_packet.h" />
+		<Unit filename="../src/net_query.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_packet.h" />
-		<Unit filename="..\src\net_query.c">
+		<Unit filename="../src/net_query.h" />
+		<Unit filename="../src/net_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_query.h" />
-		<Unit filename="..\src\net_sdl.c">
+		<Unit filename="../src/net_sdl.h" />
+		<Unit filename="../src/net_server.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_sdl.h" />
-		<Unit filename="..\src\net_server.c">
+		<Unit filename="../src/net_server.h" />
+		<Unit filename="../src/net_structrw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_server.h" />
-		<Unit filename="..\src\net_structrw.c">
+		<Unit filename="../src/net_structrw.h" />
+		<Unit filename="../src/sha1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\tables.c">
+		<Unit filename="../src/sha1.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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/w_file.h" />
+		<Unit filename="../src/w_file_posix.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_stdc.c">
+		<Unit filename="../src/w_file_stdc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_win32.c">
+		<Unit filename="../src/w_file_win32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.c">
+		<Unit filename="../src/w_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.h" />
-		<Unit filename="..\src\w_merge.c">
+		<Unit filename="../src/w_main.h" />
+		<Unit filename="../src/w_merge.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_merge.h" />
-		<Unit filename="..\src\w_wad.c">
+		<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">
+		<Unit filename="../src/w_wad.h" />
+		<Unit filename="../src/z_zone.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\z_zone.h" />
+		<Unit filename="../src/z_zone.h" />
+		<Unit filename="config.h" />
+		<Unit filename="game-res.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/codeblocks/libtextscreen.cbp b/codeblocks/libtextscreen.cbp
index acc12fbd..8c7aa84b 100644
--- a/codeblocks/libtextscreen.cbp
+++ b/codeblocks/libtextscreen.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\lib\libtextscreen-dbg.a" prefix_auto="0" extension_auto="0" />
+				<Option output="../lib/libtextscreen-dbg.a" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libtextscreen\dbg" />
+				<Option object_output="../obj/libtextscreen/dbg" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -19,9 +19,9 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="..\lib\libtextscreen.a" prefix_auto="0" extension_auto="0" />
+				<Option output="../lib/libtextscreen.a" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libtextscreen\rel" />
+				<Option object_output="../obj/libtextscreen/rel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -37,87 +37,96 @@
 			<Add alias="All" targets="Debug;Release;" />
 		</VirtualTargets>
 		<Compiler>
-			<Add directory="..\src" />
+			<Add directory="../src" />
 		</Compiler>
 		<Linker>
 			<Add option="-lmingw32 -lSDLmain -lSDL -mwindows" />
 		</Linker>
-		<Unit filename="..\textscreen\textscreen.h" />
-		<Unit filename="..\textscreen\txt_button.c">
+		<Unit filename="../textscreen/textscreen.h" />
+		<Unit filename="../textscreen/txt_button.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_button.h" />
-		<Unit filename="..\textscreen\txt_checkbox.c">
+		<Unit filename="../textscreen/txt_button.h" />
+		<Unit filename="../textscreen/txt_checkbox.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_checkbox.h" />
-		<Unit filename="..\textscreen\txt_desktop.c">
+		<Unit filename="../textscreen/txt_checkbox.h" />
+		<Unit filename="../textscreen/txt_desktop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_desktop.h" />
-		<Unit filename="..\textscreen\txt_dropdown.c">
+		<Unit filename="../textscreen/txt_desktop.h" />
+		<Unit filename="../textscreen/txt_dropdown.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_dropdown.h" />
-		<Unit filename="..\textscreen\txt_font.h" />
-		<Unit filename="..\textscreen\txt_gui.c">
+		<Unit filename="../textscreen/txt_dropdown.h" />
+		<Unit filename="../textscreen/txt_fileselect.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_gui.h" />
-		<Unit filename="..\textscreen\txt_inputbox.c">
+		<Unit filename="../textscreen/txt_fileselect.h" />
+		<Unit filename="../textscreen/txt_font.h" />
+		<Unit filename="../textscreen/txt_gui.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_inputbox.h" />
-		<Unit filename="..\textscreen\txt_io.c">
+		<Unit filename="../textscreen/txt_gui.h" />
+		<Unit filename="../textscreen/txt_inputbox.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_io.h" />
-		<Unit filename="..\textscreen\txt_label.c">
+		<Unit filename="../textscreen/txt_inputbox.h" />
+		<Unit filename="../textscreen/txt_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_label.h" />
-		<Unit filename="..\textscreen\txt_main.h" />
-		<Unit filename="..\textscreen\txt_radiobutton.c">
+		<Unit filename="../textscreen/txt_io.h" />
+		<Unit filename="../textscreen/txt_label.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_radiobutton.h" />
-		<Unit filename="..\textscreen\txt_scrollpane.c">
+		<Unit filename="../textscreen/txt_label.h" />
+		<Unit filename="../textscreen/txt_largefont.h" />
+		<Unit filename="../textscreen/txt_main.h" />
+		<Unit filename="../textscreen/txt_radiobutton.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_scrollpane.h" />
-		<Unit filename="..\textscreen\txt_sdl.c">
+		<Unit filename="../textscreen/txt_radiobutton.h" />
+		<Unit filename="../textscreen/txt_scrollpane.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_sdl.h" />
-		<Unit filename="..\textscreen\txt_separator.c">
+		<Unit filename="../textscreen/txt_scrollpane.h" />
+		<Unit filename="../textscreen/txt_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_separator.h" />
-		<Unit filename="..\textscreen\txt_smallfont.h" />
-		<Unit filename="..\textscreen\txt_spinctrl.c">
+		<Unit filename="../textscreen/txt_sdl.h" />
+		<Unit filename="../textscreen/txt_separator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_spinctrl.h" />
-		<Unit filename="..\textscreen\txt_strut.c">
+		<Unit filename="../textscreen/txt_separator.h" />
+		<Unit filename="../textscreen/txt_smallfont.h" />
+		<Unit filename="../textscreen/txt_spinctrl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_strut.h" />
-		<Unit filename="..\textscreen\txt_table.c">
+		<Unit filename="../textscreen/txt_spinctrl.h" />
+		<Unit filename="../textscreen/txt_strut.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_table.h" />
-		<Unit filename="..\textscreen\txt_widget.c">
+		<Unit filename="../textscreen/txt_strut.h" />
+		<Unit filename="../textscreen/txt_table.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_widget.h" />
-		<Unit filename="..\textscreen\txt_window.c">
+		<Unit filename="../textscreen/txt_table.h" />
+		<Unit filename="../textscreen/txt_utf8.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_window.h" />
-		<Unit filename="..\textscreen\txt_window_action.c">
+		<Unit filename="../textscreen/txt_utf8.h" />
+		<Unit filename="../textscreen/txt_widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\textscreen\txt_window_action.h" />
+		<Unit filename="../textscreen/txt_widget.h" />
+		<Unit filename="../textscreen/txt_window.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../textscreen/txt_window.h" />
+		<Unit filename="../textscreen/txt_window_action.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../textscreen/txt_window_action.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/codeblocks/strife.cbp b/codeblocks/strife.cbp
index 55a03fe5..2ed82207 100644
--- a/codeblocks/strife.cbp
+++ b/codeblocks/strife.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\chocolate-strife-dbg.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-strife\dbg" />
+				<Option output="../bin/chocolate-strife-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-strife/dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -22,9 +22,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\chocolate-strife.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-strife\rel" />
+				<Option output="../bin/chocolate-strife.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-strife/rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -44,468 +44,473 @@
 			<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="..\src\heretic" />
-			<Add directory="..\textscreen" />
-			<Add directory="..\pcsound" />
-			<Add directory="..\opl" />
+			<Add directory="../src" />
+			<Add directory="../src/doom" />
+			<Add directory="../src/heretic" />
+			<Add directory="../textscreen" />
+			<Add directory="../pcsound" />
+			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
 			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
-			<Add directory="..\lib" />
+			<Add directory="../lib" />
 		</Linker>
-		<Unit filename="config.h" />
-		<Unit filename="game-res.rc">
-			<Option compilerVar="WINDRES" />
+		<Unit filename="../src/d_event.c">
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.c">
+		<Unit filename="../src/d_event.h" />
+		<Unit filename="../src/d_iwad.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_event.h" />
-		<Unit filename="..\src\d_iwad.c">
+		<Unit filename="../src/d_iwad.h" />
+		<Unit filename="../src/d_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.h" />
-		<Unit filename="..\src\d_loop.c">
+		<Unit filename="../src/d_loop.h" />
+		<Unit filename="../src/d_mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_loop.h" />
-		<Unit filename="..\src\d_mode.c">
+		<Unit filename="../src/d_mode.h" />
+		<Unit filename="../src/d_ticcmd.h" />
+		<Unit filename="../src/deh_defs.h" />
+		<Unit filename="../src/deh_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_mode.h" />
-		<Unit filename="..\src\d_ticcmd.h" />
-		<Unit filename="..\src\deh_defs.h" />
-		<Unit filename="..\src\deh_io.c">
+		<Unit filename="../src/deh_io.h" />
+		<Unit filename="../src/deh_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.h" />
-		<Unit filename="..\src\deh_main.c">
+		<Unit filename="../src/deh_main.h" />
+		<Unit filename="../src/deh_mapping.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_main.h" />
-		<Unit filename="..\src\deh_mapping.c">
+		<Unit filename="../src/deh_mapping.h" />
+		<Unit filename="../src/deh_str.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_mapping.h" />
-		<Unit filename="..\src\deh_str.c">
+		<Unit filename="../src/deh_str.h" />
+		<Unit filename="../src/deh_text.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_str.h" />
-		<Unit filename="..\src\deh_text.c">
+		<Unit filename="../src/doomfeatures.h" />
+		<Unit filename="../src/doomkeys.h" />
+		<Unit filename="../src/doomtype.h" />
+		<Unit filename="../src/gusconf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doomfeatures.h" />
-		<Unit filename="..\src\doomkeys.h" />
-		<Unit filename="..\src\doomtype.h" />
-		<Unit filename="..\src\i_cdmus.c">
+		<Unit filename="../src/gusconf.h" />
+		<Unit filename="../src/i_cdmus.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_cdmus.h" />
-		<Unit filename="..\src\i_endoom.c">
+		<Unit filename="../src/i_cdmus.h" />
+		<Unit filename="../src/i_endoom.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_endoom.h" />
-		<Unit filename="..\src\i_joystick.c">
+		<Unit filename="../src/i_endoom.h" />
+		<Unit filename="../src/i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_joystick.h" />
-		<Unit filename="..\src\i_main.c">
+		<Unit filename="../src/i_joystick.h" />
+		<Unit filename="../src/i_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_oplmusic.c">
+		<Unit filename="../src/i_oplmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_pcsound.c">
+		<Unit filename="../src/i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.c">
+		<Unit filename="../src/i_scale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_scale.h" />
-		<Unit filename="..\src\i_sdlmusic.c">
+		<Unit filename="../src/i_scale.h" />
+		<Unit filename="../src/i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sdlsound.c">
+		<Unit filename="../src/i_sdlsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_sound.c">
+		<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">
+		<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">
+		<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">
+		<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\i_videohr.c">
+		<Unit filename="../src/i_video.h" />
+		<Unit filename="../src/i_videohr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_videohr.h" />
-		<Unit filename="..\src\icon.c">
+		<Unit filename="../src/i_videohr.h" />
+		<Unit filename="../src/icon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.c">
+		<Unit filename="../src/m_argv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.h" />
-		<Unit filename="..\src\m_bbox.c">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/m_misc.h" />
+		<Unit filename="../src/md5.h" />
+		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\md5.h" />
-		<Unit filename="..\src\memio.c">
+		<Unit filename="../src/memio.h" />
+		<Unit filename="../src/midifile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\memio.h" />
-		<Unit filename="..\src\midifile.c">
+		<Unit filename="../src/midifile.h" />
+		<Unit filename="../src/mus2mid.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\midifile.h" />
-		<Unit filename="..\src\mus2mid.c">
+		<Unit filename="../src/mus2mid.h" />
+		<Unit filename="../src/net_client.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\mus2mid.h" />
-		<Unit filename="..\src\net_client.c">
+		<Unit filename="../src/net_client.h" />
+		<Unit filename="../src/net_common.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_client.h" />
-		<Unit filename="..\src\net_common.c">
+		<Unit filename="../src/net_common.h" />
+		<Unit filename="../src/net_dedicated.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_common.h" />
-		<Unit filename="..\src\net_dedicated.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\net_dedicated.h" />
-		<Unit filename="..\src\net_defs.h" />
-		<Unit filename="..\src\net_gui.c">
+		<Unit filename="../src/net_gui.h" />
+		<Unit filename="../src/net_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_gui.h" />
-		<Unit filename="..\src\net_io.c">
+		<Unit filename="../src/net_io.h" />
+		<Unit filename="../src/net_loop.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_io.h" />
-		<Unit filename="..\src\net_loop.c">
+		<Unit filename="../src/net_loop.h" />
+		<Unit filename="../src/net_packet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_loop.h" />
-		<Unit filename="..\src\net_packet.c">
+		<Unit filename="../src/net_packet.h" />
+		<Unit filename="../src/net_query.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_packet.h" />
-		<Unit filename="..\src\net_query.c">
+		<Unit filename="../src/net_query.h" />
+		<Unit filename="../src/net_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_query.h" />
-		<Unit filename="..\src\net_sdl.c">
+		<Unit filename="../src/net_sdl.h" />
+		<Unit filename="../src/net_server.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_sdl.h" />
-		<Unit filename="..\src\net_server.c">
+		<Unit filename="../src/net_server.h" />
+		<Unit filename="../src/net_structrw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_server.h" />
-		<Unit filename="..\src\net_structrw.c">
+		<Unit filename="../src/net_structrw.h" />
+		<Unit filename="../src/sha1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\strife\am_map.c">
+		<Unit filename="../src/sha1.h" />
+		<Unit filename="../src/strife/am_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\am_map.h" />
-		<Unit filename="..\src\strife\d_englsh.h" />
-		<Unit filename="..\src\strife\d_items.c">
+		<Unit filename="../src/strife/am_map.h" />
+		<Unit filename="../src/strife/d_englsh.h" />
+		<Unit filename="../src/strife/d_items.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\d_items.h" />
-		<Unit filename="..\src\strife\d_main.c">
+		<Unit filename="../src/strife/d_items.h" />
+		<Unit filename="../src/strife/d_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\d_main.h" />
-		<Unit filename="..\src\strife\d_net.c">
+		<Unit filename="../src/strife/d_main.h" />
+		<Unit filename="../src/strife/d_net.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\d_net.h" />
-		<Unit filename="..\src\strife\d_player.h" />
-		<Unit filename="..\src\strife\d_textur.h" />
-		<Unit filename="..\src\strife\d_think.h" />
-		<Unit filename="..\src\strife\deh_ammo.c">
+		<Unit filename="../src/strife/d_net.h" />
+		<Unit filename="../src/strife/d_player.h" />
+		<Unit filename="../src/strife/d_textur.h" />
+		<Unit filename="../src/strife/d_think.h" />
+		<Unit filename="../src/strife/deh_ammo.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_cheat.c">
+		<Unit filename="../src/strife/deh_cheat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_frame.c">
+		<Unit filename="../src/strife/deh_frame.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_misc.c">
+		<Unit filename="../src/strife/deh_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_misc.h" />
-		<Unit filename="..\src\strife\deh_ptr.c">
+		<Unit filename="../src/strife/deh_misc.h" />
+		<Unit filename="../src/strife/deh_ptr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_sound.c">
+		<Unit filename="../src/strife/deh_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_strife.c">
+		<Unit filename="../src/strife/deh_strife.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_thing.c">
+		<Unit filename="../src/strife/deh_thing.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\deh_weapon.c">
+		<Unit filename="../src/strife/deh_weapon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\doomdata.h" />
-		<Unit filename="..\src\strife\doomdef.c">
+		<Unit filename="../src/strife/doomdata.h" />
+		<Unit filename="../src/strife/doomdef.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\doomdef.h" />
-		<Unit filename="..\src\strife\doomstat.c">
+		<Unit filename="../src/strife/doomdef.h" />
+		<Unit filename="../src/strife/doomstat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\doomstat.h" />
-		<Unit filename="..\src\strife\dstrings.c">
+		<Unit filename="../src/strife/doomstat.h" />
+		<Unit filename="../src/strife/dstrings.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\dstrings.h" />
-		<Unit filename="..\src\strife\f_finale.c">
+		<Unit filename="../src/strife/dstrings.h" />
+		<Unit filename="../src/strife/f_finale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\f_finale.h" />
-		<Unit filename="..\src\strife\f_wipe.c">
+		<Unit filename="../src/strife/f_finale.h" />
+		<Unit filename="../src/strife/f_wipe.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\f_wipe.h" />
-		<Unit filename="..\src\strife\g_game.c">
+		<Unit filename="../src/strife/f_wipe.h" />
+		<Unit filename="../src/strife/g_game.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\g_game.h" />
-		<Unit filename="..\src\strife\hu_lib.c">
+		<Unit filename="../src/strife/g_game.h" />
+		<Unit filename="../src/strife/hu_lib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\hu_lib.h" />
-		<Unit filename="..\src\strife\hu_stuff.c">
+		<Unit filename="../src/strife/hu_lib.h" />
+		<Unit filename="../src/strife/hu_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\hu_stuff.h" />
-		<Unit filename="..\src\strife\info.c">
+		<Unit filename="../src/strife/hu_stuff.h" />
+		<Unit filename="../src/strife/info.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\info.h" />
-		<Unit filename="..\src\strife\m_menu.c">
+		<Unit filename="../src/strife/info.h" />
+		<Unit filename="../src/strife/m_menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\m_menu.h" />
-		<Unit filename="..\src\strife\m_random.c">
+		<Unit filename="../src/strife/m_menu.h" />
+		<Unit filename="../src/strife/m_random.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\m_random.h" />
-		<Unit filename="..\src\strife\m_saves.c">
+		<Unit filename="../src/strife/m_random.h" />
+		<Unit filename="../src/strife/m_saves.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\m_saves.h" />
-		<Unit filename="..\src\strife\p_ceilng.c">
+		<Unit filename="../src/strife/m_saves.h" />
+		<Unit filename="../src/strife/p_ceilng.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_dialog.c">
+		<Unit filename="../src/strife/p_dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_dialog.h" />
-		<Unit filename="..\src\strife\p_doors.c">
+		<Unit filename="../src/strife/p_dialog.h" />
+		<Unit filename="../src/strife/p_doors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_enemy.c">
+		<Unit filename="../src/strife/p_enemy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_floor.c">
+		<Unit filename="../src/strife/p_floor.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_inter.c">
+		<Unit filename="../src/strife/p_inter.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_inter.h" />
-		<Unit filename="..\src\strife\p_lights.c">
+		<Unit filename="../src/strife/p_inter.h" />
+		<Unit filename="../src/strife/p_lights.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_local.h" />
-		<Unit filename="..\src\strife\p_map.c">
+		<Unit filename="../src/strife/p_local.h" />
+		<Unit filename="../src/strife/p_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_maputl.c">
+		<Unit filename="../src/strife/p_maputl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_mobj.c">
+		<Unit filename="../src/strife/p_mobj.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_mobj.h" />
-		<Unit filename="..\src\strife\p_plats.c">
+		<Unit filename="../src/strife/p_mobj.h" />
+		<Unit filename="../src/strife/p_plats.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_pspr.c">
+		<Unit filename="../src/strife/p_pspr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_pspr.h" />
-		<Unit filename="..\src\strife\p_saveg.c">
+		<Unit filename="../src/strife/p_pspr.h" />
+		<Unit filename="../src/strife/p_saveg.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_saveg.h" />
-		<Unit filename="..\src\strife\p_setup.c">
+		<Unit filename="../src/strife/p_saveg.h" />
+		<Unit filename="../src/strife/p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_setup.h" />
-		<Unit filename="..\src\strife\p_sight.c">
+		<Unit filename="../src/strife/p_setup.h" />
+		<Unit filename="../src/strife/p_sight.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_spec.c">
+		<Unit filename="../src/strife/p_spec.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_spec.h" />
-		<Unit filename="..\src\strife\p_switch.c">
+		<Unit filename="../src/strife/p_spec.h" />
+		<Unit filename="../src/strife/p_switch.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_telept.c">
+		<Unit filename="../src/strife/p_telept.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_tick.c">
+		<Unit filename="../src/strife/p_tick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\p_tick.h" />
-		<Unit filename="..\src\strife\p_user.c">
+		<Unit filename="../src/strife/p_tick.h" />
+		<Unit filename="../src/strife/p_user.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_bsp.c">
+		<Unit filename="../src/strife/r_bsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_bsp.h" />
-		<Unit filename="..\src\strife\r_data.c">
+		<Unit filename="../src/strife/r_bsp.h" />
+		<Unit filename="../src/strife/r_data.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_data.h" />
-		<Unit filename="..\src\strife\r_defs.h" />
-		<Unit filename="..\src\strife\r_draw.c">
+		<Unit filename="../src/strife/r_data.h" />
+		<Unit filename="../src/strife/r_defs.h" />
+		<Unit filename="../src/strife/r_draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_draw.h" />
-		<Unit filename="..\src\strife\r_local.h" />
-		<Unit filename="..\src\strife\r_main.c">
+		<Unit filename="../src/strife/r_draw.h" />
+		<Unit filename="../src/strife/r_local.h" />
+		<Unit filename="../src/strife/r_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_main.h" />
-		<Unit filename="..\src\strife\r_plane.c">
+		<Unit filename="../src/strife/r_main.h" />
+		<Unit filename="../src/strife/r_plane.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_plane.h" />
-		<Unit filename="..\src\strife\r_segs.c">
+		<Unit filename="../src/strife/r_plane.h" />
+		<Unit filename="../src/strife/r_segs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_segs.h" />
-		<Unit filename="..\src\strife\r_sky.c">
+		<Unit filename="../src/strife/r_segs.h" />
+		<Unit filename="../src/strife/r_sky.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_sky.h" />
-		<Unit filename="..\src\strife\r_state.h" />
-		<Unit filename="..\src\strife\r_things.c">
+		<Unit filename="../src/strife/r_sky.h" />
+		<Unit filename="../src/strife/r_state.h" />
+		<Unit filename="../src/strife/r_things.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\r_things.h" />
-		<Unit filename="..\src\strife\s_sound.c">
+		<Unit filename="../src/strife/r_things.h" />
+		<Unit filename="../src/strife/s_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\s_sound.h" />
-		<Unit filename="..\src\strife\sounds.c">
+		<Unit filename="../src/strife/s_sound.h" />
+		<Unit filename="../src/strife/sounds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\sounds.h" />
-		<Unit filename="..\src\strife\st_lib.c">
+		<Unit filename="../src/strife/sounds.h" />
+		<Unit filename="../src/strife/st_lib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\st_lib.h" />
-		<Unit filename="..\src\strife\st_stuff.c">
+		<Unit filename="../src/strife/st_lib.h" />
+		<Unit filename="../src/strife/st_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\st_stuff.h" />
-		<Unit filename="..\src\strife\wi_stuff.c">
+		<Unit filename="../src/strife/st_stuff.h" />
+		<Unit filename="../src/strife/wi_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\strife\wi_stuff.h" />
-		<Unit filename="..\src\tables.c">
+		<Unit filename="../src/strife/wi_stuff.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">
+		<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">
+		<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">
+		<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">
+		<Unit filename="../src/w_file.h" />
+		<Unit filename="../src/w_file_posix.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_stdc.c">
+		<Unit filename="../src/w_file_stdc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_file_win32.c">
+		<Unit filename="../src/w_file_win32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.c">
+		<Unit filename="../src/w_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_main.h" />
-		<Unit filename="..\src\w_merge.c">
+		<Unit filename="../src/w_main.h" />
+		<Unit filename="../src/w_merge.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\w_merge.h" />
-		<Unit filename="..\src\w_wad.c">
+		<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">
+		<Unit filename="../src/w_wad.h" />
+		<Unit filename="../src/z_zone.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\z_zone.h" />
+		<Unit filename="../src/z_zone.h" />
+		<Unit filename="config.h" />
+		<Unit filename="game-res.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<envvars />