lazbuild: fixed using --os and --ws parameters

git-svn-id: trunk@13093 -
This commit is contained in:
vincents 2007-11-30 22:42:17 +00:00
parent ac4e02dcb6
commit 27be8996ea
2 changed files with 15 additions and 10 deletions

View File

@ -1,12 +1,12 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<PathDelim Value="/"/> <PathDelim Value="\"/>
<Version Value="5"/> <Version Value="6"/>
<General> <General>
<SessionStorage Value="InIDEConfig"/> <SessionStorage Value="InIDEConfig"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/> <IconPath Value=".\"/>
<TargetFileExt Value=""/> <TargetFileExt Value=""/>
</General> </General>
<PublishOptions> <PublishOptions>
@ -17,15 +17,16 @@
<RunParams> <RunParams>
<local> <local>
<FormatVersion Value="1"/> <FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> <CommandLineParams Value="c:\lazarus\source\lazarus\examples\hello.lpi"/>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>
<PackageName Value="SynEdit"/> <PackageName Value="IDEIntf"/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="IDEIntf"/> <PackageName Value="SynEdit"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="3"> <Units Count="3">
@ -48,13 +49,14 @@
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="5"/>
<PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../lazbuild"/> <Filename Value="..\lazbuild"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="include/;include/$(TargetOS)/"/> <IncludeFiles Value="include\;include\$(TargetOS)\"/>
<OtherUnitFiles Value="../designer/;../packager/;../components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> <OtherUnitFiles Value="..\designer\;..\packager\;..\components\codetools\units\$(TargetCPU)-$(TargetOS)\"/>
<UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="..\units\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<CodeGeneration> <CodeGeneration>
<Generate Value="Faster"/> <Generate Value="Faster"/>

View File

@ -438,6 +438,9 @@ begin
if Project1.MainUnitInfo=nil then if Project1.MainUnitInfo=nil then
Error(ErrorBuildFailed,'project has no main unit'); Error(ErrorBuildFailed,'project has no main unit');
Project1.CompilerOptions.TargetOS:=OSOverride;
Project1.CompilerOptions.LCLWidgetType:=WidgetSetOverride;
if not SkipDependencies then begin if not SkipDependencies then begin
// compile required packages // compile required packages
CheckPackageGraphForCompilation(nil,Project1.FirstRequiredDependency); CheckPackageGraphForCompilation(nil,Project1.FirstRequiredDependency);