From f4a5a0ecb42a802611fe07c541e95262cc80a259 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 28 Oct 2013 21:37:21 +0000 Subject: [PATCH] Introjucer: better exporting of absolute module paths in android makefiles. --- .../jucer_ProjectExport_Android.h | 3 ++- .../Source/Project/jucer_Module.cpp | 27 ++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h index ca204c278e..cf21e71a10 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h @@ -408,7 +408,8 @@ private: << "LOCAL_SRC_FILES := \\" << newLine; for (int i = 0; i < files.size(); ++i) - out << " ../" << escapeSpaces (files.getReference(i).toUnixStyle()) << "\\" << newLine; + out << " " << (files.getReference(i).isAbsolute() ? "" : "../") + << escapeSpaces (files.getReference(i).toUnixStyle()) << "\\" << newLine; String debugSettings, releaseSettings; diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp index de2d3fda6a..ec922ade4e 100644 --- a/extras/Introjucer/Source/Project/jucer_Module.cpp +++ b/extras/Introjucer/Source/Project/jucer_Module.cpp @@ -653,23 +653,26 @@ File EnabledModuleList::getModuleInfoFile (const String& moduleID) { const File moduleFolder (project.resolveFilename (path)); - File f (moduleFolder.getChildFile (ModuleDescription::getManifestFileName())); + if (moduleFolder.exists()) + { + File f (moduleFolder.getChildFile (ModuleDescription::getManifestFileName())); - if (f.exists()) - return f; + if (f.exists()) + return f; - f = moduleFolder.getChildFile (moduleID) - .getChildFile (ModuleDescription::getManifestFileName()); + f = moduleFolder.getChildFile (moduleID) + .getChildFile (ModuleDescription::getManifestFileName()); - if (f.exists()) - return f; + if (f.exists()) + return f; - f = moduleFolder.getChildFile ("modules") - .getChildFile (moduleID) - .getChildFile (ModuleDescription::getManifestFileName()); + f = moduleFolder.getChildFile ("modules") + .getChildFile (moduleID) + .getChildFile (ModuleDescription::getManifestFileName()); - if (f.exists()) - return f; + if (f.exists()) + return f; + } } } }