diff --git a/cs/3rd party/BugTrap.vcxproj b/cs/3rd party/BugTrap.vcxproj index 212b52fba..e9ef84ee4 100644 --- a/cs/3rd party/BugTrap.vcxproj +++ b/cs/3rd party/BugTrap.vcxproj @@ -37,7 +37,7 @@ DynamicLibrary MultiByte - v141 + v140 DynamicLibrary @@ -47,7 +47,7 @@ DynamicLibrary MultiByte - v141 + v140 DynamicLibrary diff --git a/cs/3rd party/CxImage/cximage.vcxproj b/cs/3rd party/CxImage/cximage.vcxproj index a23b9862b..7f653d41b 100644 --- a/cs/3rd party/CxImage/cximage.vcxproj +++ b/cs/3rd party/CxImage/cximage.vcxproj @@ -19,7 +19,7 @@ DynamicLibrary - v141 + v140 false MultiByte false @@ -105,6 +105,7 @@ true ProgramDatabase 4100;4611;4702;%(DisableSpecificWarnings) + NotUsing _DEBUG;%(PreprocessorDefinitions) diff --git a/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj b/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj index 8d38990fe..b38ae7167 100644 --- a/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj +++ b/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj @@ -20,7 +20,7 @@ DynamicLibrary - v141 + v140 MultiByte diff --git a/cs/3rd party/ODE/contrib/ode_default.vcxproj b/cs/3rd party/ODE/contrib/ode_default.vcxproj index 6a97cb30c..e1e186677 100644 --- a/cs/3rd party/ODE/contrib/ode_default.vcxproj +++ b/cs/3rd party/ODE/contrib/ode_default.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 Static MultiByte false @@ -37,7 +37,7 @@ DynamicLibrary - v141 + v140 Static MultiByte @@ -94,7 +94,7 @@ true Sync EnableFastChecks - true + false MultiThreadedDLL Fast false diff --git a/cs/3rd party/crypto/crypto.vcxproj b/cs/3rd party/crypto/crypto.vcxproj index 6e3d12980..99e3d0cf9 100644 --- a/cs/3rd party/crypto/crypto.vcxproj +++ b/cs/3rd party/crypto/crypto.vcxproj @@ -24,7 +24,7 @@ DynamicLibrary - v141 + v140 MultiByte @@ -53,6 +53,7 @@ Fast Level4 EditAndContinue + NotUsing $(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) diff --git a/cs/3rd party/glew.vcxproj b/cs/3rd party/glew.vcxproj index 8cdc41b14..73efcc8ab 100644 --- a/cs/3rd party/glew.vcxproj +++ b/cs/3rd party/glew.vcxproj @@ -29,7 +29,7 @@ StaticLibrary false MultiByte - v141 + v140 StaticLibrary diff --git a/cs/3rd party/oalib.vcxproj b/cs/3rd party/oalib.vcxproj index e2828233d..49ed662d4 100644 --- a/cs/3rd party/oalib.vcxproj +++ b/cs/3rd party/oalib.vcxproj @@ -25,7 +25,7 @@ StaticLibrary - v141 + v140 Unicode diff --git a/cs/3rd party/zlib.vcxproj b/cs/3rd party/zlib.vcxproj index f96048248..4d5fd4625 100644 --- a/cs/3rd party/zlib.vcxproj +++ b/cs/3rd party/zlib.vcxproj @@ -33,7 +33,7 @@ StaticLibrary - v141 + v140 MultiByte @@ -43,7 +43,7 @@ StaticLibrary - v141 + v140 MultiByte diff --git a/cs/engine.sln b/cs/engine.sln index 9cd1a59bb..31bb2690d 100644 --- a/cs/engine.sln +++ b/cs/engine.sln @@ -401,8 +401,8 @@ Global {200652A6-043E-4634-8837-87983B3BD5E0}.Mixed_Dedicated|x64.Build.0 = Mixed|Win32 {200652A6-043E-4634-8837-87983B3BD5E0}.Mixed_Dedicated|x86.ActiveCfg = Debug|Win32 {200652A6-043E-4634-8837-87983B3BD5E0}.Mixed|x64.ActiveCfg = Mixed|Win32 - {200652A6-043E-4634-8837-87983B3BD5E0}.Mixed|x86.ActiveCfg = Debug|Win32 - {200652A6-043E-4634-8837-87983B3BD5E0}.Mixed|x86.Build.0 = Debug|Win32 + {200652A6-043E-4634-8837-87983B3BD5E0}.Mixed|x86.ActiveCfg = Mixed|Win32 + {200652A6-043E-4634-8837-87983B3BD5E0}.Mixed|x86.Build.0 = Mixed|Win32 {200652A6-043E-4634-8837-87983B3BD5E0}.Release_Dedicated|x64.ActiveCfg = Mixed|Win32 {200652A6-043E-4634-8837-87983B3BD5E0}.Release_Dedicated|x64.Build.0 = Mixed|Win32 {200652A6-043E-4634-8837-87983B3BD5E0}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -438,8 +438,8 @@ Global {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Mixed_Dedicated|x64.Build.0 = Release|Win32 {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Mixed_Dedicated|x86.ActiveCfg = Mixed|Win32 {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Mixed|x64.ActiveCfg = Mixed|Win32 - {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Mixed|x86.ActiveCfg = Debug|Win32 - {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Mixed|x86.Build.0 = Debug|Win32 + {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Mixed|x86.ActiveCfg = Mixed|Win32 + {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Mixed|x86.Build.0 = Mixed|Win32 {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Release_Dedicated|x64.Build.0 = Release|Win32 {435BAC9A-B225-457D-AB40-C9BD0CC8838C}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -474,8 +474,8 @@ Global {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Mixed_Dedicated|x64.Build.0 = Release|Win32 {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Mixed_Dedicated|x86.ActiveCfg = Mixed|Win32 {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Mixed|x64.ActiveCfg = Mixed|Win32 - {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Mixed|x86.ActiveCfg = Debug|Win32 - {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Mixed|x86.Build.0 = Debug|Win32 + {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Mixed|x86.ActiveCfg = Mixed|Win32 + {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Mixed|x86.Build.0 = Mixed|Win32 {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Release_Dedicated|x64.Build.0 = Release|Win32 {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -492,8 +492,8 @@ Global {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Mixed_Dedicated|x64.Build.0 = Release|Win32 {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Mixed_Dedicated|x86.ActiveCfg = Mixed|Win32 {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Mixed|x64.ActiveCfg = Mixed|Win32 - {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Mixed|x86.ActiveCfg = Debug|Win32 - {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Mixed|x86.Build.0 = Debug|Win32 + {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Mixed|x86.ActiveCfg = Mixed|Win32 + {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Mixed|x86.Build.0 = Mixed|Win32 {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Release_Dedicated|x64.Build.0 = Release|Win32 {963BA4E5-499A-454D-B002-1D5ECE0527A6}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -528,8 +528,8 @@ Global {3F383D3C-FCD8-4170-990B-EB4833F09248}.Mixed_Dedicated|x64.Build.0 = Release|Win32 {3F383D3C-FCD8-4170-990B-EB4833F09248}.Mixed_Dedicated|x86.ActiveCfg = Mixed|Win32 {3F383D3C-FCD8-4170-990B-EB4833F09248}.Mixed|x64.ActiveCfg = Mixed|Win32 - {3F383D3C-FCD8-4170-990B-EB4833F09248}.Mixed|x86.ActiveCfg = Debug|Win32 - {3F383D3C-FCD8-4170-990B-EB4833F09248}.Mixed|x86.Build.0 = Debug|Win32 + {3F383D3C-FCD8-4170-990B-EB4833F09248}.Mixed|x86.ActiveCfg = Mixed|Win32 + {3F383D3C-FCD8-4170-990B-EB4833F09248}.Mixed|x86.Build.0 = Mixed|Win32 {3F383D3C-FCD8-4170-990B-EB4833F09248}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {3F383D3C-FCD8-4170-990B-EB4833F09248}.Release_Dedicated|x64.Build.0 = Release|Win32 {3F383D3C-FCD8-4170-990B-EB4833F09248}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -748,8 +748,8 @@ Global {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Mixed_Dedicated|x86.Build.0 = Release|Win32 {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Mixed|x64.ActiveCfg = Release|Win32 {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Mixed|x64.Build.0 = Release|Win32 - {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Mixed|x86.ActiveCfg = Release|Win32 - {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Mixed|x86.Build.0 = Release|Win32 + {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Mixed|x86.ActiveCfg = Mixed|Win32 + {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Mixed|x86.Build.0 = Mixed|Win32 {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Release_Dedicated|x64.Build.0 = Release|Win32 {0EB257DC-5CFC-44B0-82C9-CE6B158BE473}.Release_Dedicated|x86.ActiveCfg = Release|Win32 diff --git a/cs/engine/layers/xrRender/xrRender_console.cpp b/cs/engine/layers/xrRender/xrRender_console.cpp index 73c324b2d..f64c063c8 100644 --- a/cs/engine/layers/xrRender/xrRender_console.cpp +++ b/cs/engine/layers/xrRender/xrRender_console.cpp @@ -134,6 +134,7 @@ Flags32 ps_r2_ls_flags = { R2FLAG_SUN | R2FLAG_USE_NVSTENCIL | R2FLAG_EXP_SPLIT_SCENE | R2FLAG_EXP_MT_CALC | R3FLAG_DYN_WET_SURF | R3FLAG_VOLUMETRIC_SMOKE + | R3FLAG_USE_DX10_1 //| R3FLAG_MSAA //| R3FLAG_MSAA_OPT | R3FLAG_GBUFFER_OPT diff --git a/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj b/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj index 66869f4fe..7c4d61dda 100644 --- a/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj +++ b/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 MultiByte diff --git a/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj b/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj index 2c38d73ec..f6d4139f5 100644 --- a/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj +++ b/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 MultiByte diff --git a/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj b/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj index cc8198a21..e4cffb8f7 100644 --- a/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj +++ b/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 MultiByte diff --git a/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj b/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj index 13b6b238f..8f2c8fe80 100644 --- a/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj +++ b/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 MultiByte diff --git a/cs/engine/utils/xrCompress/xrCompress.vcxproj b/cs/engine/utils/xrCompress/xrCompress.vcxproj index 7df243b1c..6b38de15c 100644 --- a/cs/engine/utils/xrCompress/xrCompress.vcxproj +++ b/cs/engine/utils/xrCompress/xrCompress.vcxproj @@ -129,7 +129,7 @@ true Sync EnableFastChecks - true + false MultiThreadedDLL false true diff --git a/cs/engine/xrCDB/xrCDB.vcxproj b/cs/engine/xrCDB/xrCDB.vcxproj index b250215c1..c71446e35 100644 --- a/cs/engine/xrCDB/xrCDB.vcxproj +++ b/cs/engine/xrCDB/xrCDB.vcxproj @@ -27,7 +27,7 @@ DynamicLibrary - v141 + v140 false MultiByte diff --git a/cs/engine/xrCore/xrCore.vcxproj b/cs/engine/xrCore/xrCore.vcxproj index 1a02c803f..78a4a5738 100644 --- a/cs/engine/xrCore/xrCore.vcxproj +++ b/cs/engine/xrCore/xrCore.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 MultiByte diff --git a/cs/engine/xrEngine/xrEngine.vcxproj b/cs/engine/xrEngine/xrEngine.vcxproj index e771ac600..65073da4b 100644 --- a/cs/engine/xrEngine/xrEngine.vcxproj +++ b/cs/engine/xrEngine/xrEngine.vcxproj @@ -34,20 +34,20 @@ Application - v141 + v140 false MultiByte true Application - v141 + v140 false MultiByte Application - v141 + v140 false MultiByte @@ -60,7 +60,7 @@ Application - v141 + v140 false MultiByte diff --git a/cs/engine/xrGame/xrGame.vcxproj b/cs/engine/xrGame/xrGame.vcxproj index 438b90a14..6bda29d16 100644 --- a/cs/engine/xrGame/xrGame.vcxproj +++ b/cs/engine/xrGame/xrGame.vcxproj @@ -29,7 +29,7 @@ DynamicLibrary - v141 + v140 false MultiByte diff --git a/cs/engine/xrNetServer/xrNetServer.vcxproj b/cs/engine/xrNetServer/xrNetServer.vcxproj index 515e27835..b085af651 100644 --- a/cs/engine/xrNetServer/xrNetServer.vcxproj +++ b/cs/engine/xrNetServer/xrNetServer.vcxproj @@ -26,7 +26,7 @@ DynamicLibrary - v141 + v140 false diff --git a/cs/engine/xrParticles/xrParticles.vcxproj b/cs/engine/xrParticles/xrParticles.vcxproj index 292f426c7..71e4252c7 100644 --- a/cs/engine/xrParticles/xrParticles.vcxproj +++ b/cs/engine/xrParticles/xrParticles.vcxproj @@ -26,7 +26,7 @@ DynamicLibrary - v141 + v140 false