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 a path parsing issue in the Code::Blocks Linux exporter

Browse source
This commit is contained in:
tpoole 2017-10-08 08:47:58 +01:00
parent d95edfd770
commit 39a6e9ea31
1 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

41
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h
View file

@ -306,6 +306,25 @@ private:
};
//==============================================================================
StringArray getPackages() const
{
StringArray result (linuxPackages);
static String guiExtrasModule ("juce_gui_extra");
if (project.getModules().isModuleEnabled (guiExtrasModule)
&& project.isConfigFlagEnabled ("JUCE_WEB_BROWSER", true))
{
result.add ("webkit2gtk-4.0");
result.add ("gtk+-x11-3.0");
}
result.removeDuplicates (false);
return result;
}
void addVersion (XmlElement& xml) const
{
XmlElement* fileVersion = xml.createNewChildElement ("FileVersion");
@ -324,7 +343,7 @@ private:
{
StringPairArray defines;
if (isCodeBlocks() && isWindows())
if (isWindows())
{
defines.set ("__MINGW__", "1");
defines.set ("__MINGW_EXTENSION", String());
@ -399,10 +418,12 @@ private:
if (target.isDynamicLibrary() || getProject().getProjectType().isAudioPlugin())
flags.add ("-fPIC");
if (linuxPackages.size() > 0)
const auto packages = getPackages();
if (packages.size() > 0)
{
auto pkgconfigFlags = String ("`pkg-config --cflags");
for (auto p : linuxPackages)
for (auto p : packages)
pkgconfigFlags << " " << p;
pkgconfigFlags << "`";
@ -432,13 +453,15 @@ private:
if (getProject().getProjectType().isAudioPlugin() && target.type != ProjectType::Target::SharedCodeTarget)
flags.add ("-l" + config.getTargetBinaryNameString());
if (config.exporter.isLinux() && linuxPackages.size() > 0)
const auto packages = getPackages();
if (config.exporter.isLinux() && packages.size() > 0)
{
if (target.isDynamicLibrary())
flags.add ("-shared");
auto pkgconfigLibs = String ("`pkg-config --libs");
for (auto p : linuxPackages)
for (auto p : packages)
pkgconfigLibs << " " << p;
pkgconfigLibs << "`";
@ -456,9 +479,15 @@ private:
paths.addArray (extraSearchPaths);
paths.addArray (config.getHeaderSearchPaths());
if (! (isCodeBlocks() && isWindows()))
if (! isWindows())
{
paths.add ("/usr/include/freetype2");
// Replace ~ character with $(HOME) environment variable
for (auto& path : paths)
path = path.replace ("~", "$(HOME)");
}
return getCleanedStringArray (paths);
}