mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fixed some issues with the Linux Code::Blocks exporter

Browse source
This commit is contained in:
tpoole 2017-01-04 11:14:34 +00:00
parent f918827dcf
commit 25e72a71b9
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
extras/Projucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h
View file

@ -241,6 +241,22 @@ private:
}
}
if (config.exporter.isLinux())
{
if (linuxPackages.size() > 0)
{
auto pkgconfigFlags = String ("`pkg-config --cflags");
for (auto p : linuxPackages)
pkgconfigFlags << " " << p;
pkgconfigFlags << "`";
flags.add (pkgconfigFlags);
}
if (linuxLibs.contains("pthread"))
flags.add ("-pthread");
}
return getCleanedStringArray (flags);
}
@ -254,6 +270,16 @@ private:
flags.addTokens (replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim(),
" \n", "\"'");
if (config.exporter.isLinux() && linuxPackages.size() > 0)
{
auto pkgconfigLibs = String ("`pkg-config --libs");
for (auto p : linuxPackages)
pkgconfigLibs << " " << p;
pkgconfigLibs << "`";
flags.add (pkgconfigLibs);
}
return getCleanedStringArray (flags);
}
@ -262,9 +288,7 @@ private:
StringArray paths;
paths.add (".");
paths.add (RelativePath (project.getGeneratedCodeFolder(),
getTargetFolder(), RelativePath::buildTargetFolder).toWindowsStyle());
paths.addArray (extraSearchPaths);
paths.addArray (config.getHeaderSearchPaths());
if (! (isCodeBlocks() && isWindows()))