diff --git a/.gitignore b/.gitignore index 982aa44..a40a54b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,14 @@ -bin/ *.opendb *.opensdf *.sdf *.suo *.user -config/visual-studio/.vs/ -config/visual-studio/vk_layer_settings.txt -config/visual-studio/vk_report -config/visual-studio/*.log -config/visual-studio/*.psess -config/visual-studio/*.vspx +bin/ tools/bin2hex.exe tools/bin2hex.obj +visual-studio/.vs/ +visual-studio/vk_layer_settings.txt +visual-studio/vk_report +visual-studio/*.log +visual-studio/*.psess +visual-studio/*.vspx diff --git a/third_party/include/stb_image.h b/src/engine/renderer/jpeg/stb_image.h similarity index 100% rename from third_party/include/stb_image.h rename to src/engine/renderer/jpeg/stb_image.h diff --git a/third_party/include/tiny_jpeg.h b/src/engine/renderer/jpeg/tiny_jpeg.h similarity index 100% rename from third_party/include/tiny_jpeg.h rename to src/engine/renderer/jpeg/tiny_jpeg.h diff --git a/src/engine/renderer/tr_image.c b/src/engine/renderer/tr_image.c index ece7075..d8f51aa 100644 --- a/src/engine/renderer/tr_image.c +++ b/src/engine/renderer/tr_image.c @@ -46,10 +46,10 @@ static void* q3_stbi_realloc(void* p, size_t old_size, size_t new_size) { #define STBI_FREE q3_stbi_free #define STBI_REALLOC_SIZED q3_stbi_realloc #define STB_IMAGE_IMPLEMENTATION -#include "stb_image.h" +#include "jpeg/stb_image.h" #define TJE_IMPLEMENTATION -#include "tiny_jpeg.h" +#include "jpeg/tiny_jpeg.h" static void LoadBMP( const char *name, byte **pic, int *width, int *height ); static void LoadTGA( const char *name, byte **pic, int *width, int *height ); diff --git a/third_party/include/vulkan/GLSL.std.450.h b/src/engine/renderer/vulkan/GLSL.std.450.h similarity index 100% rename from third_party/include/vulkan/GLSL.std.450.h rename to src/engine/renderer/vulkan/GLSL.std.450.h diff --git a/third_party/include/vulkan/spirv.h b/src/engine/renderer/vulkan/spirv.h similarity index 100% rename from third_party/include/vulkan/spirv.h rename to src/engine/renderer/vulkan/spirv.h diff --git a/third_party/include/vulkan/spirv.hpp b/src/engine/renderer/vulkan/spirv.hpp similarity index 100% rename from third_party/include/vulkan/spirv.hpp rename to src/engine/renderer/vulkan/spirv.hpp diff --git a/third_party/include/vulkan/spirv.hpp11 b/src/engine/renderer/vulkan/spirv.hpp11 similarity index 100% rename from third_party/include/vulkan/spirv.hpp11 rename to src/engine/renderer/vulkan/spirv.hpp11 diff --git a/third_party/include/vulkan/spirv.json b/src/engine/renderer/vulkan/spirv.json similarity index 100% rename from third_party/include/vulkan/spirv.json rename to src/engine/renderer/vulkan/spirv.json diff --git a/third_party/include/vulkan/spirv.lua b/src/engine/renderer/vulkan/spirv.lua similarity index 100% rename from third_party/include/vulkan/spirv.lua rename to src/engine/renderer/vulkan/spirv.lua diff --git a/third_party/include/vulkan/spirv.py b/src/engine/renderer/vulkan/spirv.py similarity index 100% rename from third_party/include/vulkan/spirv.py rename to src/engine/renderer/vulkan/spirv.py diff --git a/third_party/include/vulkan/vk_icd.h b/src/engine/renderer/vulkan/vk_icd.h similarity index 100% rename from third_party/include/vulkan/vk_icd.h rename to src/engine/renderer/vulkan/vk_icd.h diff --git a/third_party/include/vulkan/vk_layer.h b/src/engine/renderer/vulkan/vk_layer.h similarity index 100% rename from third_party/include/vulkan/vk_layer.h rename to src/engine/renderer/vulkan/vk_layer.h diff --git a/third_party/include/vulkan/vk_layer_dispatch_table.h b/src/engine/renderer/vulkan/vk_layer_dispatch_table.h similarity index 100% rename from third_party/include/vulkan/vk_layer_dispatch_table.h rename to src/engine/renderer/vulkan/vk_layer_dispatch_table.h diff --git a/third_party/include/vulkan/vk_platform.h b/src/engine/renderer/vulkan/vk_platform.h similarity index 100% rename from third_party/include/vulkan/vk_platform.h rename to src/engine/renderer/vulkan/vk_platform.h diff --git a/third_party/include/vulkan/vk_sdk_platform.h b/src/engine/renderer/vulkan/vk_sdk_platform.h similarity index 100% rename from third_party/include/vulkan/vk_sdk_platform.h rename to src/engine/renderer/vulkan/vk_sdk_platform.h diff --git a/third_party/include/vulkan/vulkan.h b/src/engine/renderer/vulkan/vulkan.h similarity index 100% rename from third_party/include/vulkan/vulkan.h rename to src/engine/renderer/vulkan/vulkan.h diff --git a/third_party/include/vulkan/vulkan.hpp b/src/engine/renderer/vulkan/vulkan.hpp similarity index 100% rename from third_party/include/vulkan/vulkan.hpp rename to src/engine/renderer/vulkan/vulkan.hpp diff --git a/config/visual-studio/botlib.vcxproj b/visual-studio/botlib.vcxproj similarity index 85% rename from config/visual-studio/botlib.vcxproj rename to visual-studio/botlib.vcxproj index 9a55d26..855ed8f 100644 --- a/config/visual-studio/botlib.vcxproj +++ b/visual-studio/botlib.vcxproj @@ -103,196 +103,196 @@ - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) EnableFastChecks @@ -301,39 +301,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/visual-studio/botlib.vcxproj.filters b/visual-studio/botlib.vcxproj.filters similarity index 50% rename from config/visual-studio/botlib.vcxproj.filters rename to visual-studio/botlib.vcxproj.filters index 3b77a03..cbd2fe3 100644 --- a/config/visual-studio/botlib.vcxproj.filters +++ b/visual-studio/botlib.vcxproj.filters @@ -11,189 +11,189 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source 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 - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/config/visual-studio/cgame.def b/visual-studio/cgame.def similarity index 100% rename from config/visual-studio/cgame.def rename to visual-studio/cgame.def diff --git a/config/visual-studio/cgame.vcxproj b/visual-studio/cgame.vcxproj similarity index 91% rename from config/visual-studio/cgame.vcxproj rename to visual-studio/cgame.vcxproj index 178dae0..5aaee22 100644 --- a/config/visual-studio/cgame.vcxproj +++ b/visual-studio/cgame.vcxproj @@ -125,145 +125,145 @@ - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed WIN32;NDEBUG;_WINDOWS - + Disabled WIN32;_DEBUG;_WINDOWS MaxSpeed @@ -271,11 +271,11 @@ - - - - - + + + + + diff --git a/config/visual-studio/cgame.vcxproj.filters b/visual-studio/cgame.vcxproj.filters similarity index 56% rename from config/visual-studio/cgame.vcxproj.filters rename to visual-studio/cgame.vcxproj.filters index 3d18922..53f15ef 100644 --- a/config/visual-studio/cgame.vcxproj.filters +++ b/visual-studio/cgame.vcxproj.filters @@ -11,93 +11,93 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/config/visual-studio/game.def b/visual-studio/game.def similarity index 100% rename from config/visual-studio/game.def rename to visual-studio/game.def diff --git a/config/visual-studio/game.vcxproj b/visual-studio/game.vcxproj similarity index 88% rename from config/visual-studio/game.vcxproj rename to visual-studio/game.vcxproj index 2d43de0..7b921e1 100644 --- a/config/visual-studio/game.vcxproj +++ b/visual-studio/game.vcxproj @@ -125,199 +125,199 @@ - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed WIN32;NDEBUG;_WINDOWS;GLOBALRANK - + Disabled WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK MaxSpeed @@ -325,33 +325,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/visual-studio/game.vcxproj.filters b/visual-studio/game.vcxproj.filters similarity index 55% rename from config/visual-studio/game.vcxproj.filters rename to visual-studio/game.vcxproj.filters index e0283c9..d6de4e2 100644 --- a/config/visual-studio/game.vcxproj.filters +++ b/visual-studio/game.vcxproj.filters @@ -11,186 +11,186 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source 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 - + Header Files - + Header Files diff --git a/config/visual-studio/props/shared.props b/visual-studio/props/shared.props similarity index 75% rename from config/visual-studio/props/shared.props rename to visual-studio/props/shared.props index e6ee2d1..ace4103 100644 --- a/config/visual-studio/props/shared.props +++ b/visual-studio/props/shared.props @@ -3,8 +3,8 @@ - $(ProjectDir)..\..\bin\$(PlatformName)\$(Configuration)\ - $(ProjectDir)..\..\bin\$(PlatformName)\$(Configuration)\intermediate\$(ProjectName)\ + $(ProjectDir)..\bin\$(PlatformName)\$(Configuration)\ + $(ProjectDir)..\bin\$(PlatformName)\$(Configuration)\intermediate\$(ProjectName)\ diff --git a/config/visual-studio/q3_ui.vcxproj b/visual-studio/q3_ui.vcxproj similarity index 92% rename from config/visual-studio/q3_ui.vcxproj rename to visual-studio/q3_ui.vcxproj index 524c39a..e8ef8aa 100644 --- a/config/visual-studio/q3_ui.vcxproj +++ b/visual-studio/q3_ui.vcxproj @@ -125,288 +125,288 @@ - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - - + + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks MaxSpeed WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Q3_UI_EXPORTS - + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS EnableFastChecks @@ -415,10 +415,10 @@ - - - - + + + + diff --git a/config/visual-studio/q3_ui.vcxproj.filters b/visual-studio/q3_ui.vcxproj.filters similarity index 54% rename from config/visual-studio/q3_ui.vcxproj.filters rename to visual-studio/q3_ui.vcxproj.filters index 0b6b1df..9bc0301 100644 --- a/config/visual-studio/q3_ui.vcxproj.filters +++ b/visual-studio/q3_ui.vcxproj.filters @@ -11,144 +11,144 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/config/visual-studio/quake3.sln b/visual-studio/quake3.sln similarity index 100% rename from config/visual-studio/quake3.sln rename to visual-studio/quake3.sln diff --git a/config/visual-studio/quake3.vcxproj b/visual-studio/quake3.vcxproj similarity index 87% rename from config/visual-studio/quake3.vcxproj rename to visual-studio/quake3.vcxproj index 294f96c..b06f724 100644 --- a/config/visual-studio/quake3.vcxproj +++ b/visual-studio/quake3.vcxproj @@ -129,295 +129,295 @@ - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed %(PreprocessorDefinitions) - + Disabled %(PreprocessorDefinitions) MaxSpeed @@ -425,38 +425,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + %(PreprocessorDefinitions) platform;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) diff --git a/config/visual-studio/quake3.vcxproj.filters b/visual-studio/quake3.vcxproj.filters similarity index 55% rename from config/visual-studio/quake3.vcxproj.filters rename to visual-studio/quake3.vcxproj.filters index 9a35b47..a4f2a0c 100644 --- a/config/visual-studio/quake3.vcxproj.filters +++ b/visual-studio/quake3.vcxproj.filters @@ -27,241 +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\platform - + Source Files\platform - + Source Files\platform - + Source Files\platform - + Source Files\platform - + Source Files\platform - + Source Files\platform - + 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 diff --git a/config/visual-studio/renderer.vcxproj b/visual-studio/renderer.vcxproj similarity index 61% rename from config/visual-studio/renderer.vcxproj rename to visual-studio/renderer.vcxproj index 6e4d52f..25a83d2 100644 --- a/config/visual-studio/renderer.vcxproj +++ b/visual-studio/renderer.vcxproj @@ -64,7 +64,6 @@ Level3 true CompileAsCpp - $(ProjectDir)..\..\third_party\include NDEBUG;%(PreprocessorDefinitions) @@ -84,7 +83,6 @@ true ProgramDatabase CompileAsCpp - $(ProjectDir)..\..\third_party\include _DEBUG;%(PreprocessorDefinitions) @@ -95,52 +93,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/config/visual-studio/renderer.vcxproj.filters b/visual-studio/renderer.vcxproj.filters similarity index 51% rename from config/visual-studio/renderer.vcxproj.filters rename to visual-studio/renderer.vcxproj.filters index a8a9384..b253c68 100644 --- a/config/visual-studio/renderer.vcxproj.filters +++ b/visual-studio/renderer.vcxproj.filters @@ -14,138 +14,138 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files\spirv - + Source Files\spirv - + Source Files\spirv - + Source Files\spirv - + Source Files\spirv - + Source Files\spirv - + Source Files\spirv - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Source Files diff --git a/config/visual-studio/ui.def b/visual-studio/ui.def similarity index 100% rename from config/visual-studio/ui.def rename to visual-studio/ui.def