Browse Source

Introjucer: added a "defines" parameter to the module manifest format, to allow it to set modules to set project-wide preprocessor defs.

tags/2021-05-28
jules 12 years ago
parent
commit
cb2e2aa607
2 changed files with 6 additions and 0 deletions
  1. +5
    -0
      extras/Introjucer/Source/Project/jucer_Module.cpp
  2. +1
    -0
      extras/Introjucer/Source/Project/jucer_Module.h

+ 5
- 0
extras/Introjucer/Source/Project/jucer_Module.cpp View File

@@ -333,6 +333,11 @@ void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& pr
exporter.addToExtraSearchPaths (exporter.getModuleFolderRelativeToProject (getID(), projectSaver).getParentDirectory()); exporter.addToExtraSearchPaths (exporter.getModuleFolderRelativeToProject (getID(), projectSaver).getParentDirectory());
const String extraDefs (moduleInfo.getPreprocessorDefs().trim());
if (extraDefs.isNotEmpty())
exporter.getExporterPreprocessorDefs() = exporter.getExporterPreprocessorDefsString() + "\n" + extraDefs;
{ {
Array<File> compiled; Array<File> compiled;
findAndAddCompiledCode (exporter, projectSaver, moduleInfo.getFolder(), compiled); findAndAddCompiledCode (exporter, projectSaver, moduleInfo.getFolder(), compiled);


+ 1
- 0
extras/Introjucer/Source/Project/jucer_Module.h View File

@@ -45,6 +45,7 @@ struct ModuleDescription
String getDescription() const { return moduleInfo [Ids::description].toString(); } String getDescription() const { return moduleInfo [Ids::description].toString(); }
String getLicense() const { return moduleInfo [Ids::license].toString(); } String getLicense() const { return moduleInfo [Ids::license].toString(); }
String getHeaderName() const { return moduleInfo [Ids::include].toString(); } String getHeaderName() const { return moduleInfo [Ids::include].toString(); }
String getPreprocessorDefs() const { return moduleInfo [Ids::defines].toString(); }
File getFolder() const { jassert (manifestFile != File::nonexistent); return manifestFile.getParentDirectory(); } File getFolder() const { jassert (manifestFile != File::nonexistent); return manifestFile.getParentDirectory(); }


Loading…
Cancel
Save