Skip to content

Commit 714c981

Browse files
ge0rdige0rdi
committed
Simplify project files
Put common build settings into separate props file. This way it will be much easier to do changes that should affect all projects in the future.
1 parent fc79fb7 commit 714c981

35 files changed

+244
-2216
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ StyleCopReport.xml
6868
*_i.c
6969
*_p.c
7070
*_i.h
71+
*_h.h
7172
*.ilk
7273
*.meta
7374
*.obj

‎Src/ClassicExplorer/ClassicCopyExt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#pragma once
88
#include "resource.h" // main symbols
99

10-
#include "ClassicExplorer_i.h"
10+
#include "ClassicExplorer_h.h"
1111
#include <vector>
1212

1313
// CClassicCopyExt

‎Src/ClassicExplorer/ClassicExplorer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "stdafx.h"
88
#include "resource.h"
9-
#include "ClassicExplorer_i.h"
9+
#include "ClassicExplorer_h.h"
1010
#include "dllmain.h"
1111

1212
// Used to determine whether the DLL can be unloaded by OLE

‎Src/ClassicExplorer/ClassicExplorer.vcxproj

Lines changed: 14 additions & 304 deletions
Large diffs are not rendered by default.

‎Src/ClassicExplorer/ClassicExplorer.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<ClInclude Include="Resource.h">
115115
<Filter>Resource Files</Filter>
116116
</ClInclude>
117-
<ClInclude Include="ClassicExplorer_i.h">
117+
<ClInclude Include="ClassicExplorer_h.h">
118118
<Filter>Generated Files</Filter>
119119
</ClInclude>
120120
</ItemGroup>

‎Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj

Lines changed: 8 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -21,128 +21,29 @@
2121
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2222
</PropertyGroup>
2323
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
24-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
24+
<PropertyGroup Label="Configuration">
2525
<ConfigurationType>Application</ConfigurationType>
26-
<PlatformToolset>v143</PlatformToolset>
27-
<UseOfAtl>Static</UseOfAtl>
28-
<CharacterSet>Unicode</CharacterSet>
29-
<WholeProgramOptimization>true</WholeProgramOptimization>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
32-
<ConfigurationType>Application</ConfigurationType>
33-
<PlatformToolset>v143</PlatformToolset>
34-
<UseOfAtl>Static</UseOfAtl>
35-
<CharacterSet>Unicode</CharacterSet>
36-
<WholeProgramOptimization>true</WholeProgramOptimization>
37-
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
39-
<ConfigurationType>Application</ConfigurationType>
40-
<PlatformToolset>v143</PlatformToolset>
26+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
4127
<UseOfAtl>Static</UseOfAtl>
4228
<CharacterSet>Unicode</CharacterSet>
29+
<WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
4330
</PropertyGroup>
4431
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4532
<ImportGroup Label="ExtensionSettings">
4633
</ImportGroup>
47-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="PropertySheets">
48-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
49-
<Import Project="..\..\Version.props" />
50-
</ImportGroup>
51-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
52-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
53-
<Import Project="..\..\Version.props" />
54-
</ImportGroup>
55-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
56-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57-
<Import Project="..\..\Version.props" />
34+
<ImportGroup Label="PropertySheets">
35+
<Import Project="..\..\Common.props" />
5836
</ImportGroup>
5937
<PropertyGroup Label="UserMacros" />
60-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
61-
<OutDir>..\$(Configuration)\</OutDir>
62-
<IntDir>$(Configuration)\</IntDir>
63-
<LinkIncremental>true</LinkIncremental>
64-
</PropertyGroup>
65-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
66-
<OutDir>..\$(Configuration)\</OutDir>
67-
<IntDir>$(Configuration)\</IntDir>
68-
<LinkIncremental>false</LinkIncremental>
69-
</PropertyGroup>
70-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'">
38+
<PropertyGroup Condition="'$(Platform)'=='Win32'">
7139
<OutDir>..\$(Configuration)\</OutDir>
72-
<IntDir>$(Configuration)\</IntDir>
73-
<LinkIncremental>false</LinkIncremental>
7440
</PropertyGroup>
75-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
76-
<ClCompile>
77-
<Optimization>Disabled</Optimization>
78-
<AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
80-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
81-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
82-
<WarningLevel>Level3</WarningLevel>
83-
<TreatWarningAsError>true</TreatWarningAsError>
84-
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
85-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
86-
<ConformanceMode>true</ConformanceMode>
87-
<LanguageStandard>stdcpp17</LanguageStandard>
88-
</ClCompile>
89-
<ResourceCompile>
90-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91-
</ResourceCompile>
92-
<Link>
93-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
94-
<GenerateDebugInformation>true</GenerateDebugInformation>
95-
<SubSystem>Windows</SubSystem>
96-
</Link>
97-
</ItemDefinitionGroup>
98-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
99-
<ClCompile>
100-
<Optimization>MaxSpeed</Optimization>
101-
<AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
104-
<FunctionLevelLinking>true</FunctionLevelLinking>
105-
<WarningLevel>Level3</WarningLevel>
106-
<TreatWarningAsError>true</TreatWarningAsError>
107-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
108-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
109-
<ConformanceMode>true</ConformanceMode>
110-
<LanguageStandard>stdcpp17</LanguageStandard>
111-
</ClCompile>
112-
<ResourceCompile>
113-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114-
</ResourceCompile>
115-
<Link>
116-
<AdditionalDependencies>shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
117-
<GenerateDebugInformation>true</GenerateDebugInformation>
118-
<SubSystem>Windows</SubSystem>
119-
<OptimizeReferences>true</OptimizeReferences>
120-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
121-
</Link>
122-
</ItemDefinitionGroup>
123-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'">
41+
<ItemDefinitionGroup>
12442
<ClCompile>
125-
<Optimization>MaxSpeed</Optimization>
126-
<AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
129-
<FunctionLevelLinking>true</FunctionLevelLinking>
130-
<WarningLevel>Level3</WarningLevel>
131-
<TreatWarningAsError>true</TreatWarningAsError>
132-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
133-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
134-
<ConformanceMode>true</ConformanceMode>
135-
<LanguageStandard>stdcpp17</LanguageStandard>
43+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
13644
</ClCompile>
137-
<ResourceCompile>
138-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139-
</ResourceCompile>
14045
<Link>
14146
<AdditionalDependencies>shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
142-
<GenerateDebugInformation>true</GenerateDebugInformation>
143-
<SubSystem>Windows</SubSystem>
144-
<OptimizeReferences>true</OptimizeReferences>
145-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
14647
</Link>
14748
</ItemDefinitionGroup>
14849
<ItemGroup>

‎Src/ClassicExplorer/ExplorerBHO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <vector>
1010
#include <map>
1111

12-
#include "ClassicExplorer_i.h"
12+
#include "ClassicExplorer_h.h"
1313
#include "ComHelper.h"
1414
#include <shdispid.h>
1515

‎Src/ClassicExplorer/ExplorerBand.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#pragma once
88
#include "resource.h"
9-
#include "ClassicExplorer_i.h"
9+
#include "ClassicExplorer_h.h"
1010
#include "SettingsParser.h"
1111
#include <vector>
1212

‎Src/ClassicExplorer/ShareOverlay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "resource.h" // main symbols
99
#include <lm.h>
1010

11-
#include "ClassicExplorer_i.h"
11+
#include "ClassicExplorer_h.h"
1212

1313
// CShareOverlay
1414

‎Src/ClassicExplorer/dllmain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// dllmain.h : Declaration of module class.
66
#pragma once
77

8-
#include "ClassicExplorer_i.h"
8+
#include "ClassicExplorer_h.h"
99
#include <vector>
1010

1111
class CClassicExplorerModule : public CAtlDllModuleT< CClassicExplorerModule >

0 commit comments

Comments
 (0)