extras/the jucer/src/model/jucer_BinaryResources.cpp

@@ -215,7 +215,7 @@ Image* BinaryResources::getImageFromCache (const String& name) const
     return 0;
 }
 
-void BinaryResources::loadFromCpp (const String& cppFile)
+void BinaryResources::loadFromCpp (const File& cppFileLocation, const String& cppFile)
 {
     StringArray cpp;
     cpp.addLines (cppFile);
@@ -233,7 +233,7 @@ void BinaryResources::loadFromCpp (const String& cppFile)
 
             const String resourceName (tokens[0]);
             const int size = tokens[1].getIntValue();
-            const String originalFileName (tokens[2].unquoted());
+            const String originalFileName (cppFileLocation.getSiblingFile (tokens[2].unquoted()).getFullPathName());
 
             jassert (resourceName.isNotEmpty() && size > 0);
 
@@ -302,7 +302,7 @@ void BinaryResources::fillInGeneratedCode (GeneratedCode& code) const
             const MemoryBlock& mb = resources[i]->data;
 
             defs << "// JUCER_RESOURCE: " << name << ", " << mb.getSize()
-                 << ", \"" << resources[i]->originalFilename << "\"\n";
+                << ", \"" << File (resources[i]->originalFilename).getRelativePathFrom (code.document->getFile()) << "\"\n";
 
             String line1;
             line1 << "static const unsigned char resource_"

extras/the jucer/src/model/jucer_BinaryResources.h

@@ -49,7 +49,7 @@ public:
 
     const BinaryResources& operator= (const BinaryResources& other);
 
-    void loadFromCpp (const String& cpp);
+    void loadFromCpp (const File& cppFileLocation, const String& cpp);
 
     //==============================================================================
     struct BinaryResource

extras/the jucer/src/model/jucer_JucerDocument.cpp

@@ -420,7 +420,7 @@ const String JucerDocument::loadDocument (const File& file)
 
     const String cppFileString (cppFile.loadFileAsString());
 
-    resources.loadFromCpp (cppFileString);
+    resources.loadFromCpp (file, cppFileString);
 
     XmlElement* const xml = pullMetaDataFromCppFile (cppFileString);
 

extras/the jucer/src/templates/jucer_ComponentTemplate.cpp

@@ -9,7 +9,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Jucer version: 1.10
+  Jucer version: 1.11
 
   ------------------------------------------------------------------------------
 

extras/the jucer/src/templates/jucer_ComponentTemplate.h

@@ -9,7 +9,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Jucer version: 1.10
+  Jucer version: 1.11
 
   ------------------------------------------------------------------------------