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

Browse source
This commit is contained in:
jules 2007-09-25 10:24:08 +00:00
parent bc3d1ca7d6
commit f321759eff
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/the jucer/src/model/jucer_BinaryResources.cpp
View file

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

2
extras/the jucer/src/model/jucer_BinaryResources.h
View file

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

2
extras/the jucer/src/model/jucer_JucerDocument.cpp
View file

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

2
extras/the jucer/src/templates/jucer_ComponentTemplate.cpp
View file

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

2
extras/the jucer/src/templates/jucer_ComponentTemplate.h
View file

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