Skip to content

Commit e13af6e

Browse files
Xottab-DUTYXottab-DUTY
committed
Update the projects:
- Oops, update xrD3D9-Null to VS 2017. It was partially not updated - Create x64 configurations for editors
1 parent 24ec872 commit e13af6e

File tree

9 files changed

+576
-49
lines changed

9 files changed

+576
-49
lines changed

‎src/editors/ActorEditor/ActorEditor.vcxproj

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,26 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Mixed|Win32">
913
<Configuration>Mixed</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Mixed|x64">
17+
<Configuration>Mixed</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
<ProjectConfiguration Include="Release|Win32">
1321
<Configuration>Release</Configuration>
1422
<Platform>Win32</Platform>
1523
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
1628
</ItemGroup>
1729
<ItemGroup>
1830
<ClCompile Include="ActorEditor.cpp" />
@@ -63,9 +75,21 @@
6375
<CharacterSet>MultiByte</CharacterSet>
6476
<WholeProgramOptimization>true</WholeProgramOptimization>
6577
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
79+
<ConfigurationType>Application</ConfigurationType>
80+
<PlatformToolset>v141</PlatformToolset>
81+
<CharacterSet>MultiByte</CharacterSet>
82+
<WholeProgramOptimization>true</WholeProgramOptimization>
83+
</PropertyGroup>
6684
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
6785
<ConfigurationType>Application</ConfigurationType>
68-
<PlatformToolset>v140</PlatformToolset>
86+
<PlatformToolset>v141</PlatformToolset>
87+
<CharacterSet>MultiByte</CharacterSet>
88+
<WholeProgramOptimization>true</WholeProgramOptimization>
89+
</PropertyGroup>
90+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
91+
<ConfigurationType>Application</ConfigurationType>
92+
<PlatformToolset>v141</PlatformToolset>
6993
<CharacterSet>MultiByte</CharacterSet>
7094
<WholeProgramOptimization>true</WholeProgramOptimization>
7195
</PropertyGroup>
@@ -74,21 +98,38 @@
7498
<PlatformToolset>v141</PlatformToolset>
7599
<CharacterSet>MultiByte</CharacterSet>
76100
</PropertyGroup>
101+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
102+
<ConfigurationType>Application</ConfigurationType>
103+
<PlatformToolset>v141</PlatformToolset>
104+
<CharacterSet>MultiByte</CharacterSet>
105+
</PropertyGroup>
77106
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
78107
<ImportGroup Label="ExtensionSettings">
79108
</ImportGroup>
80109
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
81110
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
82111
<Import Project="$(SolutionDir)Common.props" />
83112
</ImportGroup>
113+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
114+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
115+
<Import Project="$(SolutionDir)Common.props" />
116+
</ImportGroup>
84117
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="PropertySheets">
85118
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
86119
<Import Project="$(SolutionDir)Common.props" />
87120
</ImportGroup>
121+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="PropertySheets">
122+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
123+
<Import Project="$(SolutionDir)Common.props" />
124+
</ImportGroup>
88125
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
89126
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
90127
<Import Project="$(SolutionDir)Common.props" />
91128
</ImportGroup>
129+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
130+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
131+
<Import Project="$(SolutionDir)Common.props" />
132+
</ImportGroup>
92133
<PropertyGroup Label="UserMacros" />
93134
<PropertyGroup>
94135
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
@@ -97,6 +138,7 @@
97138
<OutDir>$(xrBinDir)</OutDir>
98139
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
99140
</PropertyGroup>
141+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
100142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
101143
<OutDir>$(xrBinDir)</OutDir>
102144
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
@@ -119,6 +161,18 @@
119161
<TargetMachine>MachineX86</TargetMachine>
120162
</Link>
121163
</ItemDefinitionGroup>
164+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
165+
<ClCompile>
166+
<Optimization>Disabled</Optimization>
167+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
168+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
169+
<WarningLevel>Level3</WarningLevel>
170+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
171+
</ClCompile>
172+
<Link>
173+
<GenerateDebugInformation>true</GenerateDebugInformation>
174+
</Link>
175+
</ItemDefinitionGroup>
122176
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
123177
<ClCompile>
124178
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -132,6 +186,18 @@
132186
<TargetMachine>MachineX86</TargetMachine>
133187
</Link>
134188
</ItemDefinitionGroup>
189+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
190+
<ClCompile>
191+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
192+
<WarningLevel>Level3</WarningLevel>
193+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
194+
</ClCompile>
195+
<Link>
196+
<GenerateDebugInformation>true</GenerateDebugInformation>
197+
<OptimizeReferences>true</OptimizeReferences>
198+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
199+
</Link>
200+
</ItemDefinitionGroup>
135201
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
136202
<ClCompile>
137203
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -145,6 +211,18 @@
145211
<TargetMachine>MachineX86</TargetMachine>
146212
</Link>
147213
</ItemDefinitionGroup>
214+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
215+
<ClCompile>
216+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
217+
<WarningLevel>Level3</WarningLevel>
218+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
219+
</ClCompile>
220+
<Link>
221+
<GenerateDebugInformation>true</GenerateDebugInformation>
222+
<OptimizeReferences>true</OptimizeReferences>
223+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
224+
</Link>
225+
</ItemDefinitionGroup>
148226
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
149227
<ImportGroup Label="ExtensionTargets">
150228
</ImportGroup>

‎src/editors/ECore/ECore.vcxproj

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectName>ECore</ProjectName>
@@ -23,22 +31,41 @@
2331
<CharacterSet>MultiByte</CharacterSet>
2432
<WholeProgramOptimization>true</WholeProgramOptimization>
2533
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
35+
<ConfigurationType>DynamicLibrary</ConfigurationType>
36+
<PlatformToolset>v141</PlatformToolset>
37+
<CharacterSet>MultiByte</CharacterSet>
38+
<WholeProgramOptimization>true</WholeProgramOptimization>
39+
</PropertyGroup>
2640
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2741
<ConfigurationType>DynamicLibrary</ConfigurationType>
2842
<PlatformToolset>v141</PlatformToolset>
2943
<CharacterSet>MultiByte</CharacterSet>
3044
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
46+
<ConfigurationType>DynamicLibrary</ConfigurationType>
47+
<PlatformToolset>v141</PlatformToolset>
48+
<CharacterSet>MultiByte</CharacterSet>
49+
</PropertyGroup>
3150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3251
<ImportGroup Label="ExtensionSettings">
3352
</ImportGroup>
3453
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3554
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3655
<Import Project="$(SolutionDir)Common.props" />
3756
</ImportGroup>
57+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
58+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59+
<Import Project="$(SolutionDir)Common.props" />
60+
</ImportGroup>
3861
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3962
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4063
<Import Project="$(SolutionDir)Common.props" />
4164
</ImportGroup>
65+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
<Import Project="$(SolutionDir)Common.props" />
68+
</ImportGroup>
4269
<PropertyGroup Label="UserMacros" />
4370
<PropertyGroup>
4471
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
@@ -47,6 +74,7 @@
4774
<OutDir>$(xrBinDir)</OutDir>
4875
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
4976
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
5078
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5179
<OutDir>$(xrBinDir)</OutDir>
5280
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
@@ -65,6 +93,18 @@
6593
<TargetMachine>MachineX86</TargetMachine>
6694
</Link>
6795
</ItemDefinitionGroup>
96+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
97+
<ClCompile>
98+
<Optimization>Disabled</Optimization>
99+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
100+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
101+
<WarningLevel>Level3</WarningLevel>
102+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
103+
</ClCompile>
104+
<Link>
105+
<GenerateDebugInformation>true</GenerateDebugInformation>
106+
</Link>
107+
</ItemDefinitionGroup>
68108
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
69109
<ClCompile>
70110
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -78,6 +118,18 @@
78118
<TargetMachine>MachineX86</TargetMachine>
79119
</Link>
80120
</ItemDefinitionGroup>
121+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
122+
<ClCompile>
123+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
124+
<WarningLevel>Level3</WarningLevel>
125+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
126+
</ClCompile>
127+
<Link>
128+
<GenerateDebugInformation>true</GenerateDebugInformation>
129+
<OptimizeReferences>true</OptimizeReferences>
130+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
131+
</Link>
132+
</ItemDefinitionGroup>
81133
<ItemGroup>
82134
<ClInclude Include="Editor\ArbitraryList.h" />
83135
<ClInclude Include="Editor\ColorPicker.h" />
@@ -196,9 +248,13 @@
196248
<ClCompile Include="Engine\ai_sounds.cpp" />
197249
<ClCompile Include="Engine\bone.cpp">
198250
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
251+
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
199252
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
253+
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
200254
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
255+
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
201256
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
257+
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
202258
</ClCompile>
203259
<ClCompile Include="Engine\cl_collector.cpp" />
204260
<ClCompile Include="Engine\GameMtlLib.cpp" />

0 commit comments

Comments
 (0)