Merged revision(s) 65400-65401 #d6d34c6e68-#d6d34c6e68, 65403 #f5630f1082, 65406 #9acddfe467 from trunk:

lcl: updated Makefile.compiled
........
lcl: updated Makefile.compiled
........
lcl: updated Makefile.compiled with freetype
........
Makefile, LCL: fix path for freetype
........

git-svn-id: branches/fixes_2_2@65408 -
This commit is contained in:
martin 2021-07-08 13:07:31 +00:00
parent a1ff73fe2b
commit 38542f41d7
12 changed files with 12 additions and 12 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="2"/>
<Params Value=" -Fuforms;widgetset;nonwin32;../packager/units/$(CPU_TARGET)-$(OS_TARGET);../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);. -Fiinclude -MObjFPC -Scghi -O1 -g -gl -vew -l alllclunits.pp"/>
<Params Value=" -Fuforms;widgetset;nonwin32;../packager/units/$(CPU_TARGET)-$(OS_TARGET);../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);. -Fiinclude -MObjFPC -Scghi -O1 -g -gl -vew -l alllclunits.pp"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vew -l -Fuforms;widgetset;;../packager/units/%(CPU_TARGET)-%(OS_TARGET);../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);. -Fiinclude alllclunits.pp"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vew -l -Fuforms;widgetset;;../packager/units/%(CPU_TARGET)-%(OS_TARGET);../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../components/freetype/lib/%(CPU_TARGET)-%(OS_TARGET);. -Fiinclude alllclunits.pp"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -dcarbon -vewnhi -l -Fucarbon;carbon/objc;carbon/pascocoa/appkit;carbon/pascocoa/foundation;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Ficarbon;carbon/objc;carbon/pascocoa/appkit;carbon/pascocoa/foundation lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -dcarbon -vewnhi -l -Fucarbon;carbon/objc;carbon/pascocoa/appkit;carbon/pascocoa/foundation;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Ficarbon;carbon/objc;carbon/pascocoa/appkit;carbon/pascocoa/foundation lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fucocoa;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Ficocoa lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fucocoa;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Ficocoa lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fufpgui;fpgui/gui;fpgui/corelib;fpgui/corelib/x11;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fifpgui;fpgui/gui;fpgui/corelib;fpgui/corelib/x11 -dfpguix11 lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fufpgui;fpgui/gui;fpgui/corelib;fpgui/corelib/x11;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fifpgui;fpgui/gui;fpgui/corelib;fpgui/corelib/x11 -dfpguix11 lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fugtk2;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Figtk2 lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fugtk2;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Figtk2 lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fugtk2;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Figtk2 lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fugtk2;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Figtk2 lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Funogui;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Finogui lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Funogui;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Finogui lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuqt;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiqt lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuqt;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiqt lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuqt5;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiqt5 lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuqt5;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiqt5 lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuwin32;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiwin32 lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuwin32;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiwin32 lcl.pas"/>
</CONFIG>

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuwince;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiwince -dDisableChecks lcl.pas"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vewnhi -l -Fuwince;../../packager/units/%(CPU_TARGET)-%(OS_TARGET);../../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../../components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../units/%(CPU_TARGET)-%(OS_TARGET);. -Fiwince -dDisableChecks lcl.pas"/>
</CONFIG>