Skip to content

Commit 8d0b47c

Browse files
intorrXottab-DUTY
intorr
authored and
Xottab-DUTY
committed
Part 8 (Final?) of project files refactoring.
1 parent 80c1286 commit 8d0b47c

File tree

12 files changed

+270
-374
lines changed

12 files changed

+270
-374
lines changed

‎Externals/BugTrap.vcxproj‎

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<Configuration>Debug</Configuration>
1010
<Platform>x64</Platform>
1111
</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>
1220
<ProjectConfiguration Include="Release|Win32">
1321
<Configuration>Release</Configuration>
1422
<Platform>Win32</Platform>
@@ -25,27 +33,37 @@
2533
<ProjectName>BugTrap</ProjectName>
2634
</PropertyGroup>
2735
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2937
<ConfigurationType>DynamicLibrary</ConfigurationType>
3038
<CharacterSet>MultiByte</CharacterSet>
3139
<PlatformToolset>v141</PlatformToolset>
32-
<WholeProgramOptimization>true</WholeProgramOptimization>
3340
</PropertyGroup>
34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3542
<ConfigurationType>DynamicLibrary</ConfigurationType>
3643
<CharacterSet>MultiByte</CharacterSet>
3744
<PlatformToolset>v141</PlatformToolset>
3845
</PropertyGroup>
39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
47+
<ConfigurationType>DynamicLibrary</ConfigurationType>
48+
<CharacterSet>MultiByte</CharacterSet>
49+
<PlatformToolset>v141</PlatformToolset>
50+
</PropertyGroup>
51+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
52+
<ConfigurationType>DynamicLibrary</ConfigurationType>
53+
<CharacterSet>MultiByte</CharacterSet>
54+
<PlatformToolset>v141</PlatformToolset>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4057
<ConfigurationType>DynamicLibrary</ConfigurationType>
4158
<CharacterSet>MultiByte</CharacterSet>
4259
<PlatformToolset>v141</PlatformToolset>
4360
<WholeProgramOptimization>true</WholeProgramOptimization>
4461
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4663
<ConfigurationType>DynamicLibrary</ConfigurationType>
4764
<CharacterSet>MultiByte</CharacterSet>
4865
<PlatformToolset>v141</PlatformToolset>
66+
<WholeProgramOptimization>true</WholeProgramOptimization>
4967
</PropertyGroup>
5068
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5169
<ImportGroup Label="ExtensionSettings">
@@ -54,11 +72,19 @@
5472
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5573
<Import Project="$(SolutionDir)Common.props" />
5674
</ImportGroup>
57-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
75+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5876
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5977
<Import Project="$(SolutionDir)Common.props" />
6078
</ImportGroup>
61-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
79+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
80+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
81+
<Import Project="$(SolutionDir)Common.props" />
82+
</ImportGroup>
83+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
84+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
85+
<Import Project="$(SolutionDir)Common.props" />
86+
</ImportGroup>
87+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6288
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6389
<Import Project="$(SolutionDir)Common.props" />
6490
</ImportGroup>
@@ -86,6 +112,26 @@
86112
<ModuleDefinitionFile>BugTrap\source\Client\BugTrap.def</ModuleDefinitionFile>
87113
</Link>
88114
</ItemDefinitionGroup>
115+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
116+
<ClCompile>
117+
<PreprocessorDefinitions>WIN32;_USRDLL;BUGTRAP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<AdditionalIncludeDirectories>zlib;zlib\contrib\minizip</AdditionalIncludeDirectories>
119+
</ClCompile>
120+
<Link>
121+
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
122+
<ModuleDefinitionFile>BugTrap\source\Client\BugTrap.def</ModuleDefinitionFile>
123+
</Link>
124+
</ItemDefinitionGroup>
125+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
126+
<ClCompile>
127+
<PreprocessorDefinitions>WIN64;_USRDLL;BUGTRAP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128+
<AdditionalIncludeDirectories>zlib;zlib\contrib\minizip</AdditionalIncludeDirectories>
129+
</ClCompile>
130+
<Link>
131+
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
132+
<ModuleDefinitionFile>BugTrap\source\Client\BugTrap.def</ModuleDefinitionFile>
133+
</Link>
134+
</ItemDefinitionGroup>
89135
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
90136
<ClCompile>
91137
<PreprocessorDefinitions>WIN32;_USRDLL;BUGTRAP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -148,6 +194,8 @@
148194
<ClCompile Include="BugTrap\source\Client\stdafx.cpp">
149195
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
150196
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
197+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
198+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
151199
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
152200
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
153201
</ClCompile>

‎src/Common.props‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,12 @@
6868

6969
<ItemDefinitionGroup>
7070
<ClCompile>
71-
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrExternals);$(ProjectDir);$(xrSdkDir)include;$(xrSdkDir)DXSDK/Include;$(xrExternals)luajit/src;$(xrExternals)luabind;$(xrExternals)GameSpy/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
72-
<!-- Optimization is automatically enabled when <UseDebugLibraries>false</UseDebugLibraries>. That's why we'll turn it off manually -->
71+
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrExternals);$(ProjectDir);$(xrSdkDir)include;$(xrSdkDir)DXSDK/Include;$(xrExternals)luajit\src;$(xrExternals)luabind;$(xrExternals)GameSpy\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
72+
<!-- MultiProcessorCompilation don't compatible with LinkIncremental and UseDebugLibraries -->
73+
<MultiProcessorCompilation Condition="$(Configuration.StartsWith('Debug' ))">false</MultiProcessorCompilation>
74+
<MultiProcessorCompilation Condition="$(Configuration.StartsWith('Mixed' ))">true</MultiProcessorCompilation>
75+
<MultiProcessorCompilation Condition="$(Configuration.StartsWith('Release'))">true</MultiProcessorCompilation>
76+
<!-- Optimization is automatically enabled when UseDebugLibraries == false. That's why we'll turn it off manually -->
7377
<Optimization Condition="$(Configuration.StartsWith('Mixed'))">Disabled</Optimization>
7478
<!--
7579
4251 : class 'x' needs to have dll-interface to be used by clients of class 'y'

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@
104104
<AdditionalDependencies>d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
105105
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
106106
</Link>
107-
<PostBuildEvent>
108-
<Message>Copy AGS dll to output directory</Message>
109-
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
110-
</PostBuildEvent>
107+
<CustomBuildStep>
108+
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
109+
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
110+
<Inputs>$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll;%(Inputs)</Inputs>
111+
<TreatOutputAsContent>true</TreatOutputAsContent>
112+
</CustomBuildStep>
111113
</ItemDefinitionGroup>
112114
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
113115
<ClCompile>
@@ -118,10 +120,12 @@
118120
<AdditionalDependencies>d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
119121
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
120122
</Link>
121-
<PostBuildEvent>
122-
<Message>Copy AGS dll to output directory</Message>
123-
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
124-
</PostBuildEvent>
123+
<CustomBuildStep>
124+
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
125+
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
126+
<Inputs>$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll;%(Inputs)</Inputs>
127+
<TreatOutputAsContent>true</TreatOutputAsContent>
128+
</CustomBuildStep>
125129
</ItemDefinitionGroup>
126130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
127131
<ClCompile>
@@ -132,10 +136,12 @@
132136
<AdditionalDependencies>d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
133137
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
134138
</Link>
135-
<PostBuildEvent>
136-
<Message>Copy AGS dll to output directory</Message>
137-
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
138-
</PostBuildEvent>
139+
<CustomBuildStep>
140+
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
141+
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
142+
<Inputs>$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll;%(Inputs)</Inputs>
143+
<TreatOutputAsContent>true</TreatOutputAsContent>
144+
</CustomBuildStep>
139145
</ItemDefinitionGroup>
140146
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
141147
<ClCompile>
@@ -146,10 +152,12 @@
146152
<AdditionalDependencies>d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
147153
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
148154
</Link>
149-
<PostBuildEvent>
150-
<Message>Copy AGS dll to output directory</Message>
151-
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
152-
</PostBuildEvent>
155+
<CustomBuildStep>
156+
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
157+
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
158+
<Inputs>$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll;%(Inputs)</Inputs>
159+
<TreatOutputAsContent>true</TreatOutputAsContent>
160+
</CustomBuildStep>
153161
</ItemDefinitionGroup>
154162
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
155163
<ClCompile>
@@ -160,10 +168,12 @@
160168
<AdditionalDependencies>d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
161169
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
162170
</Link>
163-
<PostBuildEvent>
164-
<Message>Copy AGS dll to output directory</Message>
165-
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
166-
</PostBuildEvent>
171+
<CustomBuildStep>
172+
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
173+
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
174+
<Inputs>$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll;%(Inputs)</Inputs>
175+
<TreatOutputAsContent>true</TreatOutputAsContent>
176+
</CustomBuildStep>
167177
</ItemDefinitionGroup>
168178
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
169179
<ClCompile>
@@ -174,10 +184,12 @@
174184
<AdditionalDependencies>d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
175185
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
176186
</Link>
177-
<PostBuildEvent>
178-
<Message>Copy AGS dll to output directory</Message>
179-
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
180-
</PostBuildEvent>
187+
<CustomBuildStep>
188+
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
189+
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
190+
<Inputs>$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll;%(Inputs)</Inputs>
191+
<TreatOutputAsContent>true</TreatOutputAsContent>
192+
</CustomBuildStep>
181193
</ItemDefinitionGroup>
182194
<ItemGroup>
183195
<ClInclude Include="..\..\Include\xrRender\animation_blend.h" />

0 commit comments

Comments
 (0)