paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 18:40:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: build IDE: when not using idemake.cfg insert package options in same order

Browse Source 
git-svn-id: branches/fixes_1_4@48442 -
This commit is contained in:
mattias 2015-03-21 11:13:10 +00:00
parent 7f68c068d7
commit cceee7bb3a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ide/buildlazdialog.pas
View File

@ -571,8 +571,18 @@ begin
fExtraOptions:=fProfile.ExtraOptions;
// check for special IDE config file
//DebugLn(['CreateIDEMakeOptions blfUseMakeIDECfg=',blfUseMakeIDECfg in FLags,' ExtraOptions="',fExtraOptions,'" ',fPackageOptions]);
if (blfUseMakeIDECfg in Flags) then
SpecialIdeConfig;
SpecialIdeConfig
else if not (blfUseMakeIDECfg in Flags) then
AppendExtraOption(fPackageOptions,false);
{$IFDEF Windows}
if (fProfile.TargetPlatform=lpWin32)
and (Win32MajorVersion <=4)
and (Win32Platform = VER_PLATFORM_WIN32_WINDOWS) then
AppendExtraOption('-dWIN9XPLATFORM');
{$ENDIF}
// set target filename and target directory:
// 1. the user has set a target directory
@ -707,17 +717,6 @@ begin
if CreateRelativePath(fTargetFilename,fTargetDir) <> DefaultTargetFilename then
AppendExtraOption('-o'+fTargetFilename);
{$IFDEF Windows}
if (fProfile.TargetPlatform=lpWin32)
and (Win32MajorVersion <=4)
and (Win32Platform = VER_PLATFORM_WIN32_WINDOWS) then
AppendExtraOption('-dWIN9XPLATFORM');
{$ENDIF}
// add package options for IDE
//DebugLn(['CreateIDEMakeOptions blfUseMakeIDECfg=',blfUseMakeIDECfg in FLags,' ExtraOptions="',fExtraOptions,'" ',fPackageOptions]);
if not (blfUseMakeIDECfg in Flags) then
AppendExtraOption(fPackageOptions,false);
//DebugLn(['CreateIDEMakeOptions ',MMDef.Name,' ',fExtraOptions]);
end;