mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-29 02:40:05 +00:00
Code Activity

Changed some obj-C literals to avoid cross-linkage problems in plugins. More introjucer work.

Browse source
This commit is contained in:
Julian Storer 2011-07-07 22:16:51 +01:00
parent 0db8d0403b
commit cf4ecfacac
18 changed files with 236 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

14
extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h
View file

@ -74,7 +74,7 @@ public:
#endif
}
bool isPossibleForCurrentProject() { return project.getProjectType().isGUIApplication(); }
bool isPossibleForCurrentProject() { return projectType.isGUIApplication(); }
bool usesMMFiles() const { return false; }
void launchProject()
@ -208,7 +208,7 @@ private:
void writeAndroidMk (const File& file)
{
Array<RelativePath> files;
findAllFilesToCompile (project.getMainGroup(), files);
findAllFilesToCompile (getMainGroup(), files);
for (int i = 0; i < generatedGroups.size(); ++i)
findAllFilesToCompile (generatedGroups.getReference(i), files);
@ -265,9 +265,9 @@ private:
defines.set ("NDEBUG", "1");
}
for (int i = 0; i < project.getNumConfigurations(); ++i)
for (int i = 0; i < configs.size(); ++i)
{
Project::BuildConfiguration config (project.getConfiguration(i));
const Project::BuildConfiguration& config = configs.getReference(i);
if (config.isDebug() == forDebug)
{
@ -285,7 +285,7 @@ private:
XmlElement* createAntBuildXML()
{
XmlElement* proj = new XmlElement ("project");
proj->setAttribute ("name", project.getProjectName().toString());
proj->setAttribute ("name", projectName);
proj->setAttribute ("default", "debug");
proj->createNewChildElement ("property")->setAttribute ("file", "local.properties");
@ -376,7 +376,7 @@ private:
void writeIcon (const File& file, int size)
{
Image im (project.getBestIconForSize (size, false));
Image im (getBestIconForSize (size, false));
if (im.isValid())
{
@ -395,7 +395,7 @@ private:
XmlElement strings ("resources");
XmlElement* name = strings.createNewChildElement ("string");
name->setAttribute ("name", "app_name");
name->addTextElement (project.getProjectName().toString());
name->addTextElement (projectName);
writeXmlOrThrow (strings, file, "utf-8", 100);
}