Skip to content

Commit 0221420

Browse files
author
MarcoFalke
committed
Merge #16235: build: Cleaned up and consolidated msbuild files (no code changes)
750d1bc Cleaned up and consolidated msvc build files to allow faster builds and easier migration to vs2019. (Aaron Clauson) Pull request description: This PR does the following: - Big cleanup of the msbuild project files and consolidation of common build parameters into a single common include, - Gets ready for switch to building with Visual Studio 2019 and Platform Toolset v142, - Will allow me to rebase #15529 to include the Qt Projects in the msbuild config. ACKs for commit 750d1b: fanquake: ACK 750d1bc NicolasDorier: tACK 750d1bc . Good to see the boilerplate go away. Tree-SHA512: 15b2c3e095037d2b927aecf81593be6b6963a944c40d8c6b270cd0a2e1f8b67347bf6a4676a15d7ba1831a60f4ee4e6a405611e1ff5a27aa4888b2f857eef22b
2 parents 44d8172 + 750d1bc commit 0221420

File tree

24 files changed

+300
-2985
lines changed

24 files changed

+300
-2985
lines changed

‎build_msvc/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ packages/*
99
*/x64
1010
*.vcxproj.user
1111
*.vcxproj
12+
*/Win32

‎build_msvc/bench_bitcoin/bench_bitcoin.vcxproj

Lines changed: 12 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Label="configInitTarget" Project="..\common.init.vcxproj" />
4-
<ItemGroup Label="ProjectConfigurations">
5-
<ProjectConfiguration Include="Debug|Win32">
6-
<Configuration>Debug</Configuration>
7-
<Platform>Win32</Platform>
8-
</ProjectConfiguration>
9-
<ProjectConfiguration Include="Release|Win32">
10-
<Configuration>Release</Configuration>
11-
<Platform>Win32</Platform>
12-
</ProjectConfiguration>
13-
<ProjectConfiguration Include="Debug|x64">
14-
<Configuration>Debug</Configuration>
15-
<Platform>x64</Platform>
16-
</ProjectConfiguration>
17-
<ProjectConfiguration Include="Release|x64">
18-
<Configuration>Release</Configuration>
19-
<Platform>x64</Platform>
20-
</ProjectConfiguration>
21-
</ItemGroup>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\common.init.vcxproj" />
4+
<PropertyGroup Label="Globals">
5+
<ProjectGuid>{1125654E-E1B2-4431-8B5C-62EA9A2FEECB}</ProjectGuid>
6+
</PropertyGroup>
7+
<PropertyGroup>
8+
<ConfigurationType>Application</ConfigurationType>
9+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
10+
</PropertyGroup>
2211
<ItemGroup>
23-
<ClCompile Include="..\..\src\test\util.h" />
2412
<ClCompile Include="..\..\src\test\util.cpp" />
25-
<ClCompile Include="..\..\src\test\setup_common.h" />
2613
<ClCompile Include="..\..\src\test\setup_common.cpp" />
2714
<ClCompile Include="..\..\src\bench\base58.cpp" />
2815
<ClCompile Include="..\..\src\bench\bech32.cpp" />
@@ -74,143 +61,6 @@
7461
<Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project>
7562
</ProjectReference>
7663
</ItemGroup>
77-
<PropertyGroup Label="Globals">
78-
<VCProjectVersion>15.0</VCProjectVersion>
79-
<ProjectGuid>{1125654E-E1B2-4431-8B5C-62EA9A2FEECB}</ProjectGuid>
80-
<Keyword>Win32Proj</Keyword>
81-
<RootNamespace>bench_bitcoin</RootNamespace>
82-
<VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
83-
<VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
84-
</PropertyGroup>
85-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
86-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
87-
<ConfigurationType>Application</ConfigurationType>
88-
<UseDebugLibraries>true</UseDebugLibraries>
89-
<PlatformToolset>v141</PlatformToolset>
90-
<CharacterSet>Unicode</CharacterSet>
91-
</PropertyGroup>
92-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
93-
<ConfigurationType>Application</ConfigurationType>
94-
<UseDebugLibraries>false</UseDebugLibraries>
95-
<PlatformToolset>v141</PlatformToolset>
96-
<WholeProgramOptimization>true</WholeProgramOptimization>
97-
<CharacterSet>Unicode</CharacterSet>
98-
</PropertyGroup>
99-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
100-
<ConfigurationType>Application</ConfigurationType>
101-
<UseDebugLibraries>true</UseDebugLibraries>
102-
<PlatformToolset>v141</PlatformToolset>
103-
<CharacterSet>Unicode</CharacterSet>
104-
</PropertyGroup>
105-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
106-
<ConfigurationType>Application</ConfigurationType>
107-
<UseDebugLibraries>false</UseDebugLibraries>
108-
<PlatformToolset>v141</PlatformToolset>
109-
<WholeProgramOptimization>true</WholeProgramOptimization>
110-
<CharacterSet>Unicode</CharacterSet>
111-
</PropertyGroup>
112-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
113-
<ImportGroup Label="ExtensionSettings">
114-
</ImportGroup>
115-
<ImportGroup Label="Shared">
116-
</ImportGroup>
117-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
118-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
119-
</ImportGroup>
120-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
121-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
122-
</ImportGroup>
123-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
124-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
125-
</ImportGroup>
126-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
127-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
128-
</ImportGroup>
129-
<PropertyGroup Label="UserMacros" />
130-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
131-
<LinkIncremental>false</LinkIncremental>
132-
<Linkage-secp256k1>static</Linkage-secp256k1>
133-
</PropertyGroup>
134-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
135-
<LinkIncremental>true</LinkIncremental>
136-
<Linkage-secp256k1>static</Linkage-secp256k1>
137-
</PropertyGroup>
138-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
139-
<LinkIncremental>true</LinkIncremental>
140-
<Linkage-secp256k1>static</Linkage-secp256k1>
141-
</PropertyGroup>
142-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
143-
<LinkIncremental>false</LinkIncremental>
144-
<Linkage-secp256k1>static</Linkage-secp256k1>
145-
</PropertyGroup>
146-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
147-
<ClCompile>
148-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
149-
<WarningLevel>Level3</WarningLevel>
150-
<Optimization>MaxSpeed</Optimization>
151-
<FunctionLevelLinking>true</FunctionLevelLinking>
152-
<IntrinsicFunctions>true</IntrinsicFunctions>
153-
<PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154-
<SDLCheck>true</SDLCheck>
155-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
156-
</ClCompile>
157-
<Link>
158-
<SubSystem>Console</SubSystem>
159-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
160-
<OptimizeReferences>true</OptimizeReferences>
161-
<GenerateDebugInformation>true</GenerateDebugInformation>
162-
<AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
163-
</Link>
164-
</ItemDefinitionGroup>
165-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
166-
<ClCompile>
167-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
168-
<WarningLevel>Level3</WarningLevel>
169-
<Optimization>Disabled</Optimization>
170-
<PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171-
<SDLCheck>true</SDLCheck>
172-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
173-
</ClCompile>
174-
<Link>
175-
<SubSystem>Console</SubSystem>
176-
<GenerateDebugInformation>true</GenerateDebugInformation>
177-
<AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
178-
</Link>
179-
</ItemDefinitionGroup>
180-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
181-
<ClCompile>
182-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
183-
<WarningLevel>Level3</WarningLevel>
184-
<Optimization>Disabled</Optimization>
185-
<PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186-
<SDLCheck>true</SDLCheck>
187-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
188-
</ClCompile>
189-
<Link>
190-
<SubSystem>Console</SubSystem>
191-
<GenerateDebugInformation>true</GenerateDebugInformation>
192-
<AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
193-
</Link>
194-
</ItemDefinitionGroup>
195-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
196-
<ClCompile>
197-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
198-
<WarningLevel>Level3</WarningLevel>
199-
<Optimization>MaxSpeed</Optimization>
200-
<FunctionLevelLinking>true</FunctionLevelLinking>
201-
<IntrinsicFunctions>true</IntrinsicFunctions>
202-
<PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
203-
<SDLCheck>true</SDLCheck>
204-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
205-
</ClCompile>
206-
<Link>
207-
<SubSystem>Console</SubSystem>
208-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
209-
<OptimizeReferences>true</OptimizeReferences>
210-
<GenerateDebugInformation>true</GenerateDebugInformation>
211-
<AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
212-
</Link>
213-
</ItemDefinitionGroup>
21464
<Target Name="RawBenchHeaderGen" BeforeTargets="PrepareForBuild">
21565
<PropertyGroup>
21666
<ErrorText>There was an error executing the raw bench header generation task.</ErrorText>
@@ -220,6 +70,7 @@
22070
</ItemGroup>
22171
<HeaderFromHexdump RawFilePath="%(RawBenchFile.FullPath)" HeaderFilePath="%(RawBenchFile.FullPath).h" SourceHeader="static unsigned const char %(RawBenchFile.Filename)[] = {" SourceFooter="};" />
22272
</Target>
223-
<Import Label="configTarget" Project="..\common.vcxproj" />
22473
<Import Label="hexdumpTarget" Project="..\msbuild\tasks\hexdump.targets" />
225-
</Project>
74+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
75+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
76+
</Project>

0 commit comments

Comments
 (0)