Skip to content

Commit b7fc505

Browse files
intorrXottab-DUTY
intorr
authored and
Xottab-DUTY
committed
Part 5 of project files refactoring.
1 parent 27885c1 commit b7fc505

File tree

7 files changed

+368
-862
lines changed

7 files changed

+368
-862
lines changed

‎Externals/OPCODE/OPCODE.vcxproj‎

Lines changed: 50 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,22 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
9-
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
11-
</ProjectConfiguration>
128
<ProjectConfiguration Include="Debug|x64">
139
<Configuration>Debug</Configuration>
1410
<Platform>x64</Platform>
1511
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Mixed|Win32">
13+
<Configuration>Mixed</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Mixed|x64">
17+
<Configuration>Mixed</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Release|Win32">
21+
<Configuration>Release</Configuration>
22+
<Platform>Win32</Platform>
23+
</ProjectConfiguration>
1624
<ProjectConfiguration Include="Release|x64">
1725
<Configuration>Release</Configuration>
1826
<Platform>x64</Platform>
@@ -26,112 +34,96 @@
2634
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2735
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2836
<ConfigurationType>DynamicLibrary</ConfigurationType>
29-
<UseDebugLibraries>true</UseDebugLibraries>
3037
<PlatformToolset>v141</PlatformToolset>
3138
<CharacterSet>MultiByte</CharacterSet>
3239
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3441
<ConfigurationType>DynamicLibrary</ConfigurationType>
35-
<UseDebugLibraries>false</UseDebugLibraries>
3642
<PlatformToolset>v141</PlatformToolset>
37-
<WholeProgramOptimization>true</WholeProgramOptimization>
3843
<CharacterSet>MultiByte</CharacterSet>
3944
</PropertyGroup>
40-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
46+
<ConfigurationType>DynamicLibrary</ConfigurationType>
47+
<PlatformToolset>v141</PlatformToolset>
48+
<CharacterSet>MultiByte</CharacterSet>
49+
</PropertyGroup>
50+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
51+
<ConfigurationType>DynamicLibrary</ConfigurationType>
52+
<PlatformToolset>v141</PlatformToolset>
53+
<CharacterSet>MultiByte</CharacterSet>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4156
<ConfigurationType>DynamicLibrary</ConfigurationType>
42-
<UseDebugLibraries>true</UseDebugLibraries>
4357
<PlatformToolset>v141</PlatformToolset>
4458
<CharacterSet>MultiByte</CharacterSet>
4559
</PropertyGroup>
4660
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4761
<ConfigurationType>DynamicLibrary</ConfigurationType>
48-
<UseDebugLibraries>false</UseDebugLibraries>
4962
<PlatformToolset>v141</PlatformToolset>
50-
<WholeProgramOptimization>true</WholeProgramOptimization>
5163
<CharacterSet>MultiByte</CharacterSet>
5264
</PropertyGroup>
5365
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5466
<ImportGroup Label="ExtensionSettings">
5567
</ImportGroup>
56-
<ImportGroup Label="Shared">
68+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
69+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70+
<Import Project="$(SolutionDir)Common.props" />
71+
</ImportGroup>
72+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
73+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
74+
<Import Project="$(SolutionDir)Common.props" />
5775
</ImportGroup>
58-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
76+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="PropertySheets">
5977
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6078
<Import Project="$(SolutionDir)Common.props" />
6179
</ImportGroup>
62-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
80+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="PropertySheets">
6381
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6482
<Import Project="$(SolutionDir)Common.props" />
6583
</ImportGroup>
66-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
84+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
6785
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6886
<Import Project="$(SolutionDir)Common.props" />
6987
</ImportGroup>
70-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
88+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
7189
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7290
<Import Project="$(SolutionDir)Common.props" />
7391
</ImportGroup>
74-
<PropertyGroup Label="UserMacros" />
75-
<PropertyGroup />
7692
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7793
<ClCompile>
78-
<WarningLevel>Level3</WarningLevel>
79-
<Optimization>Disabled</Optimization>
80-
<SDLCheck>true</SDLCheck>
81-
<ConformanceMode>false</ConformanceMode>
82-
<PrecompiledHeader>Use</PrecompiledHeader>
8394
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
84-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8595
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8696
</ClCompile>
8797
</ItemDefinitionGroup>
8898
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8999
<ClCompile>
90-
<WarningLevel>Level3</WarningLevel>
91-
<Optimization>Disabled</Optimization>
92-
<SDLCheck>true</SDLCheck>
93-
<ConformanceMode>false</ConformanceMode>
94-
<PrecompiledHeader>Use</PrecompiledHeader>
95100
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
96-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
101+
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102+
</ClCompile>
103+
</ItemDefinitionGroup>
104+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
105+
<ClCompile>
106+
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
107+
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108+
</ClCompile>
109+
</ItemDefinitionGroup>
110+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
111+
<ClCompile>
112+
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
97113
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
98114
</ClCompile>
99115
</ItemDefinitionGroup>
100116
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
101117
<ClCompile>
102-
<WarningLevel>Level3</WarningLevel>
103-
<Optimization>MaxSpeed</Optimization>
104-
<FunctionLevelLinking>true</FunctionLevelLinking>
105-
<IntrinsicFunctions>true</IntrinsicFunctions>
106-
<SDLCheck>true</SDLCheck>
107-
<ConformanceMode>false</ConformanceMode>
108-
<PrecompiledHeader>Use</PrecompiledHeader>
109118
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
110-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
111119
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112120
</ClCompile>
113-
<Link>
114-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
115-
<OptimizeReferences>true</OptimizeReferences>
116-
</Link>
117121
</ItemDefinitionGroup>
118122
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
119123
<ClCompile>
120-
<WarningLevel>Level3</WarningLevel>
121-
<Optimization>MaxSpeed</Optimization>
122-
<FunctionLevelLinking>true</FunctionLevelLinking>
123-
<IntrinsicFunctions>true</IntrinsicFunctions>
124-
<SDLCheck>true</SDLCheck>
125-
<ConformanceMode>false</ConformanceMode>
126-
<PrecompiledHeader>Use</PrecompiledHeader>
127124
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
128-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
129125
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130126
</ClCompile>
131-
<Link>
132-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
133-
<OptimizeReferences>true</OptimizeReferences>
134-
</Link>
135127
</ItemDefinitionGroup>
136128
<ItemGroup>
137129
<Text Include="ReadMe.txt" />
@@ -162,8 +154,10 @@
162154
<ClCompile Include="OPC_VolumeCollider.cpp" />
163155
<ClCompile Include="pch.cpp">
164156
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
157+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
165158
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
166159
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
160+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
167161
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
168162
</ClCompile>
169163
</ItemGroup>
@@ -210,7 +204,7 @@
210204
<ClInclude Include="pch.hpp" />
211205
</ItemGroup>
212206
<ItemGroup>
213-
<ProjectReference Include="..\..\src\xrCore\xrCore.vcxproj">
207+
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
214208
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
215209
</ProjectReference>
216210
</ItemGroup>

0 commit comments

Comments
 (0)