Skip to content

Commit

Permalink
Partially fixed Debug and Mixed compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
Xottab-DUTY committed Apr 8, 2019
1 parent f4eeb7e commit 31708fa
Show file tree
Hide file tree
Showing 21 changed files with 41 additions and 38 deletions.
4 changes: 2 additions & 2 deletions cs/3rd party/BugTrap.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
Expand All @@ -47,7 +47,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
Expand Down
3 changes: 2 additions & 1 deletion cs/3rd party/CxImage/cximage.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<CLRSupport>false</CLRSupport>
Expand Down Expand Up @@ -105,6 +105,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4100;4611;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down
2 changes: 1 addition & 1 deletion cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
6 changes: 3 additions & 3 deletions cs/3rd party/ODE/contrib/ode_default.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
Expand All @@ -37,7 +37,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -94,7 +94,7 @@
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
<SmallerTypeCheck>false</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FloatingPointModel>Fast</FloatingPointModel>
<ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
Expand Down
3 changes: 2 additions & 1 deletion cs/3rd party/crypto/crypto.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down Expand Up @@ -53,6 +53,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Expand Down
2 changes: 1 addition & 1 deletion cs/3rd party/glew.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand Down
2 changes: 1 addition & 1 deletion cs/3rd party/oalib.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
4 changes: 2 additions & 2 deletions cs/3rd party/zlib.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
Expand All @@ -43,7 +43,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
Expand Down
24 changes: 12 additions & 12 deletions cs/engine.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cs/engine/layers/xrRender/xrRender_console.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/utils/xrCompress/xrCompress.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
<SmallerTypeCheck>false</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/xrCDB/xrCDB.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/xrCore/xrCore.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
8 changes: 4 additions & 4 deletions cs/engine/xrEngine/xrEngine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Dedicated|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed_Dedicated|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Dedicated|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand All @@ -60,7 +60,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/xrGame/xrGame.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/xrNetServer/xrNetServer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion cs/engine/xrParticles/xrParticles.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down

0 comments on commit 31708fa

Please sign in to comment.