Skip to content

Commit 2eeb401

Browse files
SibrasSibras
committed
Modernization cleanups.
1 parent 8713cb7 commit 2eeb401

File tree

6 files changed

+92
-96
lines changed

6 files changed

+92
-96
lines changed

‎include/configGenerator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class ConfigGenerator
157157
* Creates a list of additional config option dependencies that are not available as actual config options.
158158
* @param [out] additionalDependencies The additional dependencies.
159159
*/
160-
void buildAdditionalDependencies(DependencyList& additionalDependencies);
160+
void buildAdditionalDependencies(DependencyList& additionalDependencies) const;
161161

162162
/**
163163
* Creates a list of additional dependencies between config options (in addition to _deps lists).

‎include/projectGenerator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ class ProjectGenerator
350350

351351
void outputSourceFiles(string& projectTemplate, string& filterTemplate);
352352

353-
bool outputProjectExports(const StaticList& includeDirs);
353+
bool outputProjectExports(const StaticList& includeDirs) const;
354354

355355
/**
356356
* Executes a batch script to perform operations using a compiler based on current configuration.
@@ -389,7 +389,7 @@ class ProjectGenerator
389389
* Output additional build events to the project.
390390
* @param [in,out] projectTemplate The project template.
391391
*/
392-
void outputBuildEvents(string& projectTemplate);
392+
void outputBuildEvents(string& projectTemplate) const;
393393

394394
/**
395395
* Output additional include search directories to project.

‎source/configGenerator_build.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ void ConfigGenerator::buildReservedValues(vector<string>& reservedItems)
10151015
reservedItems.emplace_back("pic");
10161016
}
10171017

1018-
void ConfigGenerator::buildAdditionalDependencies(DependencyList& additionalDependencies)
1018+
void ConfigGenerator::buildAdditionalDependencies(DependencyList& additionalDependencies) const
10191019
{
10201020
additionalDependencies.clear();
10211021
additionalDependencies["android"] = false;

‎source/projectGenerator.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include <algorithm>
2424
#include <iomanip>
25-
#include <sstream>
2625
#include <utility>
2726

2827
#define TEMPLATE_SLN_WINRT_ID 101
@@ -1089,7 +1088,7 @@ void ProjectGenerator::outputSourceFiles(string& projectTemplate, string& filter
10891088
filterTemplate.insert(findPosFilt, addFilters);
10901089
}
10911090

1092-
bool ProjectGenerator::outputProjectExports(const StaticList& includeDirs)
1091+
bool ProjectGenerator::outputProjectExports(const StaticList& includeDirs) const
10931092
{
10941093
outputLine(" Generating project exports file (" + m_projectName + ")...");
10951094
string exportList;
@@ -1344,7 +1343,7 @@ bool ProjectGenerator::outputProjectExports(const StaticList& includeDirs)
13441343
return true;
13451344
}
13461345

1347-
void ProjectGenerator::outputBuildEvents(string& projectTemplate)
1346+
void ProjectGenerator::outputBuildEvents(string& projectTemplate) const
13481347
{
13491348
// After </Lib> and </Link> and the post and then pre build events
13501349
const string libLink[2] = {"</Lib>", "</Link>"};
@@ -1639,7 +1638,7 @@ bool ProjectGenerator::outputDependencyLibs(string& projectTemplate, const bool
16391638
}
16401639
// Create List of additional dependencies
16411640
string addDeps[4]; // debug, release, debugDll, releaseDll
1642-
for (auto i = libs.begin() + (size_t)m_projectLibs[m_projectName].size(); i < libs.end(); ++i) {
1641+
for (auto i = libs.begin() + m_projectLibs[m_projectName].size(); i < libs.end(); ++i) {
16431642
addDeps[0] += *i;
16441643
addDeps[0] += (!winrt) ? "d.lib;" : "d_winrt.lib;";
16451644
addDeps[1] += *i;

‎source/projectGenerator_build.cpp‎

Lines changed: 61 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void ProjectGenerator::buildDependencies(StaticList& libs, StaticList& addLibs,
7171
{
7272
// Add any forced dependencies
7373
if (m_projectName == "libavformat" && !winrt) {
74-
addLibs.push_back("ws2_32"); // Add the additional required libs
74+
addLibs.emplace_back("ws2_32"); // Add the additional required libs
7575
}
7676

7777
// Determine only those dependencies that are valid for current project
@@ -117,23 +117,23 @@ void ProjectGenerator::buildDependencies(StaticList& libs, StaticList& addLibs,
117117
} else if (i == "avisynth") {
118118
// doesn't need any additional libs
119119
} else if (i == "bcrypt") {
120-
addLibs.push_back("Bcrypt"); // Add the additional required libs
120+
addLibs.emplace_back("Bcrypt"); // Add the additional required libs
121121
} else if (i == "bzlib") {
122122
lib = "libbz2";
123123
} else if (i == "d3d12va") {
124124
if (winrt) {
125125
if (std::find(addLibs.cbegin(), addLibs.cend(), "dxgi") == addLibs.cend()) {
126-
addLibs.push_back("dxgi");
126+
addLibs.emplace_back("dxgi");
127127
}
128-
addLibs.push_back("d3d12");
128+
addLibs.emplace_back("d3d12");
129129
}
130130
// doesn't need any additional libs
131131
} else if (i == "d3d11va") {
132132
if (winrt) {
133133
if (std::find(addLibs.cbegin(), addLibs.cend(), "dxgi") == addLibs.cend()) {
134-
addLibs.push_back("dxgi");
134+
addLibs.emplace_back("dxgi");
135135
}
136-
addLibs.push_back("d3d11");
136+
addLibs.emplace_back("d3d11");
137137
}
138138
// doesn't need any additional libs
139139
} else if (i == "dxva2") {
@@ -143,7 +143,7 @@ void ProjectGenerator::buildDependencies(StaticList& libs, StaticList& addLibs,
143143
} else if (i == "libfdk_aac") {
144144
lib = "libfdk-aac";
145145
} else if (i == "libnpp") {
146-
addLibs.push_back("nppi"); // Add the additional required libs
146+
addLibs.emplace_back("nppi"); // Add the additional required libs
147147
// CUDA 7.5 onwards only provides npp for x64
148148
} else if (i == "libxvid") {
149149
lib = "libxvidcore";
@@ -158,19 +158,19 @@ void ProjectGenerator::buildDependencies(StaticList& libs, StaticList& addLibs,
158158
}
159159
}
160160
if (list == libs.end()) {
161-
libs.push_back("libcrypto");
161+
libs.emplace_back("libcrypto");
162162
}
163163
} else if (i == "decklink") {
164164
// Doesn't need any additional libs
165165
} else if (i == "opengl") {
166-
addLibs.push_back("Opengl32"); // Add the additional required libs
166+
addLibs.emplace_back("Opengl32"); // Add the additional required libs
167167
} else if (i == "opencl") {
168168
string fileName;
169169
if (!findFile(m_configHelper.m_rootDirectory + "compat/opencl/cl.h", fileName)) {
170-
addLibs.push_back("OpenCL"); // Add the additional required libs
170+
addLibs.emplace_back("OpenCL"); // Add the additional required libs
171171
}
172172
} else if (i == "openal") {
173-
addLibs.push_back("OpenAL32"); // Add the additional required libs
173+
addLibs.emplace_back("OpenAL32"); // Add the additional required libs
174174
} else if (i == "ffnvcodec") {
175175
// Doesn't require any additional libs
176176
} else if (i == "nvenc") {
@@ -179,32 +179,32 @@ void ProjectGenerator::buildDependencies(StaticList& libs, StaticList& addLibs,
179179
string fileName;
180180
if (!m_configHelper.isConfigOptionEnabled("ffnvcodec") &&
181181
!findFile(m_configHelper.m_rootDirectory + "compat/cuda/dynlink_cuda.h", fileName)) {
182-
addLibs.push_back("cuda"); // Add the additional required libs
182+
addLibs.emplace_back("cuda"); // Add the additional required libs
183183
}
184184
} else if (i == "cuda_sdk" || i == "cuda_nvcc") {
185185
// Doesn't require any additional libs
186186
} else if (i == "cuvid") {
187187
string fileName;
188188
if (!m_configHelper.isConfigOptionEnabled("ffnvcodec") &&
189189
!findFile(m_configHelper.m_rootDirectory + "compat/cuda/dynlink_nvcuvid.h", fileName)) {
190-
addLibs.push_back("nvcuvid"); // Add the additional required libs
190+
addLibs.emplace_back("nvcuvid"); // Add the additional required libs
191191
}
192192
} else if ((i == "nvdec") || (i == "nvenc")) {
193193
// Doesn't need any additional libs
194194
} else if (i == "mediafoundation") {
195-
addLibs.push_back("mfplat");
196-
addLibs.push_back("mfuuid");
195+
addLibs.emplace_back("mfplat");
196+
addLibs.emplace_back("mfuuid");
197197
if (!winrt) {
198-
addLibs.push_back("strmiids");
198+
addLibs.emplace_back("strmiids");
199199
}
200200
} else if (i == "schannel") {
201-
addLibs.push_back("Secur32"); // Add the additional required libs
201+
addLibs.emplace_back("Secur32"); // Add the additional required libs
202202
} else if (i == "sdl") {
203203
if (!m_configHelper.isConfigOptionValid("sdl2")) {
204-
libs.push_back("libsdl"); // Only add if not sdl2
204+
libs.emplace_back("libsdl"); // Only add if not sdl2
205205
}
206206
} else if (i == "wincrypt") {
207-
addLibs.push_back("Advapi32"); // Add the additional required libs
207+
addLibs.emplace_back("Advapi32"); // Add the additional required libs
208208
} else {
209209
// By default just use the lib name and prefix with lib if not already
210210
if (i.find("lib") == 0) {
@@ -238,12 +238,12 @@ void ProjectGenerator::buildDependencies(StaticList& libs, StaticList& addLibs,
238238
if (m_configHelper.isConfigOptionEnabled(i)) {
239239
// Add the additional required libs
240240
if (i == "dshow_indev") {
241-
addLibs.push_back("strmiids");
241+
addLibs.emplace_back("strmiids");
242242
} else if (i == "vfwcap_indev") {
243-
addLibs.push_back("vfw32");
244-
addLibs.push_back("shlwapi");
243+
addLibs.emplace_back("vfw32");
244+
addLibs.emplace_back("shlwapi");
245245
} else if ((i == "wasapi_indev") || (i == "wasapi_outdev")) {
246-
addLibs.push_back("ksuser");
246+
addLibs.emplace_back("ksuser");
247247
}
248248
}
249249
}
@@ -289,53 +289,50 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
289289
if (i.second && m_configHelper.isConfigOptionEnabled(i.first)) {
290290
// Add in the additional include directories
291291
if (i.first == "libopus") {
292-
includeDirs.push_back("$(OutDir)/include/opus/");
293-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/opus/");
292+
includeDirs.emplace_back("$(OutDir)/include/opus/");
293+
includeDirs.emplace_back("$(ProjectDir)/../../prebuilt/include/opus/");
294294
} else if (i.first == "libfreetype") {
295-
includeDirs.push_back("$(OutDir)/include/freetype2/");
296-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/freetype2/");
295+
includeDirs.emplace_back("$(OutDir)/include/freetype2/");
296+
includeDirs.emplace_back("$(ProjectDir)/../../prebuilt/include/freetype2/");
297297
} else if (i.first == "libfribidi") {
298-
includeDirs.push_back("$(OutDir)/include/fribidi/");
299-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/fribidi/");
300-
definesStatic.push_back("FRIBIDI_LIB_STATIC");
298+
includeDirs.emplace_back("$(OutDir)/include/fribidi/");
299+
includeDirs.emplace_back("$(ProjectDir)/../../prebuilt/include/fribidi/");
300+
definesStatic.emplace_back("FRIBIDI_LIB_STATIC");
301301
} else if (i.first == "libharfbuzz") {
302-
includeDirs.push_back("$(OutDir)/include/harfbuzz/");
303-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/harfbuzz/");
302+
includeDirs.emplace_back("$(OutDir)/include/harfbuzz/");
303+
includeDirs.emplace_back("$(ProjectDir)/../../prebuilt/include/harfbuzz/");
304304
} else if (i.first == "libilbc") {
305-
definesStatic.push_back("ILBC_STATIC_DEFINE");
305+
definesStatic.emplace_back("ILBC_STATIC_DEFINE");
306306
} else if (i.first == "libx264") {
307-
definesShared.push_back("X264_API_IMPORTS");
307+
definesShared.emplace_back("X264_API_IMPORTS");
308308
} else if (i.first == "libxml2") {
309-
includeDirs.push_back("$(OutDir)/include/libxml2/");
310-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/libxml2/");
311-
definesStatic.push_back("LIBXML_STATIC");
309+
includeDirs.emplace_back("$(OutDir)/include/libxml2/");
310+
includeDirs.emplace_back("$(ProjectDir)/../../prebuilt/include/libxml2/");
311+
definesStatic.emplace_back("LIBXML_STATIC");
312312
} else if (i.first == "libmfx") {
313-
includeDirs.push_back("$(OutDir)/include/mfx/");
314-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/mfx/");
315-
} else if ((i.first == "sdl") && !m_configHelper.isConfigOptionValid("sdl2")) {
316-
includeDirs.push_back("$(OutDir)/include/SDL/");
317-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/SDL/");
318-
} else if (i.first == "sdl2") {
319-
includeDirs.push_back("$(OutDir)/include/SDL/");
320-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/SDL/");
313+
includeDirs.emplace_back("$(OutDir)/include/mfx/");
314+
includeDirs.emplace_back("$(ProjectDir)/../../prebuilt/include/mfx/");
315+
} else if (i.first == "sdl2" || ((i.first == "sdl") && !m_configHelper.isConfigOptionValid("sdl2"))) {
316+
includeDirs.emplace_back("$(OutDir)/include/SDL/");
317+
includeDirs.emplace_back("$(ProjectDir)/../../prebuilt/include/SDL/");
321318
} else if (i.first == "opengl" && !winrt) {
322319
// Requires glext headers to be installed in include dir (does not require the libs)
323320
} else if (i.first == "opencl" && !winrt) {
324321
string fileName;
325322
if (!findFile(m_configHelper.m_rootDirectory + "compat/opencl/cl.h", fileName)) {
326323
// Need to check for the existence of environment variables
327324
if (findEnvironmentVariable("AMDAPPSDKROOT")) {
328-
includeDirs.push_back("$(AMDAPPSDKROOT)/include/");
329-
lib32Dirs.push_back("$(AMDAPPSDKROOT)/lib/Win32");
330-
lib64Dirs.push_back("$(AMDAPPSDKROOT)/lib/x64");
325+
includeDirs.emplace_back("$(AMDAPPSDKROOT)/include/");
326+
lib32Dirs.emplace_back("$(AMDAPPSDKROOT)/lib/Win32");
327+
lib64Dirs.emplace_back("$(AMDAPPSDKROOT)/lib/x64");
331328
} else if (findEnvironmentVariable("INTELOCLSDKROOT")) {
332-
includeDirs.push_back("$(INTELOCLSDKROOT)/include/");
333-
lib32Dirs.push_back("$(INTELOCLSDKROOT)/lib/x86");
334-
lib64Dirs.push_back("$(INTELOCLSDKROOT)/lib/x64");
329+
includeDirs.emplace_back("$(INTELOCLSDKROOT)/include/");
330+
lib32Dirs.emplace_back("$(INTELOCLSDKROOT)/lib/x86");
331+
lib64Dirs.emplace_back("$(INTELOCLSDKROOT)/lib/x64");
335332
} else if (findEnvironmentVariable("CUDA_PATH")) {
336-
includeDirs.push_back("$(CUDA_PATH)/include/");
337-
lib32Dirs.push_back("$(CUDA_PATH)/lib/Win32");
338-
lib64Dirs.push_back("$(CUDA_PATH)/lib/x64");
333+
includeDirs.emplace_back("$(CUDA_PATH)/include/");
334+
lib32Dirs.emplace_back("$(CUDA_PATH)/lib/Win32");
335+
lib64Dirs.emplace_back("$(CUDA_PATH)/lib/x64");
339336
} else {
340337
outputWarning("Could not find an OpenCl SDK environment variable.");
341338
outputWarning(
@@ -352,9 +349,9 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
352349
"Either the OpenAL SDK is not installed or the environment variable is missing.", false);
353350
outputWarning("Using the default environment variable of 'OPENAL_SDK'.", false);
354351
}
355-
includeDirs.push_back("$(OPENAL_SDK)/include/");
356-
lib32Dirs.push_back("$(OPENAL_SDK)/libs/Win32");
357-
lib64Dirs.push_back("$(OPENAL_SDK)/lib/Win64");
352+
includeDirs.emplace_back("$(OPENAL_SDK)/include/");
353+
lib32Dirs.emplace_back("$(OPENAL_SDK)/libs/Win32");
354+
lib64Dirs.emplace_back("$(OPENAL_SDK)/lib/Win64");
358355
} else if (i.first == "nvenc" && !winrt) {
359356
string fileName;
360357
if (!m_configHelper.isConfigOptionEnabled("ffnvcodec") &&
@@ -368,12 +365,12 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
368365
"NVENC requires CUDA to be installed with NVENC headers made available in the CUDA SDK include path.",
369366
false);
370367
}
371-
// Only add if it hasn’t already been added
368+
// Only add if it hasn't already been added
372369
if (find(includeDirs.begin(), includeDirs.end(), "$(CUDA_PATH)/include/") == includeDirs.end()) {
373-
includeDirs.push_back("$(CUDA_PATH)/include/");
370+
includeDirs.emplace_back("$(CUDA_PATH)/include/");
374371
}
375372
}
376-
} else if ((i.first == "cuda") || (i.first == "cuvid") && !winrt) {
373+
} else if (((i.first == "cuda") || (i.first == "cuvid")) && !winrt) {
377374
string fileName;
378375
if (!m_configHelper.isConfigOptionEnabled("ffnvcodec") &&
379376
!findFile(m_configHelper.m_rootDirectory + "compat/cuda/dynlink_cuda.h", fileName)) {
@@ -383,11 +380,11 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
383380
outputWarning(
384381
"Either the CUDA SDK is not installed or the environment variable is missing.", false);
385382
}
386-
// Only add if it hasn’t already been added
383+
// Only add if it hasn't already been added
387384
if (find(includeDirs.begin(), includeDirs.end(), "$(CUDA_PATH)/include/") == includeDirs.end()) {
388-
includeDirs.push_back("$(CUDA_PATH)/include/");
389-
lib32Dirs.push_back("$(CUDA_PATH)/lib/Win32");
390-
lib64Dirs.push_back("$(CUDA_PATH)/lib/x64");
385+
includeDirs.emplace_back("$(CUDA_PATH)/include/");
386+
lib32Dirs.emplace_back("$(CUDA_PATH)/lib/Win32");
387+
lib64Dirs.emplace_back("$(CUDA_PATH)/lib/x64");
391388
}
392389
}
393390
}

0 commit comments

Comments
 (0)