IDE: fixed Makefile.compiled to contain inherited custom options

git-svn-id: trunk@42227 -
This commit is contained in:
mattias 2013-07-29 10:48:35 +00:00
parent e630515d61
commit da82a33fdf
33 changed files with 140 additions and 103 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l cairocanvas_pkg.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) cairocanvas_pkg.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l lhelpcontrolpkg.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) lhelpcontrolpkg.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../help/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l chmhelppkg.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) chmhelppkg.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);. -MObjFPC -Sci -O1 -g -gl -vewni -l codetools.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);. -MObjFPC -Sci -O1 -g -gl -vewni -l codetools.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l cody.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../units/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) cody.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l externhelp.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) externhelp.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../synedit/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l fpcunittestrunner.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) fpcunittestrunner.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l fpcunitide.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) fpcunitide.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -Fiimages -MObjFPC -Scghi -O1 -g -gl -vew -l ideintf.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -Fiimages -MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM) ideintf.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -vewnhi -l instantfpclaz.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) instantfpclaz.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../..;../../Parse;../../Parse/PreProcessor;../../Parse/UI;../../Process;../../Process/Align;../../Process/Capitalisation;../../Process/Indent;../../Process/Info;../../Process/Obfuscate;../../Process/Onceoffs;../../Process/Returns;../../Process/Spacing;../../Process/Transform;../../Process/Warnings;../../ReadWrite;../../Settings;../../Settings/Streams;../../Ui;../../Ui/Settings;../../Utils;../../Utils/DragDrop;../../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -Fi../../Include;../../Ui/Settings -MObjFPC -Sgi -O1 -g -gl -vewnhi -l jcfidelazarus.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../..;../../Parse;../../Parse/PreProcessor;../../Parse/UI;../../Process;../../Process/Align;../../Process/Capitalisation;../../Process/Indent;../../Process/Info;../../Process/Obfuscate;../../Process/Onceoffs;../../Process/Returns;../../Process/Spacing;../../Process/Transform;../../Process/Warnings;../../ReadWrite;../../Settings;../../Settings/Streams;../../Ui;../../Ui/Settings;../../Utils;../../Utils/DragDrop;../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -Fi../../Include;../../Ui/Settings -MObjFPC -Sgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) jcfidelazarus.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l lazcontrols.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) lazcontrols.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../codetools/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../synedit/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Sgi -O1 -g -gl -vewnhi -l lazsvnpkg.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../codetools/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Sgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) lazsvnpkg.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l lazutils.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l lazutils.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Sgi -O1 -vewnhi -l leakview.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Sgi -O1 -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) leakview.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l macosfiles.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) macosfiles.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l memdslaz.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) memdslaz.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fuunix;win32;carbon;qt;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../cairocanvas/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -Fiunix;win32;carbon;qt -MObjFPC -Scgi -O1 -g -gl -vewnhi -l printer4lazarus.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fuunix;win32;carbon;qt;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -Fiunix;win32;carbon;qt -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE printer4lazarus.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../cairocanvas/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l printers4lazide.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) printers4lazide.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l projtemplates.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) projtemplates.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l runtimetypeinfocontrols.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) runtimetypeinfocontrols.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l sdflaz.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) sdflaz.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../codetools/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../synedit/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l sqldblaz.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../codetools/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) sqldblaz.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -CR -O1 -g -gl -vewnh -l -vm4055,5024 allsynedit.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -CR -O1 -g -gl -vewnh -l -vm4055,5024 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc allsynedit.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnh -l -vm4055,5024 allsyneditdsgn.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnh -l -vm4055,5024 -dLCL -dLCL$(LCL_PLATFORM) -dgc allsyneditdsgn.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Funumlib_fix;editors;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l tachartlazaruspkg.pas"/>
<Makefile Value="2"/>
<Params Value=" -Funumlib_fix;editors;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) tachartlazaruspkg.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l dbflaz.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) dbflaz.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../codetools/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l todolistlaz.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../codetools/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) todolistlaz.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../cairocanvas/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../printers/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewni -l turbopoweripro.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewni -l -dLCL -dLCL$(LCL_PLATFORM) turbopoweripro.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -Fu../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../cairocanvas/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../lazcontrols/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../printers/lib/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l turbopoweriprodsgn.pas"/>
<Makefile Value="2"/>
<Params Value=" -Fu../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM) turbopoweriprodsgn.pas"/>
</CONFIG>

View File

@ -3720,9 +3720,9 @@ function TLazPackage.GetLastCompilerParams(o: TPkgOutputDir): string;
begin
Result:=LastCompile[o].Params;
if LastCompile[o].ViaMakefile then begin
Result:=StringReplace(Result,'%(CPU_TARGET)','$(TargetCPU)',[rfReplaceAll]);
Result:=StringReplace(Result,'%(OS_TARGET)','$(TargetOS)',[rfReplaceAll]);
Result:=StringReplace(Result,'%(LCL_PLATFORM)','$(LCLWidgetType)',[rfReplaceAll]);
Result:=StringReplace(Result,'$(CPU_TARGET)','$(TargetCPU)',[rfReplaceAll]);
Result:=StringReplace(Result,'$(OS_TARGET)','$(TargetOS)',[rfReplaceAll]);
Result:=StringReplace(Result,'$(LCL_PLATFORM)','$(LCLWidgetType)',[rfReplaceAll]);
Result:=SubstitutePkgMacros(Result,false);
end;
end;

View File

@ -46,7 +46,7 @@ uses
{$ENDIF}
// FPC + LCL
Classes, SysUtils, FileProcs, FileUtil, LCLProc, Forms, Controls, Dialogs,
Laz2_XMLCfg, InterfaceBase,
Laz2_XMLCfg, LazLogger, InterfaceBase,
// codetools
AVL_Tree, DefineTemplates, CodeCache,
BasicCodeTools, CodeToolsStructs, NonPascalCodeTools, SourceChanger,
@ -61,6 +61,10 @@ uses
DialogProcs, IDETranslations, CompilerOptions, PackageLinks, PackageDefs,
ComponentReg, ProjectIntf;
const
MakefileCompileVersion = 2;
// 2 : changed macro format from %() to $()
type
TFindPackageFlag = (
fpfSearchInInstalledPckgs,
@ -2665,6 +2669,8 @@ var
StateFileAge: Integer;
stats: PPkgLastCompileStats;
o: TPkgOutputDir;
MakefileValue: String;
MakefileVersion: Integer;
begin
o:=APackage.GetOutputDirType;
stats:=@APackage.LastCompile[o];
@ -2690,7 +2696,18 @@ begin
stats^.Params:=XMLConfig.GetValue('Params/Value','');
stats^.Complete:=XMLConfig.GetValue('Complete/Value',true);
stats^.MainPPUExists:=XMLConfig.GetValue('Complete/MainPPUExists',true);
stats^.ViaMakefile:=XMLConfig.GetValue('Makefile/Value',false);
MakefileValue:=XMLConfig.GetValue('Makefile/Value','');
if (MakefileValue='') then
stats^.ViaMakefile:=false
else begin
stats^.ViaMakefile:=true;
MakefileVersion:=StrToIntDef(MakefileValue,0);
if MakefileVersion<2 then begin
// old versions used %(
stats^.CompilerFilename:=StringReplace(stats^.CompilerFilename,'%(','$(',[rfReplaceAll]);
stats^.Params:=StringReplace(stats^.Params,'%(','$(',[rfReplaceAll]);
end;
end;
if stats^.ViaMakefile then begin
DoDirSeparators(stats^.CompilerFilename);
DoDirSeparators(stats^.Params);
@ -3045,6 +3062,8 @@ begin
LastParams:=APackage.GetLastCompilerParams(o);
if Stats^.ViaMakefile then begin
// the package was compiled via Makefile/fpmake
debugln(['TLazPackageGraph.CheckIfCurPkgOutDirNeedsCompile Last=',LastParams]);
CurPaths:=nil;
LastPaths:=nil;
try
@ -3578,7 +3597,7 @@ begin
try
XMLConfig:=TXMLConfig.Create(TargetCompiledFile);
try
XMLConfig.SetValue('Makefile/Value',True);
XMLConfig.SetValue('Makefile/Value',MakefileCompileVersion);
s:='';
if UnitPath<>'' then
s:=s+' -Fu'+SwitchPathDelims(UnitPath,pdsUnix);
@ -3621,7 +3640,7 @@ var
repeat
p:=Pos(SearchTxt,s);
if p<=1 then break;
s:=copy(s,1,p-1)+ReplaceTxt+copy(s,p+length(SearchTxt),length(s));
ReplaceSubstring(s,p,length(SearchTxt),ReplaceTxt);
until false;
end;
@ -3640,6 +3659,14 @@ var
Replace(Result,PathDelim,'/');
end;
function ConvertLazarusToMakefileCompiledSearchPath(const s: string): string;
begin
Result:=ConvertPIMacrosToMakefileMacros(s);
Result:=CreateRelativeSearchPath(TrimSearchPath(Result,''),APackage.Directory);
if PathDelimNeedsReplace then
Replace(Result,PathDelim,'/');
end;
function ConvertLazarusToMakefileDirectory(const s: string): string;
begin
Result:=ConvertPIMacrosToMakefileMacros(s);
@ -3672,6 +3699,8 @@ var
IncPath: String;
MakefileCompiledFilename: String;
OtherOptions: String;
FormUnitPath: String;
FormIncPath: String;
begin
Result:=mrCancel;
PathDelimNeedsReplace:=PathDelim<>'/';
@ -3701,13 +3730,6 @@ begin
OtherOptions:=APackage.CompilerOptions.MakeOptionsString(
[ccloDoNotAppendOutFileOption,ccloNoMacroParams]);
Result:=WriteMakefileCompiled(APackage,MakefileCompiledFilename,UnitPath,
IncPath,OtherOptions);
if Result<>mrOK then exit;
//DebugLn('TPkgManager.DoWriteMakefile ',APackage.Name,' makefile UnitPath="',UnitPath,'"');
UnitPath:=ConvertLazarusToMakefileSearchPath(UnitPath);
IncPath:=ConvertLazarusToMakefileSearchPath(IncPath);
// remove path delimiter at the end, or else it will fail on windows
UnitOutputPath:=ConvertLazarusToMakefileDirectory(
ChompPathDelim(UnitOutputPath));
@ -3722,6 +3744,21 @@ begin
OtherOptions:=CustomOptions;
debugln(['TLazPackageGraph.WriteMakeFile Other="',OtherOptions,'"']);
// ---- Makefile.compiled ----------------------------------------------------
//DebugLn('TPkgManager.DoWriteMakefile ',APackage.Name,' makefile UnitPath="',UnitPath,'"');
FormUnitPath:=ConvertLazarusToMakefileCompiledSearchPath(UnitPath);
FormIncPath:=ConvertLazarusToMakefileCompiledSearchPath(IncPath);
Result:=WriteMakefileCompiled(APackage,MakefileCompiledFilename,FormUnitPath,
FormIncPath,OtherOptions);
if Result<>mrOK then exit;
// ---- Makefile.fpc ---------------------------------------------------------
//DebugLn('TPkgManager.DoWriteMakefile ',APackage.Name,' makefile UnitPath="',UnitPath,'"');
FormUnitPath:=ConvertLazarusToMakefileSearchPath(UnitPath);
FormIncPath:=ConvertLazarusToMakefileSearchPath(IncPath);
e:=LineEnding;
s:='';
s:=s+'# File generated automatically by Lazarus Package Manager'+e;
@ -3737,9 +3774,9 @@ begin
s:=s+'[compiler]'+e;
s:=s+'unittargetdir='+UnitOutputPath+e;
if UnitPath<>'' then
s:=s+'unitdir='+UnitPath+e;
s:=s+'unitdir='+FormUnitPath+e;
if IncPath<>'' then
s:=s+'includedir='+IncPath+e;
s:=s+'includedir='+FormIncPath+e;
s:=s+'options='+OtherOptions+e;
s:=s+''+e;
s:=s+'[target]'+e;

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="True"/>
<Makefile Value="2"/>
<Params Value=" -Fu. -MObjFPC -Scghi -O1 -g -gl -vewnhi -l fcllaz.pas"/>
</CONFIG>