|
@@ -30,38 +30,38 @@
|
|
|
<ProjectGuid>{1564A07D-230E-4C90-AEE6-52AC9A58D6C9}</ProjectGuid>
|
|
|
<RootNamespace>TorqueGame</RootNamespace>
|
|
|
<ProjectName>Torque2D</ProjectName>
|
|
|
- <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
|
|
|
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
|
</PropertyGroup>
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
+ <PlatformToolset>v143</PlatformToolset>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
+ <PlatformToolset>v143</PlatformToolset>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Shipping|Win32'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
+ <PlatformToolset>v143</PlatformToolset>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Shipping|x64'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
+ <PlatformToolset>v143</PlatformToolset>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
+ <PlatformToolset>v143</PlatformToolset>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
+ <PlatformToolset>v143</PlatformToolset>
|
|
|
</PropertyGroup>
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
|
<ImportGroup Label="ExtensionSettings">
|
|
@@ -117,6 +117,10 @@
|
|
|
<OutDir>../../../</OutDir>
|
|
|
<IntDir>../../Link/VC2012.$(Configuration).$(PlatformName)/$(ProjectName)/</IntDir>
|
|
|
</PropertyGroup>
|
|
|
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
+ <OutDir>../../../</OutDir>
|
|
|
+ <IntDir>../../Link/VC2012.$(Configuration).$(PlatformName)/$(ProjectName)/</IntDir>
|
|
|
+ </PropertyGroup>
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
<Midl>
|
|
|
<TypeLibraryName>$(OutDir)Torque2D.tlb</TypeLibraryName>
|
|
@@ -143,7 +147,7 @@
|
|
|
<WarningLevel>Level3</WarningLevel>
|
|
|
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
|
|
|
<ShowIncludes>false</ShowIncludes>
|
|
|
- <LanguageStandard>stdcpp14</LanguageStandard>
|
|
|
+ <ConformanceMode>true</ConformanceMode>
|
|
|
</ClCompile>
|
|
|
<ResourceCompile>
|
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
@@ -193,7 +197,7 @@
|
|
|
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
|
|
|
<ShowIncludes>false</ShowIncludes>
|
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
|
- <LanguageStandard>stdcpp14</LanguageStandard>
|
|
|
+ <ConformanceMode>true</ConformanceMode>
|
|
|
</ClCompile>
|
|
|
<ResourceCompile>
|
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
@@ -243,7 +247,7 @@
|
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
|
|
|
- <LanguageStandard>stdcpp14</LanguageStandard>
|
|
|
+ <ConformanceMode>true</ConformanceMode>
|
|
|
</ClCompile>
|
|
|
<ResourceCompile>
|
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
@@ -304,7 +308,7 @@
|
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
|
|
|
- <LanguageStandard>stdcpp14</LanguageStandard>
|
|
|
+ <ConformanceMode>true</ConformanceMode>
|
|
|
</ClCompile>
|
|
|
<ResourceCompile>
|
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
@@ -364,7 +368,7 @@
|
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
|
|
|
- <LanguageStandard>stdcpp14</LanguageStandard>
|
|
|
+ <ConformanceMode>true</ConformanceMode>
|
|
|
</ClCompile>
|
|
|
<ResourceCompile>
|
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
@@ -425,7 +429,7 @@
|
|
|
<CompileAs>CompileAsCpp</CompileAs>
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
|
|
|
- <LanguageStandard>stdcpp14</LanguageStandard>
|
|
|
+ <ConformanceMode>true</ConformanceMode>
|
|
|
</ClCompile>
|
|
|
<ResourceCompile>
|
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
@@ -512,6 +516,7 @@
|
|
|
<ClCompile Include="..\..\source\2d\scene\WorldQuery.cc" />
|
|
|
<ClCompile Include="..\..\source\algorithm\crc.cc" />
|
|
|
<ClCompile Include="..\..\source\algorithm\hashFunction.cc" />
|
|
|
+ <ClCompile Include="..\..\source\algorithm\pcg_basic.c" />
|
|
|
<ClCompile Include="..\..\source\algorithm\Perlin.cc" />
|
|
|
<ClCompile Include="..\..\source\assets\assetBase.cc" />
|
|
|
<ClCompile Include="..\..\source\assets\assetFieldTypes.cc" />
|
|
@@ -673,6 +678,7 @@
|
|
|
<ClCompile Include="..\..\source\math\mFluid.cpp" />
|
|
|
<ClCompile Include="..\..\source\math\mPoint.cpp" />
|
|
|
<ClCompile Include="..\..\source\math\noise\NoiseGenerator.cc" />
|
|
|
+ <ClCompile Include="..\..\source\math\noise\RandomNumberGenerator.cc" />
|
|
|
<ClCompile Include="..\..\source\math\rectClipper.cpp" />
|
|
|
<ClCompile Include="..\..\source\memory\dataChunker.cc" />
|
|
|
<ClCompile Include="..\..\source\memory\frameAllocator_ScriptBinding.cc" />
|
|
@@ -936,6 +942,7 @@
|
|
|
<ClInclude Include="..\..\source\algorithm\crctab.h" />
|
|
|
<ClInclude Include="..\..\source\algorithm\hashFunction.h" />
|
|
|
<ClInclude Include="..\..\source\algorithm\md5.h" />
|
|
|
+ <ClInclude Include="..\..\source\algorithm\pcg_basic.h" />
|
|
|
<ClInclude Include="..\..\source\algorithm\Perlin.h" />
|
|
|
<ClInclude Include="..\..\source\assets\assetBase.h" />
|
|
|
<ClInclude Include="..\..\source\assets\assetBase_ScriptBinding.h" />
|
|
@@ -1178,6 +1185,8 @@
|
|
|
<ClInclude Include="..\..\source\math\mNormalDistribution.h" />
|
|
|
<ClInclude Include="..\..\source\math\noise\NoiseGenerator.h" />
|
|
|
<ClInclude Include="..\..\source\math\noise\NoiseGenerator_ScriptBinding.h" />
|
|
|
+ <ClInclude Include="..\..\source\math\noise\RandomNumberGenerator.h" />
|
|
|
+ <ClInclude Include="..\..\source\math\noise\RandomNumberGenerator_ScriptBinding.h" />
|
|
|
<ClInclude Include="..\..\source\math\random_ScriptBinding.h" />
|
|
|
<ClInclude Include="..\..\source\math\rectClipper.h" />
|
|
|
<ClInclude Include="..\..\source\math\vector_ScriptBinding.h" />
|