tools: updatemakefiles: using only lazutils instead of lclbase

git-svn-id: trunk@49904 -
This commit is contained in:
mattias 2015-10-01 18:20:52 +00:00
parent 96b62bb8fa
commit bd72ae95df
3 changed files with 490 additions and 95 deletions

File diff suppressed because it is too large Load Diff

View File

@ -16,7 +16,7 @@ libc=y
packages=rtl packages=rtl
[compiler] [compiler]
options=-gl $(LAZARUS_LIBPATHS) options=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
unitdir=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) \ unitdir=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) \
$(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
$(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
@ -25,6 +25,10 @@ targetdir=.
[prerules] [prerules]
LAZDIR=.. LAZDIR=..
DBG_OPTIONS=
ifeq ($(OS_TARGET),darwin)
DBG_OPTIONS=-gw
endif
[rules] [rules]
.PHONY: all .PHONY: all

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="9"/> <Version Value="9"/>
@ -32,19 +32,15 @@
<LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="1">
<Item1> <Item1>
<PackageName Value="CodeTools"/> <PackageName Value="CodeTools"/>
</Item1> </Item1>
<Item2>
<PackageName Value="LCLBase"/>
</Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="1"> <Units Count="1">
<Unit0> <Unit0>
<Filename Value="updatemakefiles.lpr"/> <Filename Value="updatemakefiles.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="updatemakefiles"/>
</Unit0> </Unit0>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
@ -57,12 +53,6 @@
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Other>
<CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions Count="3"> <Exceptions Count="3">