paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 01:16:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: lpi: use as default: Compilerpath=$(CompPath)

Browse Source 
git-svn-id: trunk@45532 -
This commit is contained in:
mattias 2014-06-15 12:22:47 +00:00
parent 67932e3733
commit d101548d68
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/compileroptions.pp
View File

@ -62,6 +62,8 @@ uses
{$ENDIF}
ModeMatrixOpts, CompOptsModes, EnvironmentOpts;
const
DefaultCompilerPath = '$(CompPath)';
type
TCheckCompileOptionsMsgLvl = (
@ -1808,7 +1810,7 @@ begin
UseCommentsInCustomOptions := aXMLConfig.GetValue(p+'ConfigFile/UseCommentsInCustomOptions/Value', false);
{ Compilation }
CompilerPath := f(aXMLConfig.GetValue(p+'CompilerPath/Value','$(CompPath)'));
CompilerPath := f(aXMLConfig.GetValue(p+'CompilerPath/Value',DefaultCompilerPath));
ExecuteBefore.LoadFromXMLConfig(aXMLConfig,p+'ExecuteBefore/',PathDelimChange);
ExecuteAfter.LoadFromXMLConfig(aXMLConfig,p+'ExecuteAfter/',PathDelimChange);
@ -2030,7 +2032,7 @@ begin
aXMLConfig.SetDeleteValue(p+'ConfigFile/UseCommentsInCustomOptions/Value', UseCommentsInCustomOptions,false);
{ Compilation }
aXMLConfig.SetDeleteValue(p+'CompilerPath/Value', f(CompilerPath),'');
aXMLConfig.SetDeleteValue(p+'CompilerPath/Value', f(CompilerPath),DefaultCompilerPath);
ExecuteBefore.SaveToXMLConfig(aXMLConfig,p+'ExecuteBefore/',UsePathDelim);
ExecuteAfter.SaveToXMLConfig(aXMLConfig,p+'ExecuteAfter/',UsePathDelim);
aXMLConfig.SetDeleteValue(p+'CreateMakefileOnBuild/Value',
@ -3535,7 +3537,7 @@ begin
ClearInheritedOptions;
// compilation
CompilerPath := '$(CompPath)';
CompilerPath := DefaultCompilerPath;
fExecuteBefore.Clear;
fExecuteAfter.Clear;