Skip to content

Commit

Permalink
esp32: dependencies only for apps, not mods #1408
Browse files Browse the repository at this point in the history
  • Loading branch information
mkellner committed Sep 22, 2024
1 parent 11f1113 commit cb204f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 4 additions & 3 deletions tools/mcmanifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,9 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
this.line("");
}
generateDependenciesDefinitions(tool) {
if ("mcrun" == tool.toolName)
return;

if ("esp32" == tool.platform) {
if (tool.dependencies?.length) {
var projBase = `${tool.tmpPath}${tool.slash}xsProj-${tool.environment.ESP32_SUBCLASS}${tool.slash}managed_components${tool.slash}`;
Expand All @@ -759,9 +762,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
this.write("\n");
}
}
if (("esp32" == tool.platform) &&
((tool.dependencies?.length > 0) || (tool.environment.USE_USB == 1))) {

if ("esp32" == tool.platform) {
var dep, did = 0;
let depStr = "BUILD_DEPENDENCIES = ";
for (dep of tool.dependencies) {
Expand Down
1 change: 1 addition & 0 deletions tools/mcrun.js
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ export default class extends Tool {
}
}
run() {
this.toolName = "mcrun";
this.localsName = "modLocals";
super.run();

Expand Down

0 comments on commit cb204f7

Please sign in to comment.