- Update codeblocks projects

- Remove missing setup-manifest.xml file inclusion from setup-res.rc
file

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2610

3 files changed, 275 insertions, 267 deletions

diff --git a/codeblocks/game.cbp b/codeblocks/game.cbp
index 47b8c67e..1586d73a 100644
--- a/codeblocks/game.cbp
+++ b/codeblocks/game.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\$(PROJECT_NAME)-dbg.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\dbg" />
+				<Option output="../bin/$(PROJECT_NAME)-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters="-iwad d:\russell\games\doom2\iwad\doom2.wad" />
@@ -23,9 +23,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\$(PROJECT_NAME).exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\rel" />
+				<Option output="../bin/$(PROJECT_NAME).exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -43,442 +43,443 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add directory="." />
-			<Add directory="..\src" />
-			<Add directory="..\textscreen" />
-			<Add directory="..\pcsound" />
-			<Add directory="..\opl" />
+			<Add directory="../src" />
+			<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>
-		<Unit filename="..\opl\dbopl.c">
+		<Unit filename="../opl/dbopl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\dbopl.h" />
-		<Unit filename="..\opl\ioperm_sys.c">
+		<Unit filename="../opl/dbopl.h" />
+		<Unit filename="../opl/ioperm_sys.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\ioperm_sys.h" />
-		<Unit filename="..\opl\opl.c">
+		<Unit filename="../opl/ioperm_sys.h" />
+		<Unit filename="../opl/opl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\opl.h" />
-		<Unit filename="..\opl\opl_internal.h" />
-		<Unit filename="..\opl\opl_linux.c">
+		<Unit filename="../opl/opl.h" />
+		<Unit filename="../opl/opl_internal.h" />
+		<Unit filename="../opl/opl_linux.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\opl_obsd.c">
+		<Unit filename="../opl/opl_obsd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\opl_queue.c">
+		<Unit filename="../opl/opl_queue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\opl_queue.h" />
-		<Unit filename="..\opl\opl_sdl.c">
+		<Unit filename="../opl/opl_queue.h" />
+		<Unit filename="../opl/opl_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\opl_timer.c">
+		<Unit filename="../opl/opl_timer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\opl_timer.h" />
-		<Unit filename="..\opl\opl_win32.c">
+		<Unit filename="../opl/opl_timer.h" />
+		<Unit filename="../opl/opl_win32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\am_map.c">
+		<Unit filename="../src/am_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\am_map.h" />
-		<Unit filename="..\src\d_englsh.h" />
-		<Unit filename="..\src\d_event.h" />
-		<Unit filename="..\src\d_items.c">
+		<Unit filename="../src/am_map.h" />
+		<Unit filename="../src/d_englsh.h" />
+		<Unit filename="../src/d_event.h" />
+		<Unit filename="../src/d_items.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_items.h" />
-		<Unit filename="..\src\d_iwad.c">
+		<Unit filename="../src/d_items.h" />
+		<Unit filename="../src/d_iwad.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.h" />
-		<Unit filename="..\src\d_main.c">
+		<Unit filename="../src/d_iwad.h" />
+		<Unit filename="../src/d_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_main.h" />
-		<Unit filename="..\src\d_net.c">
+		<Unit filename="../src/d_main.h" />
+		<Unit filename="../src/d_net.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_net.h" />
-		<Unit filename="..\src\d_player.h" />
-		<Unit filename="..\src\d_textur.h" />
-		<Unit filename="..\src\d_think.h" />
-		<Unit filename="..\src\d_ticcmd.h" />
-		<Unit filename="..\src\deh_ammo.c">
+		<Unit filename="../src/d_net.h" />
+		<Unit filename="../src/d_player.h" />
+		<Unit filename="../src/d_textur.h" />
+		<Unit filename="../src/d_think.h" />
+		<Unit filename="../src/d_ticcmd.h" />
+		<Unit filename="../src/deh_ammo.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_cheat.c">
+		<Unit filename="../src/deh_cheat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_defs.h" />
-		<Unit filename="..\src\deh_frame.c">
+		<Unit filename="../src/deh_defs.h" />
+		<Unit filename="../src/deh_frame.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.c">
+		<Unit filename="../src/deh_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_io.h" />
-		<Unit filename="..\src\deh_main.c">
+		<Unit filename="../src/deh_io.h" />
+		<Unit filename="../src/deh_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_main.h" />
-		<Unit filename="..\src\deh_mapping.c">
+		<Unit filename="../src/deh_main.h" />
+		<Unit filename="../src/deh_mapping.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_mapping.h" />
-		<Unit filename="..\src\deh_misc.c">
+		<Unit filename="../src/deh_mapping.h" />
+		<Unit filename="../src/deh_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_misc.h" />
-		<Unit filename="..\src\deh_ptr.c">
+		<Unit filename="../src/deh_misc.h" />
+		<Unit filename="../src/deh_ptr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_sound.c">
+		<Unit filename="../src/deh_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_text.c">
+		<Unit filename="../src/deh_text.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_thing.c">
+		<Unit filename="../src/deh_thing.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_weapon.c">
+		<Unit filename="../src/deh_weapon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doomdata.h" />
-		<Unit filename="..\src\doomdef.c">
+		<Unit filename="../src/doomdata.h" />
+		<Unit filename="../src/doomdef.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doomdef.h" />
-		<Unit filename="..\src\doomfeatures.h" />
-		<Unit filename="..\src\doomkeys.h" />
-		<Unit filename="..\src\doomstat.c">
+		<Unit filename="../src/doomdef.h" />
+		<Unit filename="../src/doomfeatures.h" />
+		<Unit filename="../src/doomkeys.h" />
+		<Unit filename="../src/doomstat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\doomstat.h" />
-		<Unit filename="..\src\doomtype.h" />
-		<Unit filename="..\src\dstrings.c">
+		<Unit filename="../src/doomstat.h" />
+		<Unit filename="../src/doomtype.h" />
+		<Unit filename="../src/dstrings.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\dstrings.h" />
-		<Unit filename="..\src\f_finale.c">
+		<Unit filename="../src/dstrings.h" />
+		<Unit filename="../src/f_finale.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\f_finale.h" />
-		<Unit filename="..\src\f_wipe.c">
+		<Unit filename="../src/f_finale.h" />
+		<Unit filename="../src/f_wipe.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\f_wipe.h" />
-		<Unit filename="..\src\g_game.c">
+		<Unit filename="../src/f_wipe.h" />
+		<Unit filename="../src/g_game.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\g_game.h" />
-		<Unit filename="..\src\hu_lib.c">
+		<Unit filename="../src/g_game.h" />
+		<Unit filename="../src/hu_lib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hu_lib.h" />
-		<Unit filename="..\src\hu_stuff.c">
+		<Unit filename="../src/hu_lib.h" />
+		<Unit filename="../src/hu_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\hu_stuff.h" />
-		<Unit filename="..\src\i_joystick.c">
+		<Unit filename="../src/hu_stuff.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_swap.h" />
-		<Unit filename="..\src\i_system.c">
+		<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\info.c">
+		<Unit filename="../src/i_video.h" />
+		<Unit filename="../src/info.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\info.h" />
-		<Unit filename="..\src\m_argv.c">
+		<Unit filename="../src/info.h" />
+		<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_fixed.c">
+		<Unit filename="../src/m_config.h" />
+		<Unit filename="../src/m_fixed.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_fixed.h" />
-		<Unit filename="..\src\m_menu.c">
+		<Unit filename="../src/m_fixed.h" />
+		<Unit filename="../src/m_menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_menu.h" />
-		<Unit filename="..\src\m_misc.c">
+		<Unit filename="../src/m_menu.h" />
+		<Unit filename="../src/m_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_misc.h" />
-		<Unit filename="..\src\m_random.c">
+		<Unit filename="../src/m_misc.h" />
+		<Unit filename="../src/m_random.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_random.h" />
-		<Unit filename="..\src\md5.c">
+		<Unit filename="../src/m_random.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/p_ceilng.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\p_ceilng.c">
+		<Unit filename="../src/p_doors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_doors.c">
+		<Unit filename="../src/p_enemy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_enemy.c">
+		<Unit filename="../src/p_floor.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_floor.c">
+		<Unit filename="../src/p_inter.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_inter.c">
+		<Unit filename="../src/p_inter.h" />
+		<Unit filename="../src/p_lights.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_inter.h" />
-		<Unit filename="..\src\p_lights.c">
+		<Unit filename="../src/p_local.h" />
+		<Unit filename="../src/p_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_local.h" />
-		<Unit filename="..\src\p_map.c">
+		<Unit filename="../src/p_maputl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_maputl.c">
+		<Unit filename="../src/p_mobj.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_mobj.c">
+		<Unit filename="../src/p_mobj.h" />
+		<Unit filename="../src/p_plats.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_mobj.h" />
-		<Unit filename="..\src\p_plats.c">
+		<Unit filename="../src/p_pspr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_pspr.c">
+		<Unit filename="../src/p_pspr.h" />
+		<Unit filename="../src/p_saveg.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_pspr.h" />
-		<Unit filename="..\src\p_saveg.c">
+		<Unit filename="../src/p_saveg.h" />
+		<Unit filename="../src/p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_saveg.h" />
-		<Unit filename="..\src\p_setup.c">
+		<Unit filename="../src/p_setup.h" />
+		<Unit filename="../src/p_sight.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_setup.h" />
-		<Unit filename="..\src\p_sight.c">
+		<Unit filename="../src/p_spec.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_spec.c">
+		<Unit filename="../src/p_spec.h" />
+		<Unit filename="../src/p_switch.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_spec.h" />
-		<Unit filename="..\src\p_switch.c">
+		<Unit filename="../src/p_telept.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_telept.c">
+		<Unit filename="../src/p_tick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_tick.c">
+		<Unit filename="../src/p_tick.h" />
+		<Unit filename="../src/p_user.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\p_tick.h" />
-		<Unit filename="..\src\p_user.c">
+		<Unit filename="../src/r_bsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_bsp.c">
+		<Unit filename="../src/r_bsp.h" />
+		<Unit filename="../src/r_data.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_bsp.h" />
-		<Unit filename="..\src\r_data.c">
+		<Unit filename="../src/r_data.h" />
+		<Unit filename="../src/r_defs.h" />
+		<Unit filename="../src/r_draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_data.h" />
-		<Unit filename="..\src\r_defs.h" />
-		<Unit filename="..\src\r_draw.c">
+		<Unit filename="../src/r_draw.h" />
+		<Unit filename="../src/r_local.h" />
+		<Unit filename="../src/r_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_draw.h" />
-		<Unit filename="..\src\r_local.h" />
-		<Unit filename="..\src\r_main.c">
+		<Unit filename="../src/r_main.h" />
+		<Unit filename="../src/r_plane.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_main.h" />
-		<Unit filename="..\src\r_plane.c">
+		<Unit filename="../src/r_plane.h" />
+		<Unit filename="../src/r_segs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_plane.h" />
-		<Unit filename="..\src\r_segs.c">
+		<Unit filename="../src/r_segs.h" />
+		<Unit filename="../src/r_sky.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_segs.h" />
-		<Unit filename="..\src\r_sky.c">
+		<Unit filename="../src/r_sky.h" />
+		<Unit filename="../src/r_state.h" />
+		<Unit filename="../src/r_things.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_sky.h" />
-		<Unit filename="..\src\r_state.h" />
-		<Unit filename="..\src\r_things.c">
+		<Unit filename="../src/r_things.h" />
+		<Unit filename="../src/s_sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\r_things.h" />
-		<Unit filename="..\src\s_sound.c">
+		<Unit filename="../src/s_sound.h" />
+		<Unit filename="../src/sha1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\s_sound.h" />
-		<Unit filename="..\src\sounds.c">
+		<Unit filename="../src/sha1.h" />
+		<Unit filename="../src/sounds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\sounds.h" />
-		<Unit filename="..\src\st_lib.c">
+		<Unit filename="../src/sounds.h" />
+		<Unit filename="../src/st_lib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\st_lib.h" />
-		<Unit filename="..\src\st_stuff.c">
+		<Unit filename="../src/st_lib.h" />
+		<Unit filename="../src/st_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\st_stuff.h" />
-		<Unit filename="..\src\tables.c">
+		<Unit filename="../src/st_stuff.h" />
+		<Unit filename="../src/tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\tables.h" />
-		<Unit filename="..\src\v_video.c">
+		<Unit filename="../src/tables.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_stdc.c">
+		<Unit filename="../src/w_file.h" />
+		<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_merge.c">
+		<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\wi_stuff.c">
+		<Unit filename="../src/w_wad.h" />
+		<Unit filename="../src/wi_stuff.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\wi_stuff.h" />
-		<Unit filename="..\src\z_zone.c">
+		<Unit filename="../src/wi_stuff.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/setup-res.rc b/codeblocks/setup-res.rc
index ca791096..18dd120e 100644
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -1,7 +1,5 @@
 1 ICON "../data/setup.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
-
 1 VERSIONINFO
 PRODUCTVERSION 1,7,0,0
 FILEVERSION 1,7,0,0
diff --git a/codeblocks/textscreen.cbp b/codeblocks/textscreen.cbp
index 8db957b1..f6951424 100644
--- a/codeblocks/textscreen.cbp
+++ b/codeblocks/textscreen.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\debug" />
+				<Option object_output="../obj/libtextscreen/debug" />
 				<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\release" />
+				<Option object_output="../obj/libtextscreen/release" />
 				<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 />