paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-12 22:24:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: fixed compilation

Browse Source 
git-svn-id: trunk@37088 -
This commit is contained in:
mattias 2012-04-29 18:26:47 +00:00
parent 8be47d95a1
commit ed45f617f0
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ide/lazbuild.lpr
View File

@ -33,7 +33,8 @@ uses
// codetools // codetools
CodeCache, CodeToolManager, DefineTemplates, Laz2_XMLCfg, CodeCache, CodeToolManager, DefineTemplates, Laz2_XMLCfg,
// IDEIntf // IDEIntf
MacroIntf, PackageIntf, IDEDialogs, ProjectIntf, IDEExternToolIntf, CompOptsIntf, MacroIntf, PackageIntf, IDEDialogs, ProjectIntf, IDEExternToolIntf,
CompOptsIntf, LazIDEIntf,
// IDE // IDE
IDEProcs, InitialSetupDlgs, OutputFilter, CompilerOptions, ApplicationBundle, IDEProcs, InitialSetupDlgs, OutputFilter, CompilerOptions, ApplicationBundle,
TransferMacros, EnvironmentOpts, IDETranslations, LazarusIDEStrConsts, TransferMacros, EnvironmentOpts, IDETranslations, LazarusIDEStrConsts,
@ -352,8 +353,6 @@ begin
APackage.CompilerOptions.TargetOS:=OSOverride; APackage.CompilerOptions.TargetOS:=OSOverride;
if (Length(CPUOverride) <> 0) then if (Length(CPUOverride) <> 0) then
APackage.CompilerOptions.TargetCPU:=CPUOverride; APackage.CompilerOptions.TargetCPU:=CPUOverride;
if (Length(WidgetSetOverride) <> 0) then
APackage.CompilerOptions.LCLWidgetType:=WidgetSetOverride;
if CreateMakefile then if CreateMakefile then
DoCreateMakefile(APackage) DoCreateMakefile(APackage)
@ -698,9 +697,9 @@ begin
if (CPUOverride<>'') then if (CPUOverride<>'') then
Project1.CompilerOptions.TargetCPU:=CPUOverride; Project1.CompilerOptions.TargetCPU:=CPUOverride;
if (WidgetSetOverride<>'') then if (WidgetSetOverride<>'') then
Project1.CompilerOptions.LCLWidgetType:=WidgetSetOverride; Project1.ActiveBuildMode.MacroValues.Values['LCLWidgetType']:=WidgetSetOverride;
// apply options // apply options
MainBuildBoss.SetBuildTargetProject1(true,bmsfsSkip); MainBuildBoss.SetBuildTargetProject1(true,smsfsSkip);
if not SkipDependencies then begin if not SkipDependencies then begin
// compile required packages // compile required packages
@ -878,7 +877,7 @@ begin
// load static base packages // load static base packages
PackageGraph.LoadStaticBasePackages; PackageGraph.LoadStaticBasePackages;
MainBuildBoss.SetBuildTarget(OSOverride,CPUOverride,WidgetSetOverride,bmsfsSkip,true); MainBuildBoss.SetBuildTarget(OSOverride,CPUOverride,WidgetSetOverride,smsfsSkip,true);
fInitResult:=true; fInitResult:=true;
Result:=fInitResult; Result:=fInitResult;

4
lcl/interfaces/nogui/alllclintfunits.pas
View File

@ -3,7 +3,7 @@ unit AllLCLIntfUnits;
interface interface
uses uses
interfaces, interfaces,
noguiint{%H-}, {%H-}noguiint{%H-},
noguiwsfactory{%H-}; {%H-}noguiwsfactory{%H-};
implementation implementation
end. end.

2
lcl/interfaces/nogui/interfaces.pp
View File

@ -29,7 +29,7 @@ uses
implementation implementation
uses uses
NoGUIInt, NoGUIWSFactory{%H-}, Forms; NoGUIInt, {%H-}NoGUIWSFactory{%H-}, Forms;
initialization initialization
CreateWidgetset(TNoGUIWidgetSet); CreateWidgetset(TNoGUIWidgetSet);