diff --git a/config/vs2015/quake3.vcxproj b/config/vs2015/quake3.vcxproj index 8bb11b4..0662543 100644 --- a/config/vs2015/quake3.vcxproj +++ b/config/vs2015/quake3.vcxproj @@ -69,12 +69,12 @@ <_ProjectFileVersion>10.0.30319.1 - ..\..\build\$(PlatformName)\$(Configuration)\binaries\ - ..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\ + ..\..\binaries\$(PlatformName)\$(Configuration)\ + ..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\ true true - ..\..\build\$(PlatformName)\$(Configuration)\binaries\ - ..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\ + ..\..\binaries\$(PlatformName)\$(Configuration)\ + ..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\ false false AllRules.ruleset @@ -99,12 +99,12 @@ C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;$(LibraryPath) - ..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\ - ..\..\build\$(PlatformName)\$(Configuration)\binaries\ + ..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\ + ..\..\binaries\$(PlatformName)\$(Configuration)\ - ..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\ - ..\..\build\$(PlatformName)\$(Configuration)\binaries\ + ..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\ + ..\..\binaries\$(PlatformName)\$(Configuration)\ @@ -257,7 +257,7 @@ - + Disabled Disabled %(PreprocessorDefinitions) @@ -267,7 +267,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -277,7 +277,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -287,7 +287,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -297,7 +297,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -307,7 +307,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -317,7 +317,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -327,7 +327,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -337,7 +337,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -347,7 +347,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -357,7 +357,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -367,7 +367,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -377,7 +377,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -387,7 +387,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -397,7 +397,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -407,7 +407,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -417,7 +417,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -427,7 +427,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -437,7 +437,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -447,7 +447,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -457,7 +457,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -467,7 +467,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -477,7 +477,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -487,7 +487,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -497,7 +497,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -507,7 +507,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -517,7 +517,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -527,7 +527,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -537,7 +537,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -547,7 +547,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -557,7 +557,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -567,7 +567,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -577,7 +577,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -587,7 +587,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -597,7 +597,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -607,7 +607,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -617,7 +617,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -627,7 +627,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -637,7 +637,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -647,7 +647,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -657,7 +657,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -667,7 +667,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -677,7 +677,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -687,7 +687,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -697,7 +697,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -707,7 +707,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -717,7 +717,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -727,7 +727,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -737,7 +737,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -749,40 +749,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + %(PreprocessorDefinitions) %(PreprocessorDefinitions) win32;%(AdditionalIncludeDirectories) diff --git a/config/vs2015/quake3.vcxproj.filters b/config/vs2015/quake3.vcxproj.filters index dc03d06..2c9318e 100644 --- a/config/vs2015/quake3.vcxproj.filters +++ b/config/vs2015/quake3.vcxproj.filters @@ -27,247 +27,241 @@ - + Source Files\server - + Source Files\server - + Source Files\server - + Source Files\server - + Source Files\server - + Source Files\server - + Source Files\server - + Source Files\server - + Source Files\server - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\client - + Source Files\win32 - + Source Files\win32 - + Source Files\win32 - + Source Files\win32 - + Source Files\win32 - + Source Files\win32 - + Source Files\win32 - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Source Files\common - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - - Resource Files - - - Resource Files - - + Resource Files - + Resource Files diff --git a/config/vs2015/renderer.vcxproj b/config/vs2015/renderer.vcxproj index 5923031..9b287ad 100644 --- a/config/vs2015/renderer.vcxproj +++ b/config/vs2015/renderer.vcxproj @@ -453,7 +453,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -465,7 +465,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -477,7 +477,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + Disabled Disabled %(PreprocessorDefinitions) @@ -923,17 +923,17 @@ - - + + - - + + - + diff --git a/config/vs2015/renderer.vcxproj.filters b/config/vs2015/renderer.vcxproj.filters index 2e0af1b..3e635d8 100644 --- a/config/vs2015/renderer.vcxproj.filters +++ b/config/vs2015/renderer.vcxproj.filters @@ -89,13 +89,13 @@ Source Files - + Source Files - + Source Files - + Source Files @@ -208,19 +208,19 @@ - + Header Files - + Header Files Header Files - + Header Files - + Header Files @@ -232,7 +232,7 @@ Header Files - + Header Files diff --git a/source/client/cl_cgame.c b/source/engine/client/cl_cgame.c similarity index 99% rename from source/client/cl_cgame.c rename to source/engine/client/cl_cgame.c index d38ec6c..4c51ba4 100644 --- a/source/client/cl_cgame.c +++ b/source/engine/client/cl_cgame.c @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "client.h" -#include "../game/botlib.h" +#include "../../game/botlib.h" extern botlib_export_t *botlib_export; diff --git a/source/client/cl_cin.c b/source/engine/client/cl_cin.c similarity index 100% rename from source/client/cl_cin.c rename to source/engine/client/cl_cin.c diff --git a/source/client/cl_console.c b/source/engine/client/cl_console.c similarity index 100% rename from source/client/cl_console.c rename to source/engine/client/cl_console.c diff --git a/source/client/cl_input.c b/source/engine/client/cl_input.c similarity index 100% rename from source/client/cl_input.c rename to source/engine/client/cl_input.c diff --git a/source/client/cl_keys.c b/source/engine/client/cl_keys.c similarity index 100% rename from source/client/cl_keys.c rename to source/engine/client/cl_keys.c diff --git a/source/client/cl_main.c b/source/engine/client/cl_main.c similarity index 100% rename from source/client/cl_main.c rename to source/engine/client/cl_main.c diff --git a/source/client/cl_net_chan.c b/source/engine/client/cl_net_chan.c similarity index 99% rename from source/client/cl_net_chan.c rename to source/engine/client/cl_net_chan.c index 2ee60e9..e38c02a 100644 --- a/source/client/cl_net_chan.c +++ b/source/engine/client/cl_net_chan.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "../qcommon/qcommon.h" #include "client.h" diff --git a/source/client/cl_parse.c b/source/engine/client/cl_parse.c similarity index 100% rename from source/client/cl_parse.c rename to source/engine/client/cl_parse.c diff --git a/source/client/cl_scrn.c b/source/engine/client/cl_scrn.c similarity index 100% rename from source/client/cl_scrn.c rename to source/engine/client/cl_scrn.c diff --git a/source/client/cl_ui.c b/source/engine/client/cl_ui.c similarity index 99% rename from source/client/cl_ui.c rename to source/engine/client/cl_ui.c index 68774da..b4ca3e3 100644 --- a/source/client/cl_ui.c +++ b/source/engine/client/cl_ui.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "client.h" -#include "../game/botlib.h" +#include "../../game/botlib.h" extern botlib_export_t *botlib_export; diff --git a/source/client/client.h b/source/engine/client/client.h similarity index 99% rename from source/client/client.h rename to source/engine/client/client.h index b8ac6b4..d55c2f9 100644 --- a/source/client/client.h +++ b/source/engine/client/client.h @@ -21,14 +21,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // client.h -- primary header for client -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "../qcommon/qcommon.h" #include "../renderer/tr_public.h" -#include "../q3_ui/ui_public.h" +#include "../../q3_ui/ui_public.h" #include "keys.h" #include "snd_public.h" -#include "../cgame/cg_public.h" -#include "../game/bg_public.h" +#include "../../cgame/cg_public.h" +#include "../../game/bg_public.h" #define RETRANSMIT_TIMEOUT 3000 // time between connection packet retransmits diff --git a/source/client/keys.h b/source/engine/client/keys.h similarity index 98% rename from source/client/keys.h rename to source/engine/client/keys.h index d716907..80ae955 100644 --- a/source/client/keys.h +++ b/source/engine/client/keys.h @@ -19,7 +19,7 @@ along with Foobar; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../q3_ui/keycodes.h" +#include "../../q3_ui/keycodes.h" #define MAX_KEYS 256 diff --git a/source/client/snd_adpcm.c b/source/engine/client/snd_adpcm.c similarity index 100% rename from source/client/snd_adpcm.c rename to source/engine/client/snd_adpcm.c diff --git a/source/client/snd_dma.c b/source/engine/client/snd_dma.c similarity index 100% rename from source/client/snd_dma.c rename to source/engine/client/snd_dma.c diff --git a/source/client/snd_local.h b/source/engine/client/snd_local.h similarity index 99% rename from source/client/snd_local.h rename to source/engine/client/snd_local.h index 466c52b..c5e2452 100644 --- a/source/client/snd_local.h +++ b/source/engine/client/snd_local.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // snd_local.h -- private sound definations -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "../qcommon/qcommon.h" #include "snd_public.h" diff --git a/source/client/snd_mem.c b/source/engine/client/snd_mem.c similarity index 100% rename from source/client/snd_mem.c rename to source/engine/client/snd_mem.c diff --git a/source/client/snd_mix.c b/source/engine/client/snd_mix.c similarity index 100% rename from source/client/snd_mix.c rename to source/engine/client/snd_mix.c diff --git a/source/client/snd_public.h b/source/engine/client/snd_public.h similarity index 100% rename from source/client/snd_public.h rename to source/engine/client/snd_public.h diff --git a/source/client/snd_wavelet.c b/source/engine/client/snd_wavelet.c similarity index 100% rename from source/client/snd_wavelet.c rename to source/engine/client/snd_wavelet.c diff --git a/source/qcommon/cm_load.c b/source/engine/qcommon/cm_load.c similarity index 100% rename from source/qcommon/cm_load.c rename to source/engine/qcommon/cm_load.c diff --git a/source/qcommon/cm_local.h b/source/engine/qcommon/cm_local.h similarity index 99% rename from source/qcommon/cm_local.h rename to source/engine/qcommon/cm_local.h index 1c3a632..4f3e175 100644 --- a/source/qcommon/cm_local.h +++ b/source/engine/qcommon/cm_local.h @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" #include "cm_polylib.h" diff --git a/source/qcommon/cm_patch.c b/source/engine/qcommon/cm_patch.c similarity index 100% rename from source/qcommon/cm_patch.c rename to source/engine/qcommon/cm_patch.c diff --git a/source/qcommon/cm_patch.h b/source/engine/qcommon/cm_patch.h similarity index 100% rename from source/qcommon/cm_patch.h rename to source/engine/qcommon/cm_patch.h diff --git a/source/qcommon/cm_polylib.c b/source/engine/qcommon/cm_polylib.c similarity index 100% rename from source/qcommon/cm_polylib.c rename to source/engine/qcommon/cm_polylib.c diff --git a/source/qcommon/cm_polylib.h b/source/engine/qcommon/cm_polylib.h similarity index 100% rename from source/qcommon/cm_polylib.h rename to source/engine/qcommon/cm_polylib.h diff --git a/source/qcommon/cm_public.h b/source/engine/qcommon/cm_public.h similarity index 100% rename from source/qcommon/cm_public.h rename to source/engine/qcommon/cm_public.h diff --git a/source/qcommon/cm_test.c b/source/engine/qcommon/cm_test.c similarity index 100% rename from source/qcommon/cm_test.c rename to source/engine/qcommon/cm_test.c diff --git a/source/qcommon/cm_trace.c b/source/engine/qcommon/cm_trace.c similarity index 100% rename from source/qcommon/cm_trace.c rename to source/engine/qcommon/cm_trace.c diff --git a/source/qcommon/cmd.c b/source/engine/qcommon/cmd.c similarity index 99% rename from source/qcommon/cmd.c rename to source/engine/qcommon/cmd.c index c33bc84..0b1e4ab 100644 --- a/source/qcommon/cmd.c +++ b/source/engine/qcommon/cmd.c @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // cmd.c -- Quake script command processing module -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" #define MAX_CMD_BUFFER 16384 diff --git a/source/qcommon/common.c b/source/engine/qcommon/common.c similarity index 99% rename from source/qcommon/common.c rename to source/engine/qcommon/common.c index 0efcf9e..a8e8c1f 100644 --- a/source/qcommon/common.c +++ b/source/engine/qcommon/common.c @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // common.c -- misc functions used in client and server -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" #include #ifdef __linux__ diff --git a/source/qcommon/cvar.c b/source/engine/qcommon/cvar.c similarity index 99% rename from source/qcommon/cvar.c rename to source/engine/qcommon/cvar.c index 16e00d5..0f52d58 100644 --- a/source/qcommon/cvar.c +++ b/source/engine/qcommon/cvar.c @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // cvar.c -- dynamic variable tracking -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" cvar_t *cvar_vars; diff --git a/source/qcommon/files.c b/source/engine/qcommon/files.c similarity index 99% rename from source/qcommon/files.c rename to source/engine/qcommon/files.c index ac45c08..216d257 100644 --- a/source/qcommon/files.c +++ b/source/engine/qcommon/files.c @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *****************************************************************************/ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" #include "unzip.h" diff --git a/source/qcommon/huffman.c b/source/engine/qcommon/huffman.c similarity index 99% rename from source/qcommon/huffman.c rename to source/engine/qcommon/huffman.c index 1dcaf3f..74e3ecf 100644 --- a/source/qcommon/huffman.c +++ b/source/engine/qcommon/huffman.c @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Compression book. The ranks are not actually stored, but implicitly defined * by the location of a node within a doubly-linked list */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" static int bloc = 0; diff --git a/source/qcommon/md4.c b/source/engine/qcommon/md4.c similarity index 100% rename from source/qcommon/md4.c rename to source/engine/qcommon/md4.c diff --git a/source/qcommon/msg.c b/source/engine/qcommon/msg.c similarity index 99% rename from source/qcommon/msg.c rename to source/engine/qcommon/msg.c index f453ec7..c4a34b6 100644 --- a/source/qcommon/msg.c +++ b/source/engine/qcommon/msg.c @@ -19,7 +19,7 @@ along with Foobar; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" static huffman_t msgHuff; diff --git a/source/qcommon/net_chan.c b/source/engine/qcommon/net_chan.c similarity index 99% rename from source/qcommon/net_chan.c rename to source/engine/qcommon/net_chan.c index b9dbdb4..b649fa0 100644 --- a/source/qcommon/net_chan.c +++ b/source/engine/qcommon/net_chan.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" /* diff --git a/source/qcommon/qcommon.h b/source/engine/qcommon/qcommon.h similarity index 100% rename from source/qcommon/qcommon.h rename to source/engine/qcommon/qcommon.h diff --git a/source/qcommon/qfiles.h b/source/engine/qcommon/qfiles.h similarity index 100% rename from source/qcommon/qfiles.h rename to source/engine/qcommon/qfiles.h diff --git a/source/qcommon/unzip.c b/source/engine/qcommon/unzip.c similarity index 100% rename from source/qcommon/unzip.c rename to source/engine/qcommon/unzip.c diff --git a/source/qcommon/unzip.h b/source/engine/qcommon/unzip.h similarity index 100% rename from source/qcommon/unzip.h rename to source/engine/qcommon/unzip.h diff --git a/source/qcommon/vm.c b/source/engine/qcommon/vm.c similarity index 100% rename from source/qcommon/vm.c rename to source/engine/qcommon/vm.c diff --git a/source/qcommon/vm_interpreted.c b/source/engine/qcommon/vm_interpreted.c similarity index 100% rename from source/qcommon/vm_interpreted.c rename to source/engine/qcommon/vm_interpreted.c diff --git a/source/qcommon/vm_local.h b/source/engine/qcommon/vm_local.h similarity index 99% rename from source/qcommon/vm_local.h rename to source/engine/qcommon/vm_local.h index 4bec339..65ed295 100644 --- a/source/qcommon/vm_local.h +++ b/source/engine/qcommon/vm_local.h @@ -19,7 +19,7 @@ along with Foobar; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "qcommon.h" // Max number of arguments to pass from a vm to engine's syscall handler function for the vm. diff --git a/source/engine/renderer/tr_font.c b/source/engine/renderer/tr_font.c index 279e68f..aa46af9 100644 --- a/source/engine/renderer/tr_font.c +++ b/source/engine/renderer/tr_font.c @@ -71,7 +71,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "tr_local.h" -#include "../../qcommon/qcommon.h" +#include "../qcommon/qcommon.h" #ifdef BUILD_FREETYPE #include "../ft2/fterrors.h" diff --git a/source/engine/renderer/tr_local.h b/source/engine/renderer/tr_local.h index 96f80a6..9de4d64 100644 --- a/source/engine/renderer/tr_local.h +++ b/source/engine/renderer/tr_local.h @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define TR_LOCAL_H #include "../../game/q_shared.h" -#include "../../qcommon/qfiles.h" -#include "../../qcommon/qcommon.h" +#include "../qcommon/qfiles.h" +#include "../qcommon/qcommon.h" #include "tr_public.h" #include "qgl.h" diff --git a/source/server/server.h b/source/engine/server/server.h similarity index 99% rename from source/server/server.h rename to source/engine/server/server.h index 589e1c4..946eb4f 100644 --- a/source/server/server.h +++ b/source/engine/server/server.h @@ -21,10 +21,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // server.h -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "../qcommon/qcommon.h" -#include "../game/g_public.h" -#include "../game/bg_public.h" +#include "../../game/g_public.h" +#include "../../game/bg_public.h" //============================================================================= diff --git a/source/server/sv_bot.c b/source/engine/server/sv_bot.c similarity index 99% rename from source/server/sv_bot.c rename to source/engine/server/sv_bot.c index 6de4256..3e900f4 100644 --- a/source/server/sv_bot.c +++ b/source/engine/server/sv_bot.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // sv_bot.c #include "server.h" -#include "../game/botlib.h" +#include "../../game/botlib.h" typedef struct bot_debugpoly_s { diff --git a/source/server/sv_ccmds.c b/source/engine/server/sv_ccmds.c similarity index 100% rename from source/server/sv_ccmds.c rename to source/engine/server/sv_ccmds.c diff --git a/source/server/sv_client.c b/source/engine/server/sv_client.c similarity index 100% rename from source/server/sv_client.c rename to source/engine/server/sv_client.c diff --git a/source/server/sv_game.c b/source/engine/server/sv_game.c similarity index 99% rename from source/server/sv_game.c rename to source/engine/server/sv_game.c index 04e20e7..cb40643 100644 --- a/source/server/sv_game.c +++ b/source/engine/server/sv_game.c @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "server.h" -#include "../game/botlib.h" +#include "../../game/botlib.h" botlib_export_t *botlib_export; diff --git a/source/server/sv_init.c b/source/engine/server/sv_init.c similarity index 100% rename from source/server/sv_init.c rename to source/engine/server/sv_init.c diff --git a/source/server/sv_main.c b/source/engine/server/sv_main.c similarity index 100% rename from source/server/sv_main.c rename to source/engine/server/sv_main.c diff --git a/source/server/sv_net_chan.c b/source/engine/server/sv_net_chan.c similarity index 99% rename from source/server/sv_net_chan.c rename to source/engine/server/sv_net_chan.c index db850aa..e727e3c 100644 --- a/source/server/sv_net_chan.c +++ b/source/engine/server/sv_net_chan.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "../qcommon/qcommon.h" #include "server.h" diff --git a/source/server/sv_snapshot.c b/source/engine/server/sv_snapshot.c similarity index 100% rename from source/server/sv_snapshot.c rename to source/engine/server/sv_snapshot.c diff --git a/source/server/sv_world.c b/source/engine/server/sv_world.c similarity index 100% rename from source/server/sv_world.c rename to source/engine/server/sv_world.c diff --git a/source/win32/background.bmp b/source/engine/win32/background.bmp similarity index 100% rename from source/win32/background.bmp rename to source/engine/win32/background.bmp diff --git a/source/win32/cgame.def b/source/engine/win32/cgame.def similarity index 100% rename from source/win32/cgame.def rename to source/engine/win32/cgame.def diff --git a/source/win32/clear.bmp b/source/engine/win32/clear.bmp similarity index 100% rename from source/win32/clear.bmp rename to source/engine/win32/clear.bmp diff --git a/source/win32/game.def b/source/engine/win32/game.def similarity index 100% rename from source/win32/game.def rename to source/engine/win32/game.def diff --git a/source/win32/glw_win.h b/source/engine/win32/glw_win.h similarity index 100% rename from source/win32/glw_win.h rename to source/engine/win32/glw_win.h diff --git a/source/win32/icon2.ico b/source/engine/win32/icon2.ico similarity index 100% rename from source/win32/icon2.ico rename to source/engine/win32/icon2.ico diff --git a/source/win32/mod-sdk-setup/GameSource.VCT b/source/engine/win32/mod-sdk-setup/GameSource.VCT similarity index 100% rename from source/win32/mod-sdk-setup/GameSource.VCT rename to source/engine/win32/mod-sdk-setup/GameSource.VCT diff --git a/source/win32/mod-sdk-setup/QIIIA Game Source License.doc b/source/engine/win32/mod-sdk-setup/QIIIA Game Source License.doc similarity index 100% rename from source/win32/mod-sdk-setup/QIIIA Game Source License.doc rename to source/engine/win32/mod-sdk-setup/QIIIA Game Source License.doc diff --git a/source/win32/mod-sdk-setup/bin/lcc.exe b/source/engine/win32/mod-sdk-setup/bin/lcc.exe similarity index 100% rename from source/win32/mod-sdk-setup/bin/lcc.exe rename to source/engine/win32/mod-sdk-setup/bin/lcc.exe diff --git a/source/win32/mod-sdk-setup/bin/q3asm.exe b/source/engine/win32/mod-sdk-setup/bin/q3asm.exe similarity index 100% rename from source/win32/mod-sdk-setup/bin/q3asm.exe rename to source/engine/win32/mod-sdk-setup/bin/q3asm.exe diff --git a/source/win32/mod-sdk-setup/bin/q3cpp.exe b/source/engine/win32/mod-sdk-setup/bin/q3cpp.exe similarity index 100% rename from source/win32/mod-sdk-setup/bin/q3cpp.exe rename to source/engine/win32/mod-sdk-setup/bin/q3cpp.exe diff --git a/source/win32/mod-sdk-setup/bin/q3rcc.exe b/source/engine/win32/mod-sdk-setup/bin/q3rcc.exe similarity index 100% rename from source/win32/mod-sdk-setup/bin/q3rcc.exe rename to source/engine/win32/mod-sdk-setup/bin/q3rcc.exe diff --git a/source/win32/qe3.ico b/source/engine/win32/qe3.ico similarity index 100% rename from source/win32/qe3.ico rename to source/engine/win32/qe3.ico diff --git a/source/win32/resource.h b/source/engine/win32/resource.h similarity index 100% rename from source/win32/resource.h rename to source/engine/win32/resource.h diff --git a/source/win32/ui.def b/source/engine/win32/ui.def similarity index 100% rename from source/win32/ui.def rename to source/engine/win32/ui.def diff --git a/source/win32/win_gamma.c b/source/engine/win32/win_gamma.c similarity index 98% rename from source/win32/win_gamma.c rename to source/engine/win32/win_gamma.c index 9979c60..2a6b117 100644 --- a/source/win32/win_gamma.c +++ b/source/engine/win32/win_gamma.c @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ** WIN_GAMMA.C */ #include -#include "../engine/renderer/tr_local.h" +#include "../renderer/tr_local.h" #include "../qcommon/qcommon.h" #include "glw_win.h" #include "win_local.h" diff --git a/source/win32/win_glimp.c b/source/engine/win32/win_glimp.c similarity index 99% rename from source/win32/win_glimp.c rename to source/engine/win32/win_glimp.c index 96762a8..1d417c3 100644 --- a/source/win32/win_glimp.c +++ b/source/engine/win32/win_glimp.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ** related functions that are relevant ONLY to win_glimp.c */ #include -#include "../engine/renderer/tr_local.h" +#include "../renderer/tr_local.h" #include "../qcommon/qcommon.h" #include "resource.h" #include "glw_win.h" diff --git a/source/win32/win_input.c b/source/engine/win32/win_input.c similarity index 100% rename from source/win32/win_input.c rename to source/engine/win32/win_input.c diff --git a/source/win32/win_local.h b/source/engine/win32/win_local.h similarity index 100% rename from source/win32/win_local.h rename to source/engine/win32/win_local.h diff --git a/source/win32/win_main.c b/source/engine/win32/win_main.c similarity index 100% rename from source/win32/win_main.c rename to source/engine/win32/win_main.c diff --git a/source/win32/win_net.c b/source/engine/win32/win_net.c similarity index 99% rename from source/win32/win_net.c rename to source/engine/win32/win_net.c index 7657590..777049b 100644 --- a/source/win32/win_net.c +++ b/source/engine/win32/win_net.c @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // net_wins.c -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "../qcommon/qcommon.h" #include "win_local.h" diff --git a/source/win32/win_qgl.c b/source/engine/win32/win_qgl.c similarity index 99% rename from source/win32/win_qgl.c rename to source/engine/win32/win_qgl.c index 99355bf..ccdf366 100644 --- a/source/win32/win_qgl.c +++ b/source/engine/win32/win_qgl.c @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ** QGL_Shutdown() - unloads libraries, NULLs function pointers */ #include -#include "../engine/renderer/tr_local.h" +#include "../renderer/tr_local.h" #include "glw_win.h" void QGL_EnableLogging( qboolean enable ); diff --git a/source/win32/win_shared.c b/source/engine/win32/win_shared.c similarity index 98% rename from source/win32/win_shared.c rename to source/engine/win32/win_shared.c index b0f872d..31e54d9 100644 --- a/source/win32/win_shared.c +++ b/source/engine/win32/win_shared.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../game/q_shared.h" +#include "../../game/q_shared.h" #include "../qcommon/qcommon.h" #include "win_local.h" #include diff --git a/source/win32/win_snd.c b/source/engine/win32/win_snd.c similarity index 100% rename from source/win32/win_snd.c rename to source/engine/win32/win_snd.c diff --git a/source/win32/win_syscon.c b/source/engine/win32/win_syscon.c similarity index 100% rename from source/win32/win_syscon.c rename to source/engine/win32/win_syscon.c diff --git a/source/win32/win_wndproc.c b/source/engine/win32/win_wndproc.c similarity index 100% rename from source/win32/win_wndproc.c rename to source/engine/win32/win_wndproc.c diff --git a/source/win32/winquake.rc b/source/engine/win32/winquake.rc similarity index 100% rename from source/win32/winquake.rc rename to source/engine/win32/winquake.rc