lazbuild: fix compilation as lazarus project (add LazControls dependency), fix crash in initialization (bug #0018122)

git-svn-id: trunk@28604 -
This commit is contained in:
paul 2010-12-03 04:03:49 +00:00
parent 2c392d68a7
commit 46cd0ac529
2 changed files with 8 additions and 8 deletions

View File

@ -24,16 +24,19 @@
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<RequiredPackages Count="3">
<RequiredPackages Count="4">
<Item1>
<PackageName Value="CodeTools"/>
<PackageName Value="LazControls"/>
</Item1>
<Item2>
<PackageName Value="SynEdit"/>
<PackageName Value="CodeTools"/>
</Item2>
<Item3>
<PackageName Value="IDEIntf"/>
<PackageName Value="SynEdit"/>
</Item3>
<Item4>
<PackageName Value="IDEIntf"/>
</Item4>
</RequiredPackages>
<Units Count="3">
<Unit0>
@ -65,9 +68,6 @@
<LCLWidgetType Value="nogui"/>
</SearchPaths>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>

View File

@ -791,9 +791,9 @@ begin
LoadEnvironmentOptions;
LoadMiscellaneousOptions;
InteractiveSetup:=false;
SetupMacros;
SetupCompilerFilename(InteractiveSetup);
SetupLazarusDirectory(InteractiveSetup);
SetupMacros;
SetupPackageSystem;
SetupOutputFilter;
MainBuildBoss.SetupCompilerInterface;