shithub: choc

Download patch

ref: 18296c6e81cd3ff1d4114234fe9def4708776805
parent: 79d38c7d1ef051aad898eb45e965f3660bffc763
author: Adar Arnon <adararnon@gmail.com>
date: Thu May 12 10:03:23 EDT 2016 

All projects now compile correctly on Windows
* Updated link libraries to SDL2
* Removed files that no longer exist
* Removed `-mwindows` option from projects since it is already defined
  because the projects are defined as Windows GUI


--- a/codeblocks/doom.cbp
+++ b/codeblocks/doom.cbp
@@ -51,7 +51,7 @@
 			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -lSDL2_net -lSDL2_image" />
 			<Add directory="../lib" />
 		</Linker>
 		<Unit filename="../src/d_event.c">
@@ -401,7 +401,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/m_misc.h" />
-		<Unit filename="../src/md5.h" />
 		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
--- a/codeblocks/heretic.cbp
+++ b/codeblocks/heretic.cbp
@@ -52,7 +52,7 @@
 			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -lSDL2_net -lSDL2_image" />
 			<Add directory="../lib" />
 		</Linker>
 		<Unit filename="../src/d_event.c">
@@ -194,6 +194,9 @@
 		<Unit filename="../src/heretic/p_pspr.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../src/heretic/p_saveg.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../src/heretic/p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -257,6 +260,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/i_endoom.h" />
+		<Unit filename="../src/i_input.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/i_input.h" />
 		<Unit filename="../src/i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -270,10 +277,6 @@
 		<Unit filename="../src/i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../src/i_scale.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../src/i_scale.h" />
 		<Unit filename="../src/i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -332,7 +335,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/m_misc.h" />
-		<Unit filename="../src/md5.h" />
 		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -398,6 +400,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/tables.h" />
+		<Unit filename="../src/v_diskicon.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/v_diskicon.h" />
 		<Unit filename="../src/v_patch.h" />
 		<Unit filename="../src/v_video.c">
 			<Option compilerVar="CC" />
--- a/codeblocks/hexen.cbp
+++ b/codeblocks/hexen.cbp
@@ -52,7 +52,7 @@
 			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -lSDL2_net -lSDL2_image" />
 			<Add directory="../lib" />
 		</Linker>
 		<Unit filename="../src/d_event.c">
@@ -118,7 +118,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/hexen/h2def.h" />
-		<Unit filename="../src/hexen/i_header.h" />
 		<Unit filename="../src/hexen/in_lude.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -126,9 +125,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/hexen/info.h" />
-		<Unit filename="../src/hexen/m_misc.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="../src/hexen/m_random.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -260,6 +256,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/i_endoom.h" />
+		<Unit filename="../src/i_input.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/i_input.h" />
 		<Unit filename="../src/i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -273,10 +273,6 @@
 		<Unit filename="../src/i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../src/i_scale.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../src/i_scale.h" />
 		<Unit filename="../src/i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -335,7 +331,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/m_misc.h" />
-		<Unit filename="../src/md5.h" />
 		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -401,6 +396,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/tables.h" />
+		<Unit filename="../src/v_diskicon.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/v_diskicon.h" />
 		<Unit filename="../src/v_patch.h" />
 		<Unit filename="../src/v_video.c">
 			<Option compilerVar="CC" />
--- a/codeblocks/libopl.cbp
+++ b/codeblocks/libopl.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\lib\libopl-dbg" prefix_auto="1" extension_auto="1" />
+				<Option output="../lib/opl-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libopl\dbg" />
+				<Option object_output="../obj/libopl/dbg" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,9 +17,9 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="..\lib\libopl" prefix_auto="1" extension_auto="1" />
+				<Option output="../lib/opl" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libopl\rel" />
+				<Option object_output="../obj/libopl/rel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -36,42 +36,42 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add directory="." />
-			<Add directory="..\src" />
+			<Add directory="../src" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer" />
 		</Linker>
-		<Unit filename="..\opl\ioperm_sys.c">
+		<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\opl3.c">
+		<Unit filename="../opl/opl.h" />
+		<Unit filename="../opl/opl3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\opl\opl3.h" />
-		<Unit filename="..\opl\opl_internal.h" />
-		<Unit filename="..\opl\opl_linux.c">
+		<Unit filename="../opl/opl3.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>
 		<Extensions>
--- a/codeblocks/libpcsound.cbp
+++ b/codeblocks/libpcsound.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\lib\libpcsound-dbg" prefix_auto="1" extension_auto="1" />
+				<Option output="../lib/pcsound-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libpcsound\dbg" />
+				<Option object_output="../obj/libpcsound/dbg" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,9 +17,9 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="..\lib\libpcsound" prefix_auto="1" extension_auto="1" />
+				<Option output="../lib/pcsound" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="..\obj\libpcsound\rel" />
+				<Option object_output="../obj/libpcsound/rel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -36,23 +36,23 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add directory="." />
-			<Add directory="..\src" />
+			<Add directory="../src" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer" />
 		</Linker>
-		<Unit filename="..\pcsound\pcsound.c">
+		<Unit filename="../pcsound/pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\pcsound\pcsound.h" />
-		<Unit filename="..\pcsound\pcsound_internal.h" />
-		<Unit filename="..\pcsound\pcsound_linux.c">
+		<Unit filename="../pcsound/pcsound.h" />
+		<Unit filename="../pcsound/pcsound_internal.h" />
+		<Unit filename="../pcsound/pcsound_linux.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\pcsound\pcsound_sdl.c">
+		<Unit filename="../pcsound/pcsound_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\pcsound\pcsound_win32.c">
+		<Unit filename="../pcsound/pcsound_win32.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>
--- a/codeblocks/libtextscreen.cbp
+++ b/codeblocks/libtextscreen.cbp
@@ -40,7 +40,7 @@
 			<Add directory="../src" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2" />
 		</Linker>
 		<Unit filename="../textscreen/textscreen.h" />
 		<Unit filename="../textscreen/txt_button.c">
@@ -63,7 +63,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../textscreen/txt_fileselect.h" />
-		<Unit filename="../textscreen/txt_font.h" />
 		<Unit filename="../textscreen/txt_gui.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -80,7 +79,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<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" />
@@ -98,7 +96,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../textscreen/txt_separator.h" />
-		<Unit filename="../textscreen/txt_smallfont.h" />
 		<Unit filename="../textscreen/txt_spinctrl.c">
 			<Option compilerVar="CC" />
 		</Unit>
--- a/codeblocks/server.cbp
+++ b/codeblocks/server.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\chocolate-server-dbg.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-server\dbg" />
+				<Option output="../bin/chocolate-server-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-server/dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -18,9 +18,9 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\chocolate-server.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-server\rel" />
+				<Option output="../bin/chocolate-server.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-server/rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -36,74 +36,74 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add directory="." />
-			<Add directory="..\src" />
-			<Add directory="..\textscreen" />
+			<Add directory="../src" />
+			<Add directory="../textscreen" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_net -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_net" />
 		</Linker>
-		<Unit filename="..\src\d_dedicated.c">
+		<Unit filename="../src/d_dedicated.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_mode.c">
+		<Unit filename="../src/d_mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_mode.h" />
-		<Unit filename="..\src\i_main.c">
+		<Unit filename="../src/d_mode.h" />
+		<Unit filename="../src/i_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_system.c">
+		<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\m_argv.c">
+		<Unit filename="../src/i_timer.h" />
+		<Unit filename="../src/m_argv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.h" />
-		<Unit filename="..\src\m_misc.c">
+		<Unit filename="../src/m_argv.h" />
+		<Unit filename="../src/m_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_misc.h" />
-		<Unit filename="..\src\net_common.c">
+		<Unit filename="../src/m_misc.h" />
+		<Unit filename="../src/net_common.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_common.h" />
-		<Unit filename="..\src\net_dedicated.c">
+		<Unit filename="../src/net_common.h" />
+		<Unit filename="../src/net_dedicated.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_dedicated.h" />
-		<Unit filename="..\src\net_io.c">
+		<Unit filename="../src/net_dedicated.h" />
+		<Unit filename="../src/net_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_io.h" />
-		<Unit filename="..\src\net_packet.c">
+		<Unit filename="../src/net_io.h" />
+		<Unit filename="../src/net_packet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_packet.h" />
-		<Unit filename="..\src\net_query.c">
+		<Unit filename="../src/net_packet.h" />
+		<Unit filename="../src/net_query.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_query.h" />
-		<Unit filename="..\src\net_sdl.c">
+		<Unit filename="../src/net_query.h" />
+		<Unit filename="../src/net_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_sdl.h" />
-		<Unit filename="..\src\net_server.c">
+		<Unit filename="../src/net_sdl.h" />
+		<Unit filename="../src/net_server.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_server.h" />
-		<Unit filename="..\src\net_structrw.c">
+		<Unit filename="../src/net_server.h" />
+		<Unit filename="../src/net_structrw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\z_native.c">
+		<Unit filename="../src/net_structrw.h" />
+		<Unit filename="../src/z_native.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\z_zone.h" />
+		<Unit filename="../src/z_zone.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
--- a/codeblocks/setup.cbp
+++ b/codeblocks/setup.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="..\bin\chocolate-setup-dbg.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-setup\dbg" />
+				<Option output="../bin/chocolate-setup-dbg.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-setup/dbg" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -23,9 +23,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="..\bin\chocolate-setup.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\chocolate-setup\rel" />
+				<Option output="../bin/chocolate-setup.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../bin" />
+				<Option object_output="../obj/chocolate-setup/rel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
@@ -46,145 +46,147 @@
 			<Add option="-D_WIN32" />
 			<Add option='-DPROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;' />
 			<Add directory="." />
-			<Add directory="..\src" />
-			<Add directory="..\src\doom" />
-			<Add directory="..\textscreen" />
+			<Add directory="../src" />
+			<Add directory="../src/doom" />
+			<Add directory="../textscreen" />
 		</Compiler>
 		<ResourceCompiler>
-			<Add directory="..\src\setup" />
+			<Add directory="../src/setup" />
 		</ResourceCompiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_net -mwindows" />
-			<Add directory="..\lib" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_net" />
+			<Add directory="../lib" />
 		</Linker>
-		<Unit filename="setup-res.rc">
-			<Option compilerVar="WINDRES" />
-			<Option compile="0" />
-			<Option link="0" />
+		<Unit filename="../src/d_iwad.c">
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.c">
+		<Unit filename="../src/d_iwad.h" />
+		<Unit filename="../src/d_mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_iwad.h" />
-		<Unit filename="..\src\d_mode.c">
+		<Unit filename="../src/d_mode.h" />
+		<Unit filename="../src/deh_str.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\d_mode.h" />
-		<Unit filename="..\src\deh_str.c">
+		<Unit filename="../src/deh_str.h" />
+		<Unit filename="../src/doomtype.h" />
+		<Unit filename="../src/i_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\deh_str.h" />
-		<Unit filename="..\src\doomtype.h" />
-		<Unit filename="..\src\i_main.c">
+		<Unit filename="../src/i_system.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_system.c">
+		<Unit filename="../src/i_system.h" />
+		<Unit filename="../src/i_timer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_system.h" />
-		<Unit filename="..\src\i_timer.c">
+		<Unit filename="../src/i_timer.h" />
+		<Unit filename="../src/m_argv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\i_timer.h" />
-		<Unit filename="..\src\m_argv.c">
+		<Unit filename="../src/m_argv.h" />
+		<Unit filename="../src/m_config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_argv.h" />
-		<Unit filename="..\src\m_config.c">
+		<Unit filename="../src/m_config.h" />
+		<Unit filename="../src/m_controls.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_config.h" />
-		<Unit filename="..\src\m_controls.c">
+		<Unit filename="../src/m_controls.h" />
+		<Unit filename="../src/m_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_controls.h" />
-		<Unit filename="..\src\m_misc.c">
+		<Unit filename="../src/m_misc.h" />
+		<Unit filename="../src/net_defs.h" />
+		<Unit filename="../src/net_io.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\m_misc.h" />
-		<Unit filename="..\src\net_defs.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_structrw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_sdl.h" />
-		<Unit filename="..\src\net_structrw.c">
+		<Unit filename="../src/net_structrw.h" />
+		<Unit filename="../src/setup/compatibility.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\net_structrw.h" />
-		<Unit filename="..\src\setup\compatibility.c">
+		<Unit filename="../src/setup/compatibility.h" />
+		<Unit filename="../src/setup/display.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\compatibility.h" />
-		<Unit filename="..\src\setup\display.c">
+		<Unit filename="../src/setup/display.h" />
+		<Unit filename="../src/setup/execute.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\display.h" />
-		<Unit filename="..\src\setup\execute.c">
+		<Unit filename="../src/setup/execute.h" />
+		<Unit filename="../src/setup/joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\execute.h" />
-		<Unit filename="..\src\setup\joystick.c">
+		<Unit filename="../src/setup/joystick.h" />
+		<Unit filename="../src/setup/keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\joystick.h" />
-		<Unit filename="..\src\setup\keyboard.c">
+		<Unit filename="../src/setup/keyboard.h" />
+		<Unit filename="../src/setup/mainmenu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\keyboard.h" />
-		<Unit filename="..\src\setup\mainmenu.c">
+		<Unit filename="../src/setup/mode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\mode.c">
+		<Unit filename="../src/setup/mode.h" />
+		<Unit filename="../src/setup/mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\mode.h" />
-		<Unit filename="..\src\setup\mouse.c">
+		<Unit filename="../src/setup/mouse.h" />
+		<Unit filename="../src/setup/multiplayer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\mouse.h" />
-		<Unit filename="..\src\setup\multiplayer.c">
+		<Unit filename="../src/setup/multiplayer.h" />
+		<Unit filename="../src/setup/setup_icon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\multiplayer.h" />
-		<Unit filename="..\src\setup\setup_icon.c">
+		<Unit filename="../src/setup/sound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\sound.c">
+		<Unit filename="../src/setup/sound.h" />
+		<Unit filename="../src/setup/txt_joyaxis.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\sound.h" />
-		<Unit filename="..\src\setup\txt_joybinput.c">
+		<Unit filename="../src/setup/txt_joyaxis.h" />
+		<Unit filename="../src/setup/txt_joybinput.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\txt_joybinput.h" />
-		<Unit filename="..\src\setup\txt_keyinput.c">
+		<Unit filename="../src/setup/txt_joybinput.h" />
+		<Unit filename="../src/setup/txt_keyinput.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\txt_keyinput.h" />
-		<Unit filename="..\src\setup\txt_mouseinput.c">
+		<Unit filename="../src/setup/txt_keyinput.h" />
+		<Unit filename="../src/setup/txt_mouseinput.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\setup\txt_mouseinput.h" />
-		<Unit filename="..\src\z_native.c">
+		<Unit filename="../src/setup/txt_mouseinput.h" />
+		<Unit filename="../src/z_native.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\z_zone.h" />
+		<Unit filename="../src/z_zone.h" />
+		<Unit filename="setup-res.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<envvars />
--- a/codeblocks/strife.cbp
+++ b/codeblocks/strife.cbp
@@ -52,7 +52,7 @@
 			<Add directory="../opl" />
 		</Compiler>
 		<Linker>
-			<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
+			<Add option="-lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -lSDL2_net -lSDL2_image" />
 			<Add directory="../lib" />
 		</Linker>
 		<Unit filename="../src/d_event.c">
@@ -107,6 +107,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/i_endoom.h" />
+		<Unit filename="../src/i_input.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/i_input.h" />
 		<Unit filename="../src/i_joystick.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -120,10 +124,6 @@
 		<Unit filename="../src/i_pcsound.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../src/i_scale.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../src/i_scale.h" />
 		<Unit filename="../src/i_sdlmusic.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -182,7 +182,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/m_misc.h" />
-		<Unit filename="../src/md5.h" />
 		<Unit filename="../src/memio.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -469,6 +468,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/tables.h" />
+		<Unit filename="../src/v_diskicon.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/v_diskicon.h" />
 		<Unit filename="../src/v_patch.h" />
 		<Unit filename="../src/v_video.c">
 			<Option compilerVar="CC" />