From 25e72a71b956029ee8c017fc161aba06474e4a37 Mon Sep 17 00:00:00 2001
From: tpoole <t.b.poole@gmail.com>
Date: Wed, 4 Jan 2017 11:14:34 +0000
Subject: [PATCH] Fixed some issues with the Linux Code::Blocks exporter

---
 .../jucer_ProjectExport_CodeBlocks.h          | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h
index 199bff2955..f9de4e1cba 100644
--- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h	
+++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h	
@@ -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()))