Skip to content

Commit e2afcd6

Browse files
committed
Support oneVPL include directory changes.
1 parent 4b1c9f3 commit e2afcd6

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

source/projectGenerator_build.cpp

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -269,29 +269,32 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
269269
if (i.second && m_configHelper.isConfigOptionEnabled(i.first)) {
270270
// Add in the additional include directories
271271
if (i.first == "libopus") {
272-
includeDirs.push_back("$(OutDir)/include/opus");
273-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/opus");
272+
includeDirs.push_back("$(OutDir)/include/opus/");
273+
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/opus/");
274274
} else if (i.first == "libfreetype") {
275-
includeDirs.push_back("$(OutDir)/include/freetype2");
276-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/freetype2");
275+
includeDirs.push_back("$(OutDir)/include/freetype2/");
276+
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/freetype2/");
277277
} else if (i.first == "libfribidi") {
278-
includeDirs.push_back("$(OutDir)/include/fribidi");
279-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/fribidi");
278+
includeDirs.push_back("$(OutDir)/include/fribidi/");
279+
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/fribidi/");
280280
definesStatic.push_back("FRIBIDI_LIB_STATIC");
281281
} else if (i.first == "libilbc") {
282282
definesStatic.push_back("ILBC_STATIC_DEFINE");
283283
} else if (i.first == "libx264") {
284284
definesShared.push_back("X264_API_IMPORTS");
285285
} else if (i.first == "libxml2") {
286-
includeDirs.push_back("$(OutDir)/include/libxml2");
287-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/libxml2");
286+
includeDirs.push_back("$(OutDir)/include/libxml2/");
287+
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/libxml2/");
288288
definesStatic.push_back("LIBXML_STATIC");
289+
} else if (i.first == "libmfx") {
290+
includeDirs.push_back("$(OutDir)/include/mfx/");
291+
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/mfx/");
289292
} else if ((i.first == "sdl") && !m_configHelper.isConfigOptionValid("sdl2")) {
290-
includeDirs.push_back("$(OutDir)/include/SDL");
291-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/SDL");
293+
includeDirs.push_back("$(OutDir)/include/SDL/");
294+
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/SDL/");
292295
} else if (i.first == "sdl2") {
293-
includeDirs.push_back("$(OutDir)/include/SDL");
294-
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/SDL");
296+
includeDirs.push_back("$(OutDir)/include/SDL/");
297+
includeDirs.push_back("$(ProjectDir)/../../prebuilt/include/SDL/");
295298
} else if (i.first == "opengl" && !winrt) {
296299
// Requires glext headers to be installed in include dir (does not require the libs)
297300
} else if (i.first == "opencl" && !winrt) {

0 commit comments

Comments
 (0)