From a122c93815fb79ec7c4f02e71041a68dcc170d93 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Sun, 29 Aug 2010 17:51:38 +0000
Subject: [PATCH] moved CodeBlocks and Visual Studio project files under their
 own directories.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@311 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Linux/CodeBlocks/QuakeSpasm.cbp               | 284 +++++++++++++++++
 Linux/CodeBlocks/QuakeSpasm.layout            | 103 ++++++
 Linux/{ => CodeBlocks}/QuakeSpasm.workspace   |   0
 Linux/{ => CodeBlocks}/cb.bmp                 | Bin
 Linux/QuakeSpasm.cbp                          | 285 -----------------
 Linux/QuakeSpasm.layout                       | 103 ------
 Windows/CodeBlocks/QuakeSpasm.cbp             | 300 ++++++++++++++++++
 Windows/CodeBlocks/QuakeSpasm.layout          |  94 ++++++
 Windows/{ => CodeBlocks}/QuakeSpasm.workspace |   0
 Windows/{ => CodeBlocks}/cb.bmp               | Bin
 Windows/QuakeSpasm.cbp                        | 300 ------------------
 Windows/QuakeSpasm.layout                     |  94 ------
 Windows/{ => VisualStudio}/SDL_x64.zip        | Bin
 Windows/{ => VisualStudio}/dirent.c           |   0
 Windows/{ => VisualStudio}/dirent.h           |   0
 Windows/{ => VisualStudio}/quakespasm.sln     |   0
 Windows/{ => VisualStudio}/quakespasm.vcproj  | 258 +++++++--------
 17 files changed, 902 insertions(+), 919 deletions(-)
 create mode 100644 Linux/CodeBlocks/QuakeSpasm.cbp
 create mode 100644 Linux/CodeBlocks/QuakeSpasm.layout
 rename Linux/{ => CodeBlocks}/QuakeSpasm.workspace (100%)
 rename Linux/{ => CodeBlocks}/cb.bmp (100%)
 delete mode 100644 Linux/QuakeSpasm.cbp
 delete mode 100644 Linux/QuakeSpasm.layout
 create mode 100644 Windows/CodeBlocks/QuakeSpasm.cbp
 create mode 100644 Windows/CodeBlocks/QuakeSpasm.layout
 rename Windows/{ => CodeBlocks}/QuakeSpasm.workspace (100%)
 rename Windows/{ => CodeBlocks}/cb.bmp (100%)
 delete mode 100644 Windows/QuakeSpasm.cbp
 delete mode 100644 Windows/QuakeSpasm.layout
 rename Windows/{ => VisualStudio}/SDL_x64.zip (100%)
 rename Windows/{ => VisualStudio}/dirent.c (100%)
 rename Windows/{ => VisualStudio}/dirent.h (100%)
 rename Windows/{ => VisualStudio}/quakespasm.sln (100%)
 rename Windows/{ => VisualStudio}/quakespasm.vcproj (64%)

diff --git a/Linux/CodeBlocks/QuakeSpasm.cbp b/Linux/CodeBlocks/QuakeSpasm.cbp
new file mode 100644
index 00000000..243216ea
--- /dev/null
+++ b/Linux/CodeBlocks/QuakeSpasm.cbp
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="QuakeSpasm" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin/Debug/quakespasm" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Option parameters="-window -basedir /home/kristian/Desktop/Quake -sndspeed 48000" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin/Release/quakespasm" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Option parameters="-window -basedir /home/kristian/Desktop/Quake -sndspeed 48000" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add option="`sdl-config --cflags`" />
+		</Compiler>
+		<Linker>
+			<Add option="`sdl-config --libs`" />
+			<Add option="-lGL" />
+		</Linker>
+		<Unit filename="../../Quake/anorm_dots.h" />
+		<Unit filename="../../Quake/anorms.h" />
+		<Unit filename="../../Quake/arch_def.h" />
+		<Unit filename="../../Quake/bspfile.h" />
+		<Unit filename="../../Quake/cd_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cdaudio.h" />
+		<Unit filename="../../Quake/chase.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cl_demo.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cl_input.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cl_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cl_parse.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cl_tent.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/client.h" />
+		<Unit filename="../../Quake/cmd.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cmd.h" />
+		<Unit filename="../../Quake/common.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/common.h" />
+		<Unit filename="../../Quake/conback.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/conback.h" />
+		<Unit filename="../../Quake/console.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/console.h" />
+		<Unit filename="../../Quake/crc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/crc.h" />
+		<Unit filename="../../Quake/cvar.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/cvar.h" />
+		<Unit filename="../../Quake/draw.h" />
+		<Unit filename="../../Quake/gl_draw.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_fog.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_mesh.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_model.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_model.h" />
+		<Unit filename="../../Quake/gl_refrag.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_rlight.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_rmain.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_rmisc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_screen.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_sky.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_texmgr.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_texmgr.h" />
+		<Unit filename="../../Quake/gl_vidsdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_warp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/gl_warp_sin.h" />
+		<Unit filename="../../Quake/glquake.h" />
+		<Unit filename="../../Quake/host.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/host_cmd.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/image.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/image.h" />
+		<Unit filename="../../Quake/in_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/input.h" />
+		<Unit filename="../../Quake/keys.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/keys.h" />
+		<Unit filename="../../Quake/main_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/mathlib.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/mathlib.h" />
+		<Unit filename="../../Quake/menu.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/menu.h" />
+		<Unit filename="../../Quake/modelgen.h" />
+		<Unit filename="../../Quake/net.h" />
+		<Unit filename="../../Quake/net_defs.h" />
+		<Unit filename="../../Quake/net_dgrm.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/net_dgrm.h" />
+		<Unit filename="../../Quake/net_loop.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/net_loop.h" />
+		<Unit filename="../../Quake/net_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/net_bsd.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/net_udp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/net_udp.h" />
+		<Unit filename="../../Quake/net_sys.h" />
+		<Unit filename="../../Quake/pl_linux.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/platform.h" />
+		<Unit filename="../../Quake/pr_cmds.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/pr_comp.h" />
+		<Unit filename="../../Quake/pr_edict.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/pr_exec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/progdefs.h" />
+		<Unit filename="../../Quake/progdefs.q1" />
+		<Unit filename="../../Quake/progs.h" />
+		<Unit filename="../../Quake/protocol.h" />
+		<Unit filename="../../Quake/q_stdinc.h" />
+		<Unit filename="../../Quake/qs_bmp.h" />
+		<Unit filename="../../Quake/quakedef.h" />
+		<Unit filename="../../Quake/r_alias.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/r_brush.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/r_part.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/r_sprite.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/r_world.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/render.h" />
+		<Unit filename="../../Quake/resource.h" />
+		<Unit filename="../../Quake/sbar.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/sbar.h" />
+		<Unit filename="../../Quake/screen.h" />
+		<Unit filename="../../Quake/server.h" />
+		<Unit filename="../../Quake/snd_dma.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_mem.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_mix.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/sound.h" />
+		<Unit filename="../../Quake/spritegn.h" />
+		<Unit filename="../../Quake/sv_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/sv_move.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/sv_phys.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/sv_user.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/sys.h" />
+		<Unit filename="../../Quake/sys_sdl_unix.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/vid.h" />
+		<Unit filename="../../Quake/view.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/view.h" />
+		<Unit filename="../../Quake/wad.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/wad.h" />
+		<Unit filename="../../Quake/world.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/world.h" />
+		<Unit filename="../../Quake/zone.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/zone.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/Linux/CodeBlocks/QuakeSpasm.layout b/Linux/CodeBlocks/QuakeSpasm.layout
new file mode 100644
index 00000000..b92fcefd
--- /dev/null
+++ b/Linux/CodeBlocks/QuakeSpasm.layout
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<ActiveTarget name="Release" />
+	<File name="../../Quake/cd_sdl.c" open="0" top="0" tabpos="0">
+		<Cursor position="1125" topLine="34" />
+	</File>
+	<File name="../../Quake/chase.c" open="1" top="1" tabpos="1">
+		<Cursor position="1545" topLine="41" />
+	</File>
+	<File name="../../Quake/cl_input.c" open="1" top="0" tabpos="5">
+		<Cursor position="5878" topLine="186" />
+	</File>
+	<File name="../../Quake/cl_main.c" open="0" top="0" tabpos="6">
+		<Cursor position="14554" topLine="651" />
+	</File>
+	<File name="../../Quake/cl_parse.c" open="0" top="0" tabpos="0">
+		<Cursor position="6252" topLine="251" />
+	</File>
+	<File name="../../Quake/cl_tent.c" open="0" top="0" tabpos="0">
+		<Cursor position="8459" topLine="337" />
+	</File>
+	<File name="../../Quake/common.c" open="0" top="0" tabpos="6">
+		<Cursor position="34577" topLine="1693" />
+	</File>
+	<File name="../../Quake/common.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="28" />
+	</File>
+	<File name="../../Quake/console.h" open="1" top="0" tabpos="2">
+		<Cursor position="1590" topLine="15" />
+	</File>
+	<File name="../../Quake/crc.h" open="0" top="0" tabpos="13">
+		<Cursor position="1086" topLine="0" />
+	</File>
+	<File name="../../Quake/gl_draw.c" open="0" top="0" tabpos="1">
+		<Cursor position="10937" topLine="406" />
+	</File>
+	<File name="../../Quake/gl_fog.c" open="0" top="0" tabpos="0">
+		<Cursor position="8190" topLine="368" />
+	</File>
+	<File name="../../Quake/gl_sky.c" open="0" top="0" tabpos="9">
+		<Cursor position="14811" topLine="652" />
+	</File>
+	<File name="../Quake/gl_texmgr.h" open="0" top="0" tabpos="0">
+		<Cursor position="1553" topLine="22" />
+	</File>
+	<File name="../../Quake/gl_vidsdl.c" open="0" top="0" tabpos="10">
+		<Cursor position="34053" topLine="1341" />
+	</File>
+	<File name="../../Quake/glquake.h" open="0" top="0" tabpos="2">
+		<Cursor position="4610" topLine="161" />
+	</File>
+	<File name="../../Quake/host.c" open="0" top="0" tabpos="1">
+		<Cursor position="15364" topLine="651" />
+	</File>
+	<File name="../../Quake/image.h" open="0" top="0" tabpos="0">
+		<Cursor position="1040" topLine="7" />
+	</File>
+	<File name="../../Quake/input.h" open="0" top="0" tabpos="0">
+		<Cursor position="1357" topLine="2" />
+	</File>
+	<File name="../../Quake/mathlib.h" open="0" top="0" tabpos="3">
+		<Cursor position="2074" topLine="46" />
+	</File>
+	<File name="../../Quake/menu.c" open="0" top="0" tabpos="2">
+		<Cursor position="63825" topLine="3065" />
+	</File>
+	<File name="../../Quake/net_dgrm.c" open="0" top="0" tabpos="3">
+		<Cursor position="905" topLine="21" />
+	</File>
+	<File name="../../Quake/platform.h" open="0" top="0" tabpos="0">
+		<Cursor position="983" topLine="10" />
+	</File>
+	<File name="../../Quake/pr_exec.c" open="0" top="0" tabpos="7">
+		<Cursor position="4522" topLine="270" />
+	</File>
+	<File name="../../Quake/quakedef.h" open="0" top="0" tabpos="5">
+		<Cursor position="823" topLine="0" />
+	</File>
+	<File name="../../Quake/r_brush.c" open="0" top="0" tabpos="8">
+		<Cursor position="15512" topLine="585" />
+	</File>
+	<File name="../../Quake/r_world.c" open="0" top="0" tabpos="7">
+		<Cursor position="9811" topLine="336" />
+	</File>
+	<File name="../../Quake/render.h" open="0" top="0" tabpos="12">
+		<Cursor position="3869" topLine="105" />
+	</File>
+	<File name="../../Quake/snd_dma.c" open="1" top="0" tabpos="4">
+		<Cursor position="1830" topLine="51" />
+	</File>
+	<File name="../../Quake/snd_mix.c" open="0" top="0" tabpos="0">
+		<Cursor position="3595" topLine="145" />
+	</File>
+	<File name="../../Quake/snd_sdl.c" open="1" top="0" tabpos="3">
+		<Cursor position="1435" topLine="20" />
+	</File>
+	<File name="../../Quake/sys_sdl_unix.c" open="0" top="0" tabpos="4">
+		<Cursor position="3415" topLine="137" />
+	</File>
+	<File name="../../Quake/wad.c" open="0" top="0" tabpos="3">
+		<Cursor position="1942" topLine="38" />
+	</File>
+</CodeBlocks_layout_file>
diff --git a/Linux/QuakeSpasm.workspace b/Linux/CodeBlocks/QuakeSpasm.workspace
similarity index 100%
rename from Linux/QuakeSpasm.workspace
rename to Linux/CodeBlocks/QuakeSpasm.workspace
diff --git a/Linux/cb.bmp b/Linux/CodeBlocks/cb.bmp
similarity index 100%
rename from Linux/cb.bmp
rename to Linux/CodeBlocks/cb.bmp
diff --git a/Linux/QuakeSpasm.cbp b/Linux/QuakeSpasm.cbp
deleted file mode 100644
index db411fac..00000000
--- a/Linux/QuakeSpasm.cbp
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="QuakeSpasm" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/quakespasm" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option parameters="-window -basedir /home/kristian/Desktop/Quake -sndspeed 48000" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin/Release/quakespasm" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option parameters="-window -basedir /home/kristian/Desktop/Quake -sndspeed 48000" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add option="`sdl-config --cflags`" />
-		</Compiler>
-		<Linker>
-			<Add option="`sdl-config --libs`" />
-			<Add option="-lGL" />
-		</Linker>
-		<Unit filename="../Quake/anorm_dots.h" />
-		<Unit filename="../Quake/anorms.h" />
-		<Unit filename="../Quake/arch_def.h" />
-		<Unit filename="../Quake/bspfile.h" />
-		<Unit filename="../Quake/cd_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cdaudio.h" />
-		<Unit filename="../Quake/chase.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cl_demo.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cl_input.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cl_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cl_parse.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cl_tent.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/client.h" />
-		<Unit filename="../Quake/cmd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cmd.h" />
-		<Unit filename="../Quake/common.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/common.h" />
-		<Unit filename="../Quake/conback.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/conback.h" />
-		<Unit filename="../Quake/console.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/console.h" />
-		<Unit filename="../Quake/crc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/crc.h" />
-		<Unit filename="../Quake/cvar.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/cvar.h" />
-		<Unit filename="../Quake/draw.h" />
-		<Unit filename="../Quake/gl_draw.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_fog.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_mesh.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_model.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_model.h" />
-		<Unit filename="../Quake/gl_refrag.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_rlight.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_rmain.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_rmisc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_screen.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_sky.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_texmgr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_texmgr.h" />
-		<Unit filename="../Quake/gl_vidsdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_warp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/gl_warp_sin.h" />
-		<Unit filename="../Quake/glquake.h" />
-		<Unit filename="../Quake/gnu.txt" />
-		<Unit filename="../Quake/host.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/host_cmd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/image.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/image.h" />
-		<Unit filename="../Quake/in_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/input.h" />
-		<Unit filename="../Quake/keys.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/keys.h" />
-		<Unit filename="../Quake/main_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/mathlib.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/mathlib.h" />
-		<Unit filename="../Quake/menu.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/menu.h" />
-		<Unit filename="../Quake/modelgen.h" />
-		<Unit filename="../Quake/net.h" />
-		<Unit filename="../Quake/net_defs.h" />
-		<Unit filename="../Quake/net_dgrm.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/net_dgrm.h" />
-		<Unit filename="../Quake/net_loop.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/net_loop.h" />
-		<Unit filename="../Quake/net_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/net_bsd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/net_udp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/net_udp.h" />
-		<Unit filename="../Quake/net_sys.h" />
-		<Unit filename="../Quake/pl_linux.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/platform.h" />
-		<Unit filename="../Quake/pr_cmds.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/pr_comp.h" />
-		<Unit filename="../Quake/pr_edict.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/pr_exec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/progdefs.h" />
-		<Unit filename="../Quake/progdefs.q1" />
-		<Unit filename="../Quake/progs.h" />
-		<Unit filename="../Quake/protocol.h" />
-		<Unit filename="../Quake/q_stdinc.h" />
-		<Unit filename="../Quake/qs_bmp.h" />
-		<Unit filename="../Quake/quakedef.h" />
-		<Unit filename="../Quake/r_alias.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/r_brush.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/r_part.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/r_sprite.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/r_world.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/render.h" />
-		<Unit filename="../Quake/resource.h" />
-		<Unit filename="../Quake/sbar.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/sbar.h" />
-		<Unit filename="../Quake/screen.h" />
-		<Unit filename="../Quake/server.h" />
-		<Unit filename="../Quake/snd_dma.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/snd_mem.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/snd_mix.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/snd_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/sound.h" />
-		<Unit filename="../Quake/spritegn.h" />
-		<Unit filename="../Quake/sv_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/sv_move.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/sv_phys.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/sv_user.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/sys.h" />
-		<Unit filename="../Quake/sys_sdl_unix.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/vid.h" />
-		<Unit filename="../Quake/view.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/view.h" />
-		<Unit filename="../Quake/wad.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/wad.h" />
-		<Unit filename="../Quake/world.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/world.h" />
-		<Unit filename="../Quake/zone.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../Quake/zone.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/Linux/QuakeSpasm.layout b/Linux/QuakeSpasm.layout
deleted file mode 100644
index 4f8180db..00000000
--- a/Linux/QuakeSpasm.layout
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Release" />
-	<File name="../Quake/cd_sdl.c" open="0" top="0" tabpos="0">
-		<Cursor position="1125" topLine="34" />
-	</File>
-	<File name="../Quake/chase.c" open="1" top="1" tabpos="1">
-		<Cursor position="1545" topLine="41" />
-	</File>
-	<File name="../Quake/cl_input.c" open="1" top="0" tabpos="5">
-		<Cursor position="5878" topLine="186" />
-	</File>
-	<File name="../Quake/cl_main.c" open="0" top="0" tabpos="6">
-		<Cursor position="14554" topLine="651" />
-	</File>
-	<File name="../Quake/cl_parse.c" open="0" top="0" tabpos="0">
-		<Cursor position="6252" topLine="251" />
-	</File>
-	<File name="../Quake/cl_tent.c" open="0" top="0" tabpos="0">
-		<Cursor position="8459" topLine="337" />
-	</File>
-	<File name="../Quake/common.c" open="0" top="0" tabpos="6">
-		<Cursor position="34577" topLine="1693" />
-	</File>
-	<File name="../Quake/common.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="28" />
-	</File>
-	<File name="../Quake/console.h" open="1" top="0" tabpos="2">
-		<Cursor position="1590" topLine="15" />
-	</File>
-	<File name="../Quake/crc.h" open="0" top="0" tabpos="13">
-		<Cursor position="1086" topLine="0" />
-	</File>
-	<File name="../Quake/gl_draw.c" open="0" top="0" tabpos="1">
-		<Cursor position="10937" topLine="406" />
-	</File>
-	<File name="../Quake/gl_fog.c" open="0" top="0" tabpos="0">
-		<Cursor position="8190" topLine="368" />
-	</File>
-	<File name="../Quake/gl_sky.c" open="0" top="0" tabpos="9">
-		<Cursor position="14811" topLine="652" />
-	</File>
-	<File name="../Quake/gl_texmgr.h" open="0" top="0" tabpos="0">
-		<Cursor position="1553" topLine="22" />
-	</File>
-	<File name="../Quake/gl_vidsdl.c" open="0" top="0" tabpos="10">
-		<Cursor position="34053" topLine="1341" />
-	</File>
-	<File name="../Quake/glquake.h" open="0" top="0" tabpos="2">
-		<Cursor position="4610" topLine="161" />
-	</File>
-	<File name="../Quake/host.c" open="0" top="0" tabpos="1">
-		<Cursor position="15364" topLine="651" />
-	</File>
-	<File name="../Quake/image.h" open="0" top="0" tabpos="0">
-		<Cursor position="1040" topLine="7" />
-	</File>
-	<File name="../Quake/input.h" open="0" top="0" tabpos="0">
-		<Cursor position="1357" topLine="2" />
-	</File>
-	<File name="../Quake/mathlib.h" open="0" top="0" tabpos="3">
-		<Cursor position="2074" topLine="46" />
-	</File>
-	<File name="../Quake/menu.c" open="0" top="0" tabpos="2">
-		<Cursor position="63825" topLine="3065" />
-	</File>
-	<File name="../Quake/net_dgrm.c" open="0" top="0" tabpos="3">
-		<Cursor position="905" topLine="21" />
-	</File>
-	<File name="../Quake/platform.h" open="0" top="0" tabpos="0">
-		<Cursor position="983" topLine="10" />
-	</File>
-	<File name="../Quake/pr_exec.c" open="0" top="0" tabpos="7">
-		<Cursor position="4522" topLine="270" />
-	</File>
-	<File name="../Quake/quakedef.h" open="0" top="0" tabpos="5">
-		<Cursor position="823" topLine="0" />
-	</File>
-	<File name="../Quake/r_brush.c" open="0" top="0" tabpos="8">
-		<Cursor position="15512" topLine="585" />
-	</File>
-	<File name="../Quake/r_world.c" open="0" top="0" tabpos="7">
-		<Cursor position="9811" topLine="336" />
-	</File>
-	<File name="../Quake/render.h" open="0" top="0" tabpos="12">
-		<Cursor position="3869" topLine="105" />
-	</File>
-	<File name="../Quake/snd_dma.c" open="1" top="0" tabpos="4">
-		<Cursor position="1830" topLine="51" />
-	</File>
-	<File name="../Quake/snd_mix.c" open="0" top="0" tabpos="0">
-		<Cursor position="3595" topLine="145" />
-	</File>
-	<File name="../Quake/snd_sdl.c" open="1" top="0" tabpos="3">
-		<Cursor position="1435" topLine="20" />
-	</File>
-	<File name="../Quake/sys_sdl_unix.c" open="0" top="0" tabpos="4">
-		<Cursor position="3415" topLine="137" />
-	</File>
-	<File name="../Quake/wad.c" open="0" top="0" tabpos="3">
-		<Cursor position="1942" topLine="38" />
-	</File>
-</CodeBlocks_layout_file>
diff --git a/Windows/CodeBlocks/QuakeSpasm.cbp b/Windows/CodeBlocks/QuakeSpasm.cbp
new file mode 100644
index 00000000..cc121e14
--- /dev/null
+++ b/Windows/CodeBlocks/QuakeSpasm.cbp
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="QuakeSpasm" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin\Debug\quakespasm" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Debug\" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Option parameters="-window -basedir C:\Programme\Quake" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin\Release\quakespasm" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Release\" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Option parameters="-window -basedir C:\Programme\Quake" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add directory="C:\Programme\SDL\include" />
+		</Compiler>
+		<Linker>
+			<Add library="mingw32" />
+			<Add library="SDLmain" />
+			<Add library="SDL.dll" />
+			<Add library="user32" />
+			<Add library="gdi32" />
+			<Add library="winmm" />
+			<Add library="dxguid" />
+			<Add library="opengl32" />
+			<Add library="ws2_32" />
+			<Add directory="C:\Programme\SDL\lib" />
+		</Linker>
+		<Unit filename="..\..\Quake\anorm_dots.h" />
+		<Unit filename="..\..\Quake\anorms.h" />
+		<Unit filename="..\..\Quake\arch_def.h" />
+		<Unit filename="..\..\Quake\bspfile.h" />
+		<Unit filename="..\..\Quake\cd_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cdaudio.h" />
+		<Unit filename="..\..\Quake\chase.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cl_demo.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cl_input.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cl_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cl_parse.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cl_tent.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\client.h" />
+		<Unit filename="..\..\Quake\cmd.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cmd.h" />
+		<Unit filename="..\..\Quake\common.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\common.h" />
+		<Unit filename="..\..\Quake\conback.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\conback.h" />
+		<Unit filename="..\..\Quake\console.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\console.h" />
+		<Unit filename="..\..\Quake\crc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\crc.h" />
+		<Unit filename="..\..\Quake\cvar.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\cvar.h" />
+		<Unit filename="..\..\Quake\draw.h" />
+		<Unit filename="..\..\Quake\gl_draw.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_fog.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_mesh.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_model.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_model.h" />
+		<Unit filename="..\..\Quake\gl_refrag.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_rlight.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_rmain.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_rmisc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_screen.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_sky.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_texmgr.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_texmgr.h" />
+		<Unit filename="..\..\Quake\gl_vidsdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_warp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\gl_warp_sin.h" />
+		<Unit filename="..\..\Quake\glquake.h" />
+		<Unit filename="..\..\Quake\host.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\host_cmd.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\image.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\image.h" />
+		<Unit filename="..\..\Quake\in_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\input.h" />
+		<Unit filename="..\..\Quake\keys.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\keys.h" />
+		<Unit filename="..\..\Quake\main_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\mathlib.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\mathlib.h" />
+		<Unit filename="..\..\Quake\menu.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\menu.h" />
+		<Unit filename="..\..\Quake\modelgen.h" />
+		<Unit filename="..\..\Quake\net.h" />
+		<Unit filename="..\..\Quake\net_defs.h" />
+		<Unit filename="..\..\Quake\net_dgrm.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\net_dgrm.h" />
+		<Unit filename="..\..\Quake\net_loop.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\net_loop.h" />
+		<Unit filename="..\..\Quake\net_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\net_win.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\net_sys.h" />
+		<Unit filename="..\..\Quake\net_wins.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\net_wins.h" />
+		<Unit filename="..\..\Quake\net_wipx.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\net_wipx.h" />
+		<Unit filename="..\..\Quake\pl_win.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\platform.h" />
+		<Unit filename="..\..\Quake\pr_cmds.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\pr_comp.h" />
+		<Unit filename="..\..\Quake\pr_edict.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\pr_exec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\progdefs.h" />
+		<Unit filename="..\..\Quake\progs.h" />
+		<Unit filename="..\..\Quake\protocol.h" />
+		<Unit filename="..\..\Quake\q_stdinc.h" />
+		<Unit filename="..\..\Quake\qs_bmp.h" />
+		<Unit filename="..\..\Quake\quakedef.h" />
+		<Unit filename="..\..\Quake\r_alias.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\r_brush.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\r_part.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\r_sprite.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\r_world.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\render.h" />
+		<Unit filename="..\..\Quake\resource.h" />
+		<Unit filename="..\..\Quake\sbar.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\sbar.h" />
+		<Unit filename="..\..\Quake\screen.h" />
+		<Unit filename="..\..\Quake\server.h" />
+		<Unit filename="..\..\Quake\snd_dma.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\snd_mem.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\snd_mix.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\snd_sdl.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\sound.h" />
+		<Unit filename="..\..\Quake\spritegn.h" />
+		<Unit filename="..\..\Quake\sv_main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\sv_move.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\sv_phys.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\sv_user.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\sys.h" />
+		<Unit filename="..\..\Quake\sys_sdl_win.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\vid.h" />
+		<Unit filename="..\..\Quake\view.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\view.h" />
+		<Unit filename="..\..\Quake\wad.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\wad.h" />
+		<Unit filename="..\..\Quake\world.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\world.h" />
+		<Unit filename="..\..\Quake\wsaerror.h" />
+		<Unit filename="..\..\Quake\zone.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\..\Quake\zone.h" />
+		<Unit filename="..\QuakeSpasm.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+			<lib_finder />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/Windows/CodeBlocks/QuakeSpasm.layout b/Windows/CodeBlocks/QuakeSpasm.layout
new file mode 100644
index 00000000..c1605922
--- /dev/null
+++ b/Windows/CodeBlocks/QuakeSpasm.layout
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<ActiveTarget name="Release" />
+	<File name="..\..\Quake\cl_demo.c" open="0" top="0" tabpos="2">
+		<Cursor position="4395" topLine="177" />
+	</File>
+	<File name="..\..\Quake\cl_main.c" open="0" top="0" tabpos="6">
+		<Cursor position="800" topLine="7" />
+	</File>
+	<File name="..\..\Quake\common.c" open="0" top="0" tabpos="8">
+		<Cursor position="34577" topLine="1726" />
+	</File>
+	<File name="..\..\Quake\common.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="28" />
+	</File>
+	<File name="..\..\Quake\crc.h" open="0" top="0" tabpos="13">
+		<Cursor position="937" topLine="1" />
+	</File>
+	<File name="..\..\Quake\gl_draw.c" open="0" top="0" tabpos="1">
+		<Cursor position="10937" topLine="406" />
+	</File>
+	<File name="..\..\Quake\gl_sky.c" open="0" top="0" tabpos="11">
+		<Cursor position="14811" topLine="679" />
+	</File>
+	<File name="..\..\Quake\gl_texmgr.h" open="0" top="0" tabpos="0">
+		<Cursor position="1553" topLine="22" />
+	</File>
+	<File name="..\..\Quake\gl_vidsdl.c" open="0" top="0" tabpos="1">
+		<Cursor position="33572" topLine="1316" />
+	</File>
+	<File name="..\..\Quake\glquake.h" open="0" top="0" tabpos="13">
+		<Cursor position="5067" topLine="164" />
+	</File>
+	<File name="..\..\Quake\host.c" open="0" top="0" tabpos="1">
+		<Cursor position="17767" topLine="770" />
+	</File>
+	<File name="..\..\Quake\host_cmd.c" open="1" top="0" tabpos="1">
+		<Cursor position="403" topLine="0" />
+	</File>
+	<File name="..\..\Quake\image.h" open="0" top="0" tabpos="0">
+		<Cursor position="912" topLine="0" />
+	</File>
+	<File name="..\..\Quake\in_sdl.c" open="0" top="0" tabpos="4">
+		<Cursor position="1102" topLine="19" />
+	</File>
+	<File name="..\..\Quake\main_sdl.c" open="0" top="0" tabpos="4">
+		<Cursor position="2851" topLine="93" />
+	</File>
+	<File name="..\..\Quake\mathlib.h" open="0" top="0" tabpos="3">
+		<Cursor position="2074" topLine="46" />
+	</File>
+	<File name="..\..\Quake\menu.c" open="0" top="0" tabpos="5">
+		<Cursor position="27465" topLine="1268" />
+	</File>
+	<File name="..\..\Quake\net_dgrm.c" open="0" top="0" tabpos="3">
+		<Cursor position="905" topLine="21" />
+	</File>
+	<File name="..\..\Quake\net_wins.c" open="1" top="1" tabpos="2">
+		<Cursor position="766" topLine="0" />
+	</File>
+	<File name="..\..\Quake\pl_win.c" open="0" top="0" tabpos="2">
+		<Cursor position="1523" topLine="26" />
+	</File>
+	<File name="..\..\Quake\platform.h" open="0" top="0" tabpos="3">
+		<Cursor position="1015" topLine="10" />
+	</File>
+	<File name="..\..\Quake\pr_exec.c" open="0" top="0" tabpos="7">
+		<Cursor position="4522" topLine="270" />
+	</File>
+	<File name="..\..\Quake\quakedef.h" open="0" top="0" tabpos="7">
+		<Cursor position="5875" topLine="205" />
+	</File>
+	<File name="..\..\Quake\r_brush.c" open="0" top="0" tabpos="10">
+		<Cursor position="15512" topLine="592" />
+	</File>
+	<File name="..\..\Quake\r_world.c" open="0" top="0" tabpos="9">
+		<Cursor position="9811" topLine="354" />
+	</File>
+	<File name="..\..\Quake\render.h" open="0" top="0" tabpos="0">
+		<Cursor position="3780" topLine="106" />
+	</File>
+	<File name="..\..\Quake\snd_dma.c" open="0" top="0" tabpos="0">
+		<Cursor position="18183" topLine="831" />
+	</File>
+	<File name="..\..\Quake\snd_mix.c" open="0" top="0" tabpos="0">
+		<Cursor position="3595" topLine="145" />
+	</File>
+	<File name="..\..\Quake\sys_sdl_win.c" open="0" top="0" tabpos="6">
+		<Cursor position="3415" topLine="137" />
+	</File>
+	<File name="..\..\Quake\wad.c" open="0" top="0" tabpos="5">
+		<Cursor position="1942" topLine="55" />
+	</File>
+</CodeBlocks_layout_file>
diff --git a/Windows/QuakeSpasm.workspace b/Windows/CodeBlocks/QuakeSpasm.workspace
similarity index 100%
rename from Windows/QuakeSpasm.workspace
rename to Windows/CodeBlocks/QuakeSpasm.workspace
diff --git a/Windows/cb.bmp b/Windows/CodeBlocks/cb.bmp
similarity index 100%
rename from Windows/cb.bmp
rename to Windows/CodeBlocks/cb.bmp
diff --git a/Windows/QuakeSpasm.cbp b/Windows/QuakeSpasm.cbp
deleted file mode 100644
index abd03133..00000000
--- a/Windows/QuakeSpasm.cbp
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="QuakeSpasm" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\quakespasm" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option parameters="-window -basedir C:\Programme\Quake" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin\Release\quakespasm" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option parameters="-window -basedir C:\Programme\Quake" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add directory="C:\Programme\SDL\include" />
-		</Compiler>
-		<Linker>
-			<Add library="mingw32" />
-			<Add library="SDLmain" />
-			<Add library="SDL.dll" />
-			<Add library="user32" />
-			<Add library="gdi32" />
-			<Add library="winmm" />
-			<Add library="dxguid" />
-			<Add library="opengl32" />
-			<Add library="ws2_32" />
-			<Add directory="C:\Programme\SDL\lib" />
-		</Linker>
-		<Unit filename="..\Quake\anorm_dots.h" />
-		<Unit filename="..\Quake\anorms.h" />
-		<Unit filename="..\Quake\arch_def.h" />
-		<Unit filename="..\Quake\bspfile.h" />
-		<Unit filename="..\Quake\cd_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cdaudio.h" />
-		<Unit filename="..\Quake\chase.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cl_demo.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cl_input.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cl_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cl_parse.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cl_tent.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\client.h" />
-		<Unit filename="..\Quake\cmd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cmd.h" />
-		<Unit filename="..\Quake\common.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\common.h" />
-		<Unit filename="..\Quake\conback.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\conback.h" />
-		<Unit filename="..\Quake\console.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\console.h" />
-		<Unit filename="..\Quake\crc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\crc.h" />
-		<Unit filename="..\Quake\cvar.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\cvar.h" />
-		<Unit filename="..\Quake\draw.h" />
-		<Unit filename="..\Quake\gl_draw.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_fog.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_mesh.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_model.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_model.h" />
-		<Unit filename="..\Quake\gl_refrag.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_rlight.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_rmain.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_rmisc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_screen.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_sky.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_texmgr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_texmgr.h" />
-		<Unit filename="..\Quake\gl_vidsdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_warp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\gl_warp_sin.h" />
-		<Unit filename="..\Quake\glquake.h" />
-		<Unit filename="..\Quake\host.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\host_cmd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\image.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\image.h" />
-		<Unit filename="..\Quake\in_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\input.h" />
-		<Unit filename="..\Quake\keys.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\keys.h" />
-		<Unit filename="..\Quake\main_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\mathlib.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\mathlib.h" />
-		<Unit filename="..\Quake\menu.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\menu.h" />
-		<Unit filename="..\Quake\modelgen.h" />
-		<Unit filename="..\Quake\net.h" />
-		<Unit filename="..\Quake\net_defs.h" />
-		<Unit filename="..\Quake\net_dgrm.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\net_dgrm.h" />
-		<Unit filename="..\Quake\net_loop.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\net_loop.h" />
-		<Unit filename="..\Quake\net_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\net_win.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\net_sys.h" />
-		<Unit filename="..\Quake\net_wins.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\net_wins.h" />
-		<Unit filename="..\Quake\net_wipx.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\net_wipx.h" />
-		<Unit filename="..\Quake\pl_win.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\platform.h" />
-		<Unit filename="..\Quake\pr_cmds.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\pr_comp.h" />
-		<Unit filename="..\Quake\pr_edict.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\pr_exec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\progdefs.h" />
-		<Unit filename="..\Quake\progs.h" />
-		<Unit filename="..\Quake\protocol.h" />
-		<Unit filename="..\Quake\q_stdinc.h" />
-		<Unit filename="..\Quake\qs_bmp.h" />
-		<Unit filename="..\Quake\quakedef.h" />
-		<Unit filename="..\Quake\r_alias.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\r_brush.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\r_part.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\r_sprite.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\r_world.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\render.h" />
-		<Unit filename="..\Quake\resource.h" />
-		<Unit filename="..\Quake\sbar.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\sbar.h" />
-		<Unit filename="..\Quake\screen.h" />
-		<Unit filename="..\Quake\server.h" />
-		<Unit filename="..\Quake\snd_dma.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\snd_mem.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\snd_mix.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\snd_sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\sound.h" />
-		<Unit filename="..\Quake\spritegn.h" />
-		<Unit filename="..\Quake\sv_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\sv_move.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\sv_phys.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\sv_user.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\sys.h" />
-		<Unit filename="..\Quake\sys_sdl_win.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\vid.h" />
-		<Unit filename="..\Quake\view.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\view.h" />
-		<Unit filename="..\Quake\wad.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\wad.h" />
-		<Unit filename="..\Quake\world.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\world.h" />
-		<Unit filename="..\Quake\wsaerror.h" />
-		<Unit filename="..\Quake\zone.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\Quake\zone.h" />
-		<Unit filename="QuakeSpasm.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/Windows/QuakeSpasm.layout b/Windows/QuakeSpasm.layout
deleted file mode 100644
index 10eb2bdb..00000000
--- a/Windows/QuakeSpasm.layout
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Release" />
-	<File name="..\Quake\cl_demo.c" open="0" top="0" tabpos="2">
-		<Cursor position="4395" topLine="177" />
-	</File>
-	<File name="..\Quake\cl_main.c" open="0" top="0" tabpos="6">
-		<Cursor position="800" topLine="7" />
-	</File>
-	<File name="..\Quake\common.c" open="0" top="0" tabpos="8">
-		<Cursor position="34577" topLine="1726" />
-	</File>
-	<File name="..\Quake\common.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="28" />
-	</File>
-	<File name="..\Quake\crc.h" open="0" top="0" tabpos="13">
-		<Cursor position="937" topLine="1" />
-	</File>
-	<File name="..\Quake\gl_draw.c" open="0" top="0" tabpos="1">
-		<Cursor position="10937" topLine="406" />
-	</File>
-	<File name="..\Quake\gl_sky.c" open="0" top="0" tabpos="11">
-		<Cursor position="14811" topLine="679" />
-	</File>
-	<File name="..\Quake\gl_texmgr.h" open="0" top="0" tabpos="0">
-		<Cursor position="1553" topLine="22" />
-	</File>
-	<File name="..\Quake\gl_vidsdl.c" open="0" top="0" tabpos="1">
-		<Cursor position="33572" topLine="1316" />
-	</File>
-	<File name="..\Quake\glquake.h" open="0" top="0" tabpos="13">
-		<Cursor position="5067" topLine="164" />
-	</File>
-	<File name="..\Quake\host.c" open="0" top="0" tabpos="1">
-		<Cursor position="17767" topLine="770" />
-	</File>
-	<File name="..\Quake\host_cmd.c" open="1" top="0" tabpos="1">
-		<Cursor position="403" topLine="0" />
-	</File>
-	<File name="..\Quake\image.h" open="0" top="0" tabpos="0">
-		<Cursor position="912" topLine="0" />
-	</File>
-	<File name="..\Quake\in_sdl.c" open="0" top="0" tabpos="4">
-		<Cursor position="1102" topLine="19" />
-	</File>
-	<File name="..\Quake\main_sdl.c" open="0" top="0" tabpos="4">
-		<Cursor position="2851" topLine="93" />
-	</File>
-	<File name="..\Quake\mathlib.h" open="0" top="0" tabpos="3">
-		<Cursor position="2074" topLine="46" />
-	</File>
-	<File name="..\Quake\menu.c" open="0" top="0" tabpos="5">
-		<Cursor position="27465" topLine="1268" />
-	</File>
-	<File name="..\Quake\net_dgrm.c" open="0" top="0" tabpos="3">
-		<Cursor position="905" topLine="21" />
-	</File>
-	<File name="..\Quake\net_wins.c" open="1" top="1" tabpos="2">
-		<Cursor position="766" topLine="0" />
-	</File>
-	<File name="..\Quake\pl_win.c" open="0" top="0" tabpos="2">
-		<Cursor position="1523" topLine="26" />
-	</File>
-	<File name="..\Quake\platform.h" open="0" top="0" tabpos="3">
-		<Cursor position="1015" topLine="10" />
-	</File>
-	<File name="..\Quake\pr_exec.c" open="0" top="0" tabpos="7">
-		<Cursor position="4522" topLine="270" />
-	</File>
-	<File name="..\Quake\quakedef.h" open="0" top="0" tabpos="7">
-		<Cursor position="5875" topLine="205" />
-	</File>
-	<File name="..\Quake\r_brush.c" open="0" top="0" tabpos="10">
-		<Cursor position="15512" topLine="592" />
-	</File>
-	<File name="..\Quake\r_world.c" open="0" top="0" tabpos="9">
-		<Cursor position="9811" topLine="354" />
-	</File>
-	<File name="..\Quake\render.h" open="0" top="0" tabpos="0">
-		<Cursor position="3780" topLine="106" />
-	</File>
-	<File name="..\Quake\snd_dma.c" open="0" top="0" tabpos="0">
-		<Cursor position="18183" topLine="831" />
-	</File>
-	<File name="..\Quake\snd_mix.c" open="0" top="0" tabpos="0">
-		<Cursor position="3595" topLine="145" />
-	</File>
-	<File name="..\Quake\sys_sdl_win.c" open="0" top="0" tabpos="6">
-		<Cursor position="3415" topLine="137" />
-	</File>
-	<File name="..\Quake\wad.c" open="0" top="0" tabpos="5">
-		<Cursor position="1942" topLine="55" />
-	</File>
-</CodeBlocks_layout_file>
diff --git a/Windows/SDL_x64.zip b/Windows/VisualStudio/SDL_x64.zip
similarity index 100%
rename from Windows/SDL_x64.zip
rename to Windows/VisualStudio/SDL_x64.zip
diff --git a/Windows/dirent.c b/Windows/VisualStudio/dirent.c
similarity index 100%
rename from Windows/dirent.c
rename to Windows/VisualStudio/dirent.c
diff --git a/Windows/dirent.h b/Windows/VisualStudio/dirent.h
similarity index 100%
rename from Windows/dirent.h
rename to Windows/VisualStudio/dirent.h
diff --git a/Windows/quakespasm.sln b/Windows/VisualStudio/quakespasm.sln
similarity index 100%
rename from Windows/quakespasm.sln
rename to Windows/VisualStudio/quakespasm.sln
diff --git a/Windows/quakespasm.vcproj b/Windows/VisualStudio/quakespasm.vcproj
similarity index 64%
rename from Windows/quakespasm.vcproj
rename to Windows/VisualStudio/quakespasm.vcproj
index ae94f0a3..1d5220c3 100644
--- a/Windows/quakespasm.vcproj
+++ b/Windows/VisualStudio/quakespasm.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="C:\SDL\include;..\Quake;."
+				AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -89,9 +89,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -121,7 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="C:\SDL\include;..\Quake;."
+				AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -169,9 +166,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -202,7 +196,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="C:\SDL\include;..\Quake;."
+				AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -248,9 +242,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -281,7 +272,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="C:\SDL\include;..\Quake;."
+				AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -329,9 +320,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -346,55 +334,55 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\Quake\cd_sdl.c"
+				RelativePath="..\..\Quake\cd_sdl.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\chase.c"
+				RelativePath="..\..\Quake\chase.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cl_demo.c"
+				RelativePath="..\..\Quake\cl_demo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cl_input.c"
+				RelativePath="..\..\Quake\cl_input.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cl_main.c"
+				RelativePath="..\..\Quake\cl_main.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cl_parse.c"
+				RelativePath="..\..\Quake\cl_parse.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cl_tent.c"
+				RelativePath="..\..\Quake\cl_tent.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cmd.c"
+				RelativePath="..\..\Quake\cmd.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\common.c"
+				RelativePath="..\..\Quake\common.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\conback.c"
+				RelativePath="..\..\Quake\conback.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\console.c"
+				RelativePath="..\..\Quake\console.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\crc.c"
+				RelativePath="..\..\Quake\crc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cvar.c"
+				RelativePath="..\..\Quake\cvar.c"
 				>
 			</File>
 			<File
@@ -402,203 +390,203 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_draw.c"
+				RelativePath="..\..\Quake\gl_draw.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_fog.c"
+				RelativePath="..\..\Quake\gl_fog.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_mesh.c"
+				RelativePath="..\..\Quake\gl_mesh.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_model.c"
+				RelativePath="..\..\Quake\gl_model.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_refrag.c"
+				RelativePath="..\..\Quake\gl_refrag.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_rlight.c"
+				RelativePath="..\..\Quake\gl_rlight.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_rmain.c"
+				RelativePath="..\..\Quake\gl_rmain.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_rmisc.c"
+				RelativePath="..\..\Quake\gl_rmisc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_screen.c"
+				RelativePath="..\..\Quake\gl_screen.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_sky.c"
+				RelativePath="..\..\Quake\gl_sky.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_texmgr.c"
+				RelativePath="..\..\Quake\gl_texmgr.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_vidsdl.c"
+				RelativePath="..\..\Quake\gl_vidsdl.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_warp.c"
+				RelativePath="..\..\Quake\gl_warp.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\host.c"
+				RelativePath="..\..\Quake\host.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\host_cmd.c"
+				RelativePath="..\..\Quake\host_cmd.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\image.c"
+				RelativePath="..\..\Quake\image.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\in_sdl.c"
+				RelativePath="..\..\Quake\in_sdl.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\keys.c"
+				RelativePath="..\..\Quake\keys.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\main_sdl.c"
+				RelativePath="..\..\Quake\main_sdl.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\mathlib.c"
+				RelativePath="..\..\Quake\mathlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\menu.c"
+				RelativePath="..\..\Quake\menu.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_dgrm.c"
+				RelativePath="..\..\Quake\net_dgrm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_loop.c"
+				RelativePath="..\..\Quake\net_loop.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_main.c"
+				RelativePath="..\..\Quake\net_main.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_win.c"
+				RelativePath="..\..\Quake\net_win.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_wins.c"
+				RelativePath="..\..\Quake\net_wins.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_wipx.c"
+				RelativePath="..\..\Quake\net_wipx.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\pl_win.c"
+				RelativePath="..\..\Quake\pl_win.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\pr_cmds.c"
+				RelativePath="..\..\Quake\pr_cmds.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\pr_edict.c"
+				RelativePath="..\..\Quake\pr_edict.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\pr_exec.c"
+				RelativePath="..\..\Quake\pr_exec.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\r_alias.c"
+				RelativePath="..\..\Quake\r_alias.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\r_brush.c"
+				RelativePath="..\..\Quake\r_brush.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\r_part.c"
+				RelativePath="..\..\Quake\r_part.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\r_sprite.c"
+				RelativePath="..\..\Quake\r_sprite.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\r_world.c"
+				RelativePath="..\..\Quake\r_world.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sbar.c"
+				RelativePath="..\..\Quake\sbar.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\snd_dma.c"
+				RelativePath="..\..\Quake\snd_dma.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\snd_mem.c"
+				RelativePath="..\..\Quake\snd_mem.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\snd_mix.c"
+				RelativePath="..\..\Quake\snd_mix.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\snd_sdl.c"
+				RelativePath="..\..\Quake\snd_sdl.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sv_main.c"
+				RelativePath="..\..\Quake\sv_main.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sv_move.c"
+				RelativePath="..\..\Quake\sv_move.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sv_phys.c"
+				RelativePath="..\..\Quake\sv_phys.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sv_user.c"
+				RelativePath="..\..\Quake\sv_user.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sys_sdl_win.c"
+				RelativePath="..\..\Quake\sys_sdl_win.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\view.c"
+				RelativePath="..\..\Quake\view.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\wad.c"
+				RelativePath="..\..\Quake\wad.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\world.c"
+				RelativePath="..\..\Quake\world.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\zone.c"
+				RelativePath="..\..\Quake\zone.c"
 				>
 			</File>
 		</Filter>
@@ -608,55 +596,51 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\Quake\anorm_dots.h"
+				RelativePath="..\..\Quake\anorm_dots.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\anorms.h"
+				RelativePath="..\..\Quake\anorms.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\arch_def.h"
+				RelativePath="..\..\Quake\arch_def.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\bspfile.h"
+				RelativePath="..\..\Quake\bspfile.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cdaudio.h"
+				RelativePath="..\..\Quake\cdaudio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\client.h"
+				RelativePath="..\..\Quake\client.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cmd.h"
+				RelativePath="..\..\Quake\cmd.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\common.h"
+				RelativePath="..\..\Quake\common.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\conback.h"
+				RelativePath="..\..\Quake\conback.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\console.h"
+				RelativePath="..\..\Quake\console.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\crc.h"
+				RelativePath="..\..\Quake\crc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\cvar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Quake\d_ifacea.h"
+				RelativePath="..\..\Quake\cvar.h"
 				>
 			</File>
 			<File
@@ -664,167 +648,167 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\draw.h"
+				RelativePath="..\..\Quake\draw.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_model.h"
+				RelativePath="..\..\Quake\gl_model.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_texmgr.h"
+				RelativePath="..\..\Quake\gl_texmgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\gl_warp_sin.h"
+				RelativePath="..\..\Quake\gl_warp_sin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\glquake.h"
+				RelativePath="..\..\Quake\glquake.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\image.h"
+				RelativePath="..\..\Quake\image.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\input.h"
+				RelativePath="..\..\Quake\input.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\keys.h"
+				RelativePath="..\..\Quake\keys.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\mathlib.h"
+				RelativePath="..\..\Quake\mathlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\menu.h"
+				RelativePath="..\..\Quake\menu.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\modelgen.h"
+				RelativePath="..\..\Quake\modelgen.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net.h"
+				RelativePath="..\..\Quake\net.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_defs.h"
+				RelativePath="..\..\Quake\net_defs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_dgrm.h"
+				RelativePath="..\..\Quake\net_dgrm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_loop.h"
+				RelativePath="..\..\Quake\net_loop.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_sys.h"
+				RelativePath="..\..\Quake\net_sys.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_wins.h"
+				RelativePath="..\..\Quake\net_wins.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\net_wipx.h"
+				RelativePath="..\..\Quake\net_wipx.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\platform.h"
+				RelativePath="..\..\Quake\platform.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\pr_comp.h"
+				RelativePath="..\..\Quake\pr_comp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\progdefs.h"
+				RelativePath="..\..\Quake\progdefs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\progs.h"
+				RelativePath="..\..\Quake\progs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\protocol.h"
+				RelativePath="..\..\Quake\protocol.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\q_stdinc.h"
+				RelativePath="..\..\Quake\q_stdinc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\qs_bmp.h"
+				RelativePath="..\..\Quake\qs_bmp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\quakedef.h"
+				RelativePath="..\..\Quake\quakedef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\render.h"
+				RelativePath="..\..\Quake\render.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\resource.h"
+				RelativePath="..\..\Quake\resource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sbar.h"
+				RelativePath="..\..\Quake\sbar.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\screen.h"
+				RelativePath="..\..\Quake\screen.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\server.h"
+				RelativePath="..\..\Quake\server.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sound.h"
+				RelativePath="..\..\Quake\sound.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\spritegn.h"
+				RelativePath="..\..\Quake\spritegn.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\sys.h"
+				RelativePath="..\..\Quake\sys.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\vid.h"
+				RelativePath="..\..\Quake\vid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\view.h"
+				RelativePath="..\..\Quake\view.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\wad.h"
+				RelativePath="..\..\Quake\wad.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\winquake.h"
+				RelativePath="..\..\Quake\winquake.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\world.h"
+				RelativePath="..\..\Quake\world.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\wsaerror.h"
+				RelativePath="..\..\Quake\wsaerror.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Quake\zone.h"
+				RelativePath="..\..\Quake\zone.h"
 				>
 			</File>
 		</Filter>
@@ -834,7 +818,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\QuakeSpasm.rc"
+				RelativePath="..\QuakeSpasm.rc"
 				>
 			</File>
 		</Filter>