mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-08 11:38:21 +02:00
Check for custom build properties in DoResolveConfigString.
This commit is contained in:
parent
d929e1bfe9
commit
fe967e6a04
1 changed files with 8 additions and 3 deletions
|
@ -10942,6 +10942,13 @@ namespace IDE
|
||||||
}
|
}
|
||||||
case "BeefPath":
|
case "BeefPath":
|
||||||
newString = gApp.mInstallDir;
|
newString = gApp.mInstallDir;
|
||||||
|
default:
|
||||||
|
// Check if any custom properties match the string.
|
||||||
|
if (CustomBuildProperties.Contains(replaceStr))
|
||||||
|
{
|
||||||
|
newString = scope:ReplaceBlock String();
|
||||||
|
newString.Append(CustomBuildProperties.Get(replaceStr));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11062,9 +11069,7 @@ namespace IDE
|
||||||
String errorString = scope String();
|
String errorString = scope String();
|
||||||
if (!DoResolveConfigString(platformName, workspaceOptions, project, options, configString, errorString, outResult))
|
if (!DoResolveConfigString(platformName, workspaceOptions, project, options, configString, errorString, outResult))
|
||||||
{
|
{
|
||||||
if (!CustomBuildProperties.Contains(errorString))
|
|
||||||
OutputErrorLine("Invalid macro in {0}: {1}", errorContext, errorString);
|
OutputErrorLine("Invalid macro in {0}: {1}", errorContext, errorString);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue