Merged revisions 9638-9645,9648,9717 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
  r9638 | marco | 2008-01-05 20:00:24 +0100 (Sat, 05 Jan 2008) | 1 line
  
   * base units from base/winunits to winunits-base
........
  r9639 | marco | 2008-01-05 20:27:57 +0100 (Sat, 05 Jan 2008) | 3 lines
  
   * winunits-jedi. Dependancy on winunits-base not work yet.
      old winunits removed from base/
........
  r9640 | marco | 2008-01-05 20:31:13 +0100 (Sat, 05 Jan 2008) | 2 lines
  
   * demoes moved for winunits-base
........
  r9641 | marco | 2008-01-05 20:46:23 +0100 (Sat, 05 Jan 2008) | 2 lines
  
   * some makefile fixes.
........
  r9642 | marco | 2008-01-05 21:16:12 +0100 (Sat, 05 Jan 2008) | 1 line
  
   * deps fixed, now compiles again
........
  r9643 | marco | 2008-01-05 21:27:09 +0100 (Sat, 05 Jan 2008) | 1 line
  
   * another small fix. A unit was no longer implicitely compiled due to jedi internal changes. Now added to buildunit
........
  r9644 | marco | 2008-01-05 21:55:27 +0100 (Sat, 05 Jan 2008) | 1 line
  
   * no longer used control files. Real units have been moved with history ( I hope ) 
........
  r9645 | jonas | 2008-01-05 22:21:00 +0100 (Sat, 05 Jan 2008) | 2 lines
  
    * fixed non-Windows building
........
  r9648 | jonas | 2008-01-06 12:54:47 +0100 (Sun, 06 Jan 2008) | 2 lines
  
    * fixed building on OSes marked as case sensitive
........
  r9717 | vincents | 2008-01-11 23:10:54 +0100 (Fri, 11 Jan 2008) | 1 line
  
  - removed units directory from svn, because make clean will try to delete all files in it (also the .svn dir) and a subsequent update will fail
........

git-svn-id: branches/fixes_2_2@9729 -

.gitattributes

@@ -1444,255 +1444,6 @@ packages/base/sqlite/sqlitedb.pas svneol=native#text/plain
 packages/base/sqlite/test.pas svneol=native#text/plain
 packages/base/sqlite/testapiv3x.README -text
 packages/base/sqlite/testapiv3x.pp -text
-packages/base/winunits/JwaVista.pas svneol=native#text/plain
-packages/base/winunits/JwaWinSta.pas svneol=native#text/plain
-packages/base/winunits/Makefile svneol=native#text/plain
-packages/base/winunits/Makefile.fpc svneol=native#text/plain
-packages/base/winunits/ModuleLoader.pas svneol=native#text/plain
-packages/base/winunits/activex.pp svneol=native#text/plain
-packages/base/winunits/buildjwa.pp svneol=native#text/plain
-packages/base/winunits/comconst.pp svneol=native#text/plain
-packages/base/winunits/commctrl.pp svneol=native#text/plain
-packages/base/winunits/comobj.pp svneol=native#text/plain
-packages/base/winunits/examples/OOHelper.pp svneol=native#text/plain
-packages/base/winunits/examples/OOTest.pp -text svneol=unset#text/plain
-packages/base/winunits/examples/testcom1.pp svneol=native#text/plain
-packages/base/winunits/examples/testcom2.pp svneol=native#text/plain
-packages/base/winunits/examples/testver.pp svneol=native#text/plain
-packages/base/winunits/flatsb.pp svneol=native#text/plain
-packages/base/winunits/fpmake.inc svneol=native#text/plain
-packages/base/winunits/fpmake.pp svneol=native#text/plain
-packages/base/winunits/jedi.inc svneol=native#text/plain
-packages/base/winunits/jediapilib.inc svneol=native#text/plain
-packages/base/winunits/jwaObjsel.pas svneol=native#text/plain
-packages/base/winunits/jwaaccctrl.pas svneol=native#text/plain
-packages/base/winunits/jwaaclapi.pas svneol=native#text/plain
-packages/base/winunits/jwaaclui.pas svneol=native#text/plain
-packages/base/winunits/jwaactiveds.pas svneol=native#text/plain
-packages/base/winunits/jwaactivex.pas svneol=native#text/plain
-packages/base/winunits/jwaadsdb.pas svneol=native#text/plain
-packages/base/winunits/jwaadserr.pas svneol=native#text/plain
-packages/base/winunits/jwaadshlp.pas svneol=native#text/plain
-packages/base/winunits/jwaadsnms.pas svneol=native#text/plain
-packages/base/winunits/jwaadsprop.pas svneol=native#text/plain
-packages/base/winunits/jwaadssts.pas svneol=native#text/plain
-packages/base/winunits/jwaadstlb.pas svneol=native#text/plain
-packages/base/winunits/jwaadtgen.pas svneol=native#text/plain
-packages/base/winunits/jwaaf_irda.pas svneol=native#text/plain
-packages/base/winunits/jwaatalkwsh.pas svneol=native#text/plain
-packages/base/winunits/jwaauthif.pas svneol=native#text/plain
-packages/base/winunits/jwaauthz.pas svneol=native#text/plain
-packages/base/winunits/jwabatclass.pas svneol=native#text/plain
-packages/base/winunits/jwabits.pas svneol=native#text/plain
-packages/base/winunits/jwabits1_5.pas svneol=native#text/plain
-packages/base/winunits/jwabitscfg.pas svneol=native#text/plain
-packages/base/winunits/jwabitsmsg.pas svneol=native#text/plain
-packages/base/winunits/jwablberr.pas svneol=native#text/plain
-packages/base/winunits/jwabluetoothapis.pas svneol=native#text/plain
-packages/base/winunits/jwabthdef.pas svneol=native#text/plain
-packages/base/winunits/jwabthsdpdef.pas svneol=native#text/plain
-packages/base/winunits/jwabugcodes.pas svneol=native#text/plain
-packages/base/winunits/jwacarderr.pas svneol=native#text/plain
-packages/base/winunits/jwacderr.pas svneol=native#text/plain
-packages/base/winunits/jwacmnquery.pas svneol=native#text/plain
-packages/base/winunits/jwacolordlg.pas svneol=native#text/plain
-packages/base/winunits/jwacpl.pas svneol=native#text/plain
-packages/base/winunits/jwacplext.pas svneol=native#text/plain
-packages/base/winunits/jwacryptuiapi.pas svneol=native#text/plain
-packages/base/winunits/jwadbt.pas svneol=native#text/plain
-packages/base/winunits/jwadde.pas svneol=native#text/plain
-packages/base/winunits/jwadhcpcsdk.pas svneol=native#text/plain
-packages/base/winunits/jwadhcpsapi.pas svneol=native#text/plain
-packages/base/winunits/jwadhcpssdk.pas svneol=native#text/plain
-packages/base/winunits/jwadlgs.pas svneol=native#text/plain
-packages/base/winunits/jwadsadmin.pas svneol=native#text/plain
-packages/base/winunits/jwadsclient.pas svneol=native#text/plain
-packages/base/winunits/jwadsgetdc.pas svneol=native#text/plain
-packages/base/winunits/jwadskquota.pas svneol=native#text/plain
-packages/base/winunits/jwadsquery.pas svneol=native#text/plain
-packages/base/winunits/jwadsrole.pas svneol=native#text/plain
-packages/base/winunits/jwadssec.pas svneol=native#text/plain
-packages/base/winunits/jwaerrorrep.pas svneol=native#text/plain
-packages/base/winunits/jwaexcpt.pas svneol=native#text/plain
-packages/base/winunits/jwafaxdev.pas svneol=native#text/plain
-packages/base/winunits/jwafaxext.pas svneol=native#text/plain
-packages/base/winunits/jwafaxmmc.pas svneol=native#text/plain
-packages/base/winunits/jwafaxroute.pas svneol=native#text/plain
-packages/base/winunits/jwagpedit.pas svneol=native#text/plain
-packages/base/winunits/jwahherror.pas svneol=native#text/plain
-packages/base/winunits/jwahtmlGuid.pas svneol=native#text/plain
-packages/base/winunits/jwahtmlhelp.pas svneol=native#text/plain
-packages/base/winunits/jwaiaccess.pas svneol=native#text/plain
-packages/base/winunits/jwaiadmext.pas svneol=native#text/plain
-packages/base/winunits/jwaicmpapi.pas svneol=native#text/plain
-packages/base/winunits/jwaiiscnfg.pas svneol=native#text/plain
-packages/base/winunits/jwaimagehlp.pas svneol=native#text/plain
-packages/base/winunits/jwaimapi.pas svneol=native#text/plain
-packages/base/winunits/jwaimapierror.pas svneol=native#text/plain
-packages/base/winunits/jwaime.pas svneol=native#text/plain
-packages/base/winunits/jwaioevent.pas svneol=native#text/plain
-packages/base/winunits/jwaipexport.pas svneol=native#text/plain
-packages/base/winunits/jwaiphlpapi.pas svneol=native#text/plain
-packages/base/winunits/jwaipifcons.pas svneol=native#text/plain
-packages/base/winunits/jwaipinfoid.pas svneol=native#text/plain
-packages/base/winunits/jwaiprtrmib.pas svneol=native#text/plain
-packages/base/winunits/jwaiptypes.pas svneol=native#text/plain
-packages/base/winunits/jwaisguids.pas svneol=native#text/plain
-packages/base/winunits/jwaissper16.pas svneol=native#text/plain
-packages/base/winunits/jwalm.pas svneol=native#text/plain
-packages/base/winunits/jwalmaccess.pas svneol=native#text/plain
-packages/base/winunits/jwalmalert.pas svneol=native#text/plain
-packages/base/winunits/jwalmapibuf.pas svneol=native#text/plain
-packages/base/winunits/jwalmat.pas svneol=native#text/plain
-packages/base/winunits/jwalmaudit.pas svneol=native#text/plain
-packages/base/winunits/jwalmconfig.pas svneol=native#text/plain
-packages/base/winunits/jwalmcons.pas svneol=native#text/plain
-packages/base/winunits/jwalmdfs.pas svneol=native#text/plain
-packages/base/winunits/jwalmerr.pas svneol=native#text/plain
-packages/base/winunits/jwalmerrlog.pas svneol=native#text/plain
-packages/base/winunits/jwalmjoin.pas svneol=native#text/plain
-packages/base/winunits/jwalmmsg.pas svneol=native#text/plain
-packages/base/winunits/jwalmremutl.pas svneol=native#text/plain
-packages/base/winunits/jwalmrepl.pas svneol=native#text/plain
-packages/base/winunits/jwalmserver.pas svneol=native#text/plain
-packages/base/winunits/jwalmshare.pas svneol=native#text/plain
-packages/base/winunits/jwalmsname.pas svneol=native#text/plain
-packages/base/winunits/jwalmstats.pas svneol=native#text/plain
-packages/base/winunits/jwalmsvc.pas svneol=native#text/plain
-packages/base/winunits/jwalmuse.pas svneol=native#text/plain
-packages/base/winunits/jwalmuseflg.pas svneol=native#text/plain
-packages/base/winunits/jwalmwksta.pas svneol=native#text/plain
-packages/base/winunits/jwaloadperf.pas svneol=native#text/plain
-packages/base/winunits/jwalpmapi.pas svneol=native#text/plain
-packages/base/winunits/jwamciavi.pas svneol=native#text/plain
-packages/base/winunits/jwamprerror.pas svneol=native#text/plain
-packages/base/winunits/jwamsi.pas svneol=native#text/plain
-packages/base/winunits/jwamsidefs.pas svneol=native#text/plain
-packages/base/winunits/jwamsiquery.pas svneol=native#text/plain
-packages/base/winunits/jwamstask.pas svneol=native#text/plain
-packages/base/winunits/jwamstcpip.pas svneol=native#text/plain
-packages/base/winunits/jwamswsock.pas svneol=native#text/plain
-packages/base/winunits/jwanative.pas svneol=native#text/plain
-packages/base/winunits/jwanb30.pas svneol=native#text/plain
-packages/base/winunits/jwanetsh.pas svneol=native#text/plain
-packages/base/winunits/jwanspapi.pas svneol=native#text/plain
-packages/base/winunits/jwantddpar.pas svneol=native#text/plain
-packages/base/winunits/jwantdsapi.pas svneol=native#text/plain
-packages/base/winunits/jwantdsbcli.pas svneol=native#text/plain
-packages/base/winunits/jwantdsbmsg.pas svneol=native#text/plain
-packages/base/winunits/jwantldap.pas svneol=native#text/plain
-packages/base/winunits/jwantquery.pas svneol=native#text/plain
-packages/base/winunits/jwantsecapi.pas svneol=native#text/plain
-packages/base/winunits/jwantstatus.pas svneol=native#text/plain
-packages/base/winunits/jwapatchapi.pas svneol=native#text/plain
-packages/base/winunits/jwapatchwiz.pas svneol=native#text/plain
-packages/base/winunits/jwapbt.pas svneol=native#text/plain
-packages/base/winunits/jwapdh.pas svneol=native#text/plain
-packages/base/winunits/jwapdhmsg.pas svneol=native#text/plain
-packages/base/winunits/jwapowrprof.pas svneol=native#text/plain
-packages/base/winunits/jwaprofinfo.pas svneol=native#text/plain
-packages/base/winunits/jwaprotocol.pas svneol=native#text/plain
-packages/base/winunits/jwaprsht.pas svneol=native#text/plain
-packages/base/winunits/jwapsapi.pas svneol=native#text/plain
-packages/base/winunits/jwaqos.pas svneol=native#text/plain
-packages/base/winunits/jwaqosname.pas svneol=native#text/plain
-packages/base/winunits/jwaqospol.pas svneol=native#text/plain
-packages/base/winunits/jwaqossp.pas svneol=native#text/plain
-packages/base/winunits/jwareason.pas svneol=native#text/plain
-packages/base/winunits/jwaregstr.pas svneol=native#text/plain
-packages/base/winunits/jwarpc.pas svneol=native#text/plain
-packages/base/winunits/jwarpcasync.pas svneol=native#text/plain
-packages/base/winunits/jwarpcdce.pas svneol=native#text/plain
-packages/base/winunits/jwarpcnsi.pas svneol=native#text/plain
-packages/base/winunits/jwarpcnterr.pas svneol=native#text/plain
-packages/base/winunits/jwarpcssl.pas svneol=native#text/plain
-packages/base/winunits/jwascesvc.pas svneol=native#text/plain
-packages/base/winunits/jwaschedule.pas svneol=native#text/plain
-packages/base/winunits/jwaschemadef.pas svneol=native#text/plain
-packages/base/winunits/jwasddl.pas svneol=native#text/plain
-packages/base/winunits/jwasecext.pas svneol=native#text/plain
-packages/base/winunits/jwasecurity.pas svneol=native#text/plain
-packages/base/winunits/jwasens.pas svneol=native#text/plain
-packages/base/winunits/jwasensapi.pas svneol=native#text/plain
-packages/base/winunits/jwasensevts.pas svneol=native#text/plain
-packages/base/winunits/jwasfc.pas svneol=native#text/plain
-packages/base/winunits/jwashlguid.pas svneol=native#text/plain
-packages/base/winunits/jwasisbkup.pas svneol=native#text/plain
-packages/base/winunits/jwasnmp.pas svneol=native#text/plain
-packages/base/winunits/jwasporder.pas svneol=native#text/plain
-packages/base/winunits/jwasrrestoreptapi.pas svneol=native#text/plain
-packages/base/winunits/jwasspi.pas svneol=native#text/plain
-packages/base/winunits/jwasubauth.pas svneol=native#text/plain
-packages/base/winunits/jwasvcguid.pas svneol=native#text/plain
-packages/base/winunits/jwatlhelp32.pas svneol=native#text/plain
-packages/base/winunits/jwatmschema.pas svneol=native#text/plain
-packages/base/winunits/jwatraffic.pas svneol=native#text/plain
-packages/base/winunits/jwauserenv.pas svneol=native#text/plain
-packages/base/winunits/jwauxtheme.pas svneol=native#text/plain
-packages/base/winunits/jwawbemcli.pas svneol=native#text/plain
-packages/base/winunits/jwawinable.pas svneol=native#text/plain
-packages/base/winunits/jwawinbase.pas svneol=native#text/plain
-packages/base/winunits/jwawinber.pas svneol=native#text/plain
-packages/base/winunits/jwawincon.pas svneol=native#text/plain
-packages/base/winunits/jwawincpl.pas svneol=native#text/plain
-packages/base/winunits/jwawincred.pas svneol=native#text/plain
-packages/base/winunits/jwawincrypt.pas svneol=native#text/plain
-packages/base/winunits/jwawindllnames.pas svneol=native#text/plain
-packages/base/winunits/jwawindns.pas svneol=native#text/plain
-packages/base/winunits/jwawindows.pas svneol=native#text/plain
-packages/base/winunits/jwawinefs.pas svneol=native#text/plain
-packages/base/winunits/jwawinerror.pas svneol=native#text/plain
-packages/base/winunits/jwawinfax.pas svneol=native#text/plain
-packages/base/winunits/jwawingdi.pas svneol=native#text/plain
-packages/base/winunits/jwawinioctl.pas svneol=native#text/plain
-packages/base/winunits/jwawinldap.pas svneol=native#text/plain
-packages/base/winunits/jwawinnetwk.pas svneol=native#text/plain
-packages/base/winunits/jwawinnls.pas svneol=native#text/plain
-packages/base/winunits/jwawinnt.pas svneol=native#text/plain
-packages/base/winunits/jwawinperf.pas svneol=native#text/plain
-packages/base/winunits/jwawinreg.pas svneol=native#text/plain
-packages/base/winunits/jwawinresrc.pas svneol=native#text/plain
-packages/base/winunits/jwawinsafer.pas svneol=native#text/plain
-packages/base/winunits/jwawinsock.pas svneol=native#text/plain
-packages/base/winunits/jwawinsock2.pas svneol=native#text/plain
-packages/base/winunits/jwawinsvc.pas svneol=native#text/plain
-packages/base/winunits/jwawinternl.pas svneol=native#text/plain
-packages/base/winunits/jwawintype.pas svneol=native#text/plain
-packages/base/winunits/jwawinuser.pas svneol=native#text/plain
-packages/base/winunits/jwawinver.pas svneol=native#text/plain
-packages/base/winunits/jwawinwlx.pas svneol=native#text/plain
-packages/base/winunits/jwawmistr.pas svneol=native#text/plain
-packages/base/winunits/jwawownt16.pas svneol=native#text/plain
-packages/base/winunits/jwawownt32.pas svneol=native#text/plain
-packages/base/winunits/jwawpapi.pas svneol=native#text/plain
-packages/base/winunits/jwawpapimsg.pas svneol=native#text/plain
-packages/base/winunits/jwawpcrsmsg.pas svneol=native#text/plain
-packages/base/winunits/jwawpftpmsg.pas svneol=native#text/plain
-packages/base/winunits/jwawppstmsg.pas svneol=native#text/plain
-packages/base/winunits/jwawpspihlp.pas svneol=native#text/plain
-packages/base/winunits/jwawptypes.pas svneol=native#text/plain
-packages/base/winunits/jwawpwizmsg.pas svneol=native#text/plain
-packages/base/winunits/jwaws2atm.pas svneol=native#text/plain
-packages/base/winunits/jwaws2bth.pas svneol=native#text/plain
-packages/base/winunits/jwaws2dnet.pas svneol=native#text/plain
-packages/base/winunits/jwaws2spi.pas svneol=native#text/plain
-packages/base/winunits/jwaws2tcpip.pas svneol=native#text/plain
-packages/base/winunits/jwawshisotp.pas svneol=native#text/plain
-packages/base/winunits/jwawsipx.pas svneol=native#text/plain
-packages/base/winunits/jwawsnetbs.pas svneol=native#text/plain
-packages/base/winunits/jwawsnwlink.pas svneol=native#text/plain
-packages/base/winunits/jwawsrm.pas svneol=native#text/plain
-packages/base/winunits/jwawsvns.pas svneol=native#text/plain
-packages/base/winunits/jwawtsapi32.pas svneol=native#text/plain
-packages/base/winunits/jwazmouse.pas svneol=native#text/plain
-packages/base/winunits/mmsystem.pp svneol=native#text/plain
-packages/base/winunits/ole2.pp svneol=native#text/plain
-packages/base/winunits/oleserver.pp svneol=native#text/plain
-packages/base/winunits/richedit.pp -text
-packages/base/winunits/shellapi.pp svneol=native#text/plain
-packages/base/winunits/shfolder.pp svneol=native#text/plain
-packages/base/winunits/shlobj.pp svneol=native#text/plain
-packages/base/winunits/winver.pp svneol=native#text/plain
 packages/extra/Makefile svneol=native#text/plain
 packages/extra/Makefile.fpc svneol=native#text/plain
 packages/extra/a52/Makefile svneol=native#text/plain
@@ -4556,6 +4307,264 @@ packages/paszlib/zinflate.pas svneol=native#text/plain
 packages/paszlib/zip.pas svneol=native#text/plain
 packages/paszlib/ziputils.pas svneol=native#text/plain
 packages/paszlib/zuncompr.pas svneol=native#text/plain
+packages/winunits-base/Makefile svneol=native#text/plain
+packages/winunits-base/Makefile.fpc svneol=native#text/plain
+packages/winunits-base/fpmake.inc svneol=native#text/plain
+packages/winunits-base/fpmake.pp svneol=native#text/plain
+packages/winunits-base/src/activex.pp svneol=native#text/plain
+packages/winunits-base/src/buildwinutilsbase.pp svneol=native#text/plain
+packages/winunits-base/src/comconst.pp svneol=native#text/plain
+packages/winunits-base/src/commctrl.pp svneol=native#text/plain
+packages/winunits-base/src/comobj.pp svneol=native#text/plain
+packages/winunits-base/src/flatsb.pp svneol=native#text/plain
+packages/winunits-base/src/mmsystem.pp svneol=native#text/plain
+packages/winunits-base/src/ole2.pp svneol=native#text/plain
+packages/winunits-base/src/oleserver.pp svneol=native#text/plain
+packages/winunits-base/src/richedit.pp svneol=native#text/plain
+packages/winunits-base/src/shellapi.pp svneol=native#text/plain
+packages/winunits-base/src/shfolder.pp svneol=native#text/plain
+packages/winunits-base/src/shlobj.pp svneol=native#text/plain
+packages/winunits-base/src/winver.pp svneol=native#text/plain
+packages/winunits-base/tests/OOHelper.pp svneol=native#text/plain
+packages/winunits-base/tests/OOTest.pp svneol=native#text/plain
+packages/winunits-base/tests/testcom1.pp svneol=native#text/plain
+packages/winunits-base/tests/testcom2.pp svneol=native#text/plain
+packages/winunits-base/tests/testver.pp svneol=native#text/plain
+packages/winunits-jedi/Makefile svneol=native#text/plain
+packages/winunits-jedi/Makefile.fpc svneol=native#text/plain
+packages/winunits-jedi/fpmake.inc svneol=native#text/plain
+packages/winunits-jedi/fpmake.pp svneol=native#text/plain
+packages/winunits-jedi/src/JwaVista.pas svneol=native#text/plain
+packages/winunits-jedi/src/JwaWinSta.pas svneol=native#text/plain
+packages/winunits-jedi/src/ModuleLoader.pas svneol=native#text/plain
+packages/winunits-jedi/src/buildjwa.pp svneol=native#text/plain
+packages/winunits-jedi/src/jedi.inc svneol=native#text/plain
+packages/winunits-jedi/src/jediapilib.inc svneol=native#text/plain
+packages/winunits-jedi/src/jwaObjsel.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaaccctrl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaaclapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaaclui.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaactiveds.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaactivex.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadsdb.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadserr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadshlp.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadsnms.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadsprop.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadssts.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadstlb.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaadtgen.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaaf_irda.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaatalkwsh.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaauthif.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaauthz.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabatclass.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabits.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabits1_5.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabitscfg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabitsmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwablberr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabluetoothapis.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabthdef.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabthsdpdef.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwabugcodes.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwacarderr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwacderr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwacmnquery.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwacolordlg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwacpl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwacplext.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwacryptuiapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadbt.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadde.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadhcpcsdk.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadhcpsapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadhcpssdk.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadlgs.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadsadmin.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadsclient.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadsgetdc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadskquota.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadsquery.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadsrole.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwadssec.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaerrorrep.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaexcpt.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwafaxdev.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwafaxext.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwafaxmmc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwafaxroute.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwagpedit.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwahherror.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwahtmlGuid.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwahtmlguid.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwahtmlhelp.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaiaccess.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaiadmext.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaicmpapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaiiscnfg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaimagehlp.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaimapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaimapierror.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaime.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaioevent.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaipexport.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaiphlpapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaipifcons.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaipinfoid.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaiprtrmib.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaiptypes.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaisguids.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaissper16.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalm.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmaccess.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmalert.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmapibuf.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmat.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmaudit.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmconfig.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmcons.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmdfs.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmerr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmerrlog.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmjoin.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmremutl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmrepl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmserver.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmshare.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmsname.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmstats.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmsvc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmuse.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmuseflg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalmwksta.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaloadperf.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwalpmapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamciavi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamprerror.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamsi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamsidefs.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamsiquery.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamstask.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamstcpip.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwamswsock.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwanative.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwanb30.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwanetsh.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwanspapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantddpar.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantdsapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantdsbcli.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantdsbmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantldap.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantquery.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantsecapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwantstatus.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaobjsel.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwapatchapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwapatchwiz.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwapbt.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwapdh.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwapdhmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwapowrprof.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaprofinfo.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaprotocol.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaprsht.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwapsapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaqos.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaqosname.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaqospol.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaqossp.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwareason.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaregstr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwarpc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwarpcasync.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwarpcdce.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwarpcnsi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwarpcnterr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwarpcssl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwascesvc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaschedule.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaschemadef.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasddl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasecext.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasecurity.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasens.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasensapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasensevts.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasfc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwashlguid.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasisbkup.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasnmp.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasporder.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasrrestoreptapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasspi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasubauth.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwasvcguid.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwatlhelp32.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwatmschema.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwatraffic.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwauserenv.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwauxtheme.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwavista.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawbemcli.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinable.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinbase.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinber.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawincon.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawincpl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawincred.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawincrypt.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawindllnames.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawindns.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawindows.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinefs.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinerror.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinfax.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawingdi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinioctl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinldap.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinnetwk.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinnls.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinnt.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinperf.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinreg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinresrc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinsafer.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinsock.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinsock2.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinsta.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinsvc.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinternl.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawintype.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinuser.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinver.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawinwlx.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawmistr.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawownt16.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawownt32.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawpapi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawpapimsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawpcrsmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawpftpmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawppstmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawpspihlp.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawptypes.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawpwizmsg.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaws2atm.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaws2bth.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaws2dnet.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaws2spi.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwaws2tcpip.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawshisotp.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawsipx.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawsnetbs.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawsnwlink.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawsrm.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawsvns.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwawtsapi32.pas svneol=native#text/plain
+packages/winunits-jedi/src/jwazmouse.pas svneol=native#text/plain
 rtl/COPYING -text
 rtl/COPYING.FPC -text
 rtl/Makefile svneol=native#text/plain

.gitignore

@@ -324,20 +324,6 @@ packages/base/sqlite/*.s
 packages/base/sqlite/fpcmade.*
 packages/base/sqlite/units
 packages/base/units
-packages/base/winunits/*.bak
-packages/base/winunits/*.exe
-packages/base/winunits/*.o
-packages/base/winunits/*.ppu
-packages/base/winunits/*.s
-packages/base/winunits/examples/*.bak
-packages/base/winunits/examples/*.exe
-packages/base/winunits/examples/*.o
-packages/base/winunits/examples/*.ppu
-packages/base/winunits/examples/*.s
-packages/base/winunits/examples/fpcmade.*
-packages/base/winunits/examples/units
-packages/base/winunits/fpcmade.*
-packages/base/winunits/units
 packages/extra/*.bak
 packages/extra/*.exe
 packages/extra/*.o

packages/Makefile

@@ -247,7 +247,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process  fcl-web
+override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process  winunits-base winunits-jedi fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process
@@ -364,7 +364,7 @@ ifeq ($(FULL_TARGET),x86_64-darwin)
 override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process  fcl-web fcl-async
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process  fcl-web
+override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process  winunits-base winunits-jedi fcl-web
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_DIRS+=base hash paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process
@@ -1530,6 +1530,8 @@ TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-JSON=1
 TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-PROCESS=1
+TARGET_DIRS_WINUNITS-BASE=1
+TARGET_DIRS_WINUNITS-JEDI=1
 TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
@@ -2231,6 +2233,8 @@ TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-JSON=1
 TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-PROCESS=1
+TARGET_DIRS_WINUNITS-BASE=1
+TARGET_DIRS_WINUNITS-JEDI=1
 TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
@@ -3192,6 +3196,96 @@ fcl-async:
 	$(MAKE) -C fcl-async all
 .PHONY: fcl-async_all fcl-async_debug fcl-async_smart fcl-async_release fcl-async_units fcl-async_examples fcl-async_shared fcl-async_install fcl-async_sourceinstall fcl-async_exampleinstall fcl-async_distinstall fcl-async_zipinstall fcl-async_zipsourceinstall fcl-async_zipexampleinstall fcl-async_zipdistinstall fcl-async_clean fcl-async_distclean fcl-async_cleanall fcl-async_info fcl-async_makefiles fcl-async
 endif
+ifdef TARGET_DIRS_WINUNITS-BASE
+winunits-base_all:
+	$(MAKE) -C winunits-base all
+winunits-base_debug:
+	$(MAKE) -C winunits-base debug
+winunits-base_smart:
+	$(MAKE) -C winunits-base smart
+winunits-base_release:
+	$(MAKE) -C winunits-base release
+winunits-base_units:
+	$(MAKE) -C winunits-base units
+winunits-base_examples:
+	$(MAKE) -C winunits-base examples
+winunits-base_shared:
+	$(MAKE) -C winunits-base shared
+winunits-base_install:
+	$(MAKE) -C winunits-base install
+winunits-base_sourceinstall:
+	$(MAKE) -C winunits-base sourceinstall
+winunits-base_exampleinstall:
+	$(MAKE) -C winunits-base exampleinstall
+winunits-base_distinstall:
+	$(MAKE) -C winunits-base distinstall
+winunits-base_zipinstall:
+	$(MAKE) -C winunits-base zipinstall
+winunits-base_zipsourceinstall:
+	$(MAKE) -C winunits-base zipsourceinstall
+winunits-base_zipexampleinstall:
+	$(MAKE) -C winunits-base zipexampleinstall
+winunits-base_zipdistinstall:
+	$(MAKE) -C winunits-base zipdistinstall
+winunits-base_clean:
+	$(MAKE) -C winunits-base clean
+winunits-base_distclean:
+	$(MAKE) -C winunits-base distclean
+winunits-base_cleanall:
+	$(MAKE) -C winunits-base cleanall
+winunits-base_info:
+	$(MAKE) -C winunits-base info
+winunits-base_makefiles:
+	$(MAKE) -C winunits-base makefiles
+winunits-base:
+	$(MAKE) -C winunits-base all
+.PHONY: winunits-base_all winunits-base_debug winunits-base_smart winunits-base_release winunits-base_units winunits-base_examples winunits-base_shared winunits-base_install winunits-base_sourceinstall winunits-base_exampleinstall winunits-base_distinstall winunits-base_zipinstall winunits-base_zipsourceinstall winunits-base_zipexampleinstall winunits-base_zipdistinstall winunits-base_clean winunits-base_distclean winunits-base_cleanall winunits-base_info winunits-base_makefiles winunits-base
+endif
+ifdef TARGET_DIRS_WINUNITS-JEDI
+winunits-jedi_all:
+	$(MAKE) -C winunits-jedi all
+winunits-jedi_debug:
+	$(MAKE) -C winunits-jedi debug
+winunits-jedi_smart:
+	$(MAKE) -C winunits-jedi smart
+winunits-jedi_release:
+	$(MAKE) -C winunits-jedi release
+winunits-jedi_units:
+	$(MAKE) -C winunits-jedi units
+winunits-jedi_examples:
+	$(MAKE) -C winunits-jedi examples
+winunits-jedi_shared:
+	$(MAKE) -C winunits-jedi shared
+winunits-jedi_install:
+	$(MAKE) -C winunits-jedi install
+winunits-jedi_sourceinstall:
+	$(MAKE) -C winunits-jedi sourceinstall
+winunits-jedi_exampleinstall:
+	$(MAKE) -C winunits-jedi exampleinstall
+winunits-jedi_distinstall:
+	$(MAKE) -C winunits-jedi distinstall
+winunits-jedi_zipinstall:
+	$(MAKE) -C winunits-jedi zipinstall
+winunits-jedi_zipsourceinstall:
+	$(MAKE) -C winunits-jedi zipsourceinstall
+winunits-jedi_zipexampleinstall:
+	$(MAKE) -C winunits-jedi zipexampleinstall
+winunits-jedi_zipdistinstall:
+	$(MAKE) -C winunits-jedi zipdistinstall
+winunits-jedi_clean:
+	$(MAKE) -C winunits-jedi clean
+winunits-jedi_distclean:
+	$(MAKE) -C winunits-jedi distclean
+winunits-jedi_cleanall:
+	$(MAKE) -C winunits-jedi cleanall
+winunits-jedi_info:
+	$(MAKE) -C winunits-jedi info
+winunits-jedi_makefiles:
+	$(MAKE) -C winunits-jedi makefiles
+winunits-jedi:
+	$(MAKE) -C winunits-jedi all
+.PHONY: winunits-jedi_all winunits-jedi_debug winunits-jedi_smart winunits-jedi_release winunits-jedi_units winunits-jedi_examples winunits-jedi_shared winunits-jedi_install winunits-jedi_sourceinstall winunits-jedi_exampleinstall winunits-jedi_distinstall winunits-jedi_zipinstall winunits-jedi_zipsourceinstall winunits-jedi_zipexampleinstall winunits-jedi_zipdistinstall winunits-jedi_clean winunits-jedi_distclean winunits-jedi_cleanall winunits-jedi_info winunits-jedi_makefiles winunits-jedi
+endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))
@@ -3226,11 +3320,27 @@ extra_debug: base_debug fcl-xml_debug
 extra_smart: base_smart fcl-xml_smart
 extra_release: base_release fcl-xml_release
 extra_shared: base_shared fcl-xml_shared
+ifeq ($(OS_TARGET),win32)
+fcl-base_all: base_all winunits-base_all winunits-jedi_all
+fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
+fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
+fcl-base_release: base_release winunits-base_release winunits-jedi_release
+fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
+else
+ifeq ($(OS_TARGET),win64)
+fcl-base_all: base_all winunits-base_all winunits-jedi_all
+fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
+fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
+fcl-base_release: base_release winunits-base_release winunits-jedi_release
+fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
+else
 fcl-base_all: base_all
 fcl-base_debug: base_debug
 fcl-base_smart: base_smart
 fcl-base_release: base_release
 fcl-base_shared: base_shared
+endif
+endif
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug
 fcl-xml_smart: fcl-base_smart

packages/Makefile.fpc

@@ -10,8 +10,8 @@ dirs_solaris=fcl-web fcl-async
 dirs_netbsd=fcl-web fcl-async
 dirs_openbsd=fcl-web fcl-async
 dirs_linux=fcl-web fcl-async
-dirs_win32=fcl-web
-dirs_win64=fcl-web
+dirs_win32=winunits-base winunits-jedi fcl-web
+dirs_win64=winunits-base winunits-jedi fcl-web
 dirs_wince=fcl-web
 
 [install]
@@ -34,11 +34,27 @@ extra_smart: base_smart fcl-xml_smart
 extra_release: base_release fcl-xml_release
 extra_shared: base_shared fcl-xml_shared
 
+ifeq ($(OS_TARGET),win32)
+fcl-base_all: base_all winunits-base_all winunits-jedi_all
+fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
+fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
+fcl-base_release: base_release winunits-base_release winunits-jedi_release
+fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
+else
+ifeq ($(OS_TARGET),win64)
+fcl-base_all: base_all winunits-base_all winunits-jedi_all
+fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
+fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
+fcl-base_release: base_release winunits-base_release winunits-jedi_release
+fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
+else
 fcl-base_all: base_all
 fcl-base_debug: base_debug
 fcl-base_smart: base_smart
 fcl-base_release: base_release
 fcl-base_shared: base_shared
+endif
+endif
 
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug

packages/base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/12/01]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/13]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -247,7 +247,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_DIRS+=pasjpeg regexpr netdb  gdbint
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=pasjpeg regexpr netdb  gdbint mysql ibase odbc sqlite postgres oracle imagemagick httpd winunits
+override TARGET_DIRS+=pasjpeg regexpr netdb  gdbint mysql ibase odbc sqlite postgres oracle imagemagick httpd
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_DIRS+=pasjpeg regexpr netdb
@@ -364,7 +364,7 @@ ifeq ($(FULL_TARGET),x86_64-darwin)
 override TARGET_DIRS+=pasjpeg regexpr netdb  mysql ibase postgres oracle odbc sqlite pthreads imagemagick httpd
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=pasjpeg regexpr netdb  mysql ibase odbc sqlite postgres oracle winunits
+override TARGET_DIRS+=pasjpeg regexpr netdb  mysql ibase odbc sqlite postgres oracle
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_DIRS+=pasjpeg regexpr netdb
@@ -1514,7 +1514,6 @@ TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
-TARGET_DIRS_WINUNITS=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 TARGET_DIRS_PASJPEG=1
@@ -1894,7 +1893,6 @@ TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
-TARGET_DIRS_WINUNITS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 TARGET_DIRS_PASJPEG=1
@@ -2660,51 +2658,6 @@ libc:
 	$(MAKE) -C libc all
 .PHONY: libc_all libc_debug libc_smart libc_release libc_units libc_examples libc_shared libc_install libc_sourceinstall libc_exampleinstall libc_distinstall libc_zipinstall libc_zipsourceinstall libc_zipexampleinstall libc_zipdistinstall libc_clean libc_distclean libc_cleanall libc_info libc_makefiles libc
 endif
-ifdef TARGET_DIRS_WINUNITS
-winunits_all:
-	$(MAKE) -C winunits all
-winunits_debug:
-	$(MAKE) -C winunits debug
-winunits_smart:
-	$(MAKE) -C winunits smart
-winunits_release:
-	$(MAKE) -C winunits release
-winunits_units:
-	$(MAKE) -C winunits units
-winunits_examples:
-	$(MAKE) -C winunits examples
-winunits_shared:
-	$(MAKE) -C winunits shared
-winunits_install:
-	$(MAKE) -C winunits install
-winunits_sourceinstall:
-	$(MAKE) -C winunits sourceinstall
-winunits_exampleinstall:
-	$(MAKE) -C winunits exampleinstall
-winunits_distinstall:
-	$(MAKE) -C winunits distinstall
-winunits_zipinstall:
-	$(MAKE) -C winunits zipinstall
-winunits_zipsourceinstall:
-	$(MAKE) -C winunits zipsourceinstall
-winunits_zipexampleinstall:
-	$(MAKE) -C winunits zipexampleinstall
-winunits_zipdistinstall:
-	$(MAKE) -C winunits zipdistinstall
-winunits_clean:
-	$(MAKE) -C winunits clean
-winunits_distclean:
-	$(MAKE) -C winunits distclean
-winunits_cleanall:
-	$(MAKE) -C winunits cleanall
-winunits_info:
-	$(MAKE) -C winunits info
-winunits_makefiles:
-	$(MAKE) -C winunits makefiles
-winunits:
-	$(MAKE) -C winunits all
-.PHONY: winunits_all winunits_debug winunits_smart winunits_release winunits_units winunits_examples winunits_shared winunits_install winunits_sourceinstall winunits_exampleinstall winunits_distinstall winunits_zipinstall winunits_zipsourceinstall winunits_zipexampleinstall winunits_zipdistinstall winunits_clean winunits_distclean winunits_cleanall winunits_info winunits_makefiles winunits
-endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))

packages/base/Makefile.fpc

@@ -6,8 +6,8 @@
 dirs=pasjpeg regexpr netdb
 dirs_i386_linux=libc
 dirs_linux=gdbint mysql ibase postgres oracle odbc pthreads sqlite imagemagick dbus httpd
-dirs_win32=gdbint mysql ibase odbc sqlite postgres oracle imagemagick httpd winunits
-dirs_win64=mysql ibase odbc sqlite postgres oracle winunits
+dirs_win32=gdbint mysql ibase odbc sqlite postgres oracle imagemagick httpd 
+dirs_win64=mysql ibase odbc sqlite postgres oracle 
 dirs_wince=ibase sqlite postgres
 dirs_go32v2=gdbint
 dirs_netbsd=gdbint mysql ibase postgres oracle odbc imagemagick httpd

packages/fcl-base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/12/01]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/13]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -1794,7 +1794,8 @@ REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_WINUNITS=1
+REQUIRE_PACKAGES_WINUNITS-BASE=1
+REQUIRE_PACKAGES_WINUNITS-JEDI=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
@@ -1912,7 +1913,8 @@ REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_WINUNITS=1
+REQUIRE_PACKAGES_WINUNITS-BASE=1
+REQUIRE_PACKAGES_WINUNITS-JEDI=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -1973,30 +1975,56 @@ ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_WINUNITS
-PACKAGEDIR_WINUNITS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_WINUNITS),)
-ifneq ($(wildcard $(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)),)
-UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)
+ifdef REQUIRE_PACKAGES_WINUNITS-BASE
+PACKAGEDIR_WINUNITS-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_WINUNITS-BASE),)
+ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX)),)
+UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX)
 else
-UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)
+UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)
 endif
 ifdef CHECKDEPEND
-$(PACKAGEDIR_WINUNITS)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_WINUNITS) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS)/$(FPCMADE)
+$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_WINUNITS-BASE) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE)
 endif
 else
-PACKAGEDIR_WINUNITS=
-UNITDIR_WINUNITS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_WINUNITS),)
-UNITDIR_WINUNITS:=$(firstword $(UNITDIR_WINUNITS))
+PACKAGEDIR_WINUNITS-BASE=
+UNITDIR_WINUNITS-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_WINUNITS-BASE),)
+UNITDIR_WINUNITS-BASE:=$(firstword $(UNITDIR_WINUNITS-BASE))
 else
-UNITDIR_WINUNITS=
+UNITDIR_WINUNITS-BASE=
 endif
 endif
-ifdef UNITDIR_WINUNITS
-override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS)
+ifdef UNITDIR_WINUNITS-BASE
+override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-BASE)
+endif
+endif
+ifdef REQUIRE_PACKAGES_WINUNITS-JEDI
+PACKAGEDIR_WINUNITS-JEDI:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-jedi/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_WINUNITS-JEDI),)
+ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-JEDI)/units/$(TARGETSUFFIX)),)
+UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)/units/$(TARGETSUFFIX)
+else
+UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_WINUNITS-JEDI) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_WINUNITS-JEDI=
+UNITDIR_WINUNITS-JEDI:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits-jedi/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_WINUNITS-JEDI),)
+UNITDIR_WINUNITS-JEDI:=$(firstword $(UNITDIR_WINUNITS-JEDI))
+else
+UNITDIR_WINUNITS-JEDI=
+endif
+endif
+ifdef UNITDIR_WINUNITS-JEDI
+override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-JEDI)
 endif
 endif
 ifndef NOCPUDEF

packages/fcl-base/Makefile.fpc

@@ -7,8 +7,8 @@ name=fcl-base
 version=2.0.0
 
 [require]
-packages_win32=winunits
-packages_win64=winunits
+packages_win32=winunits-base winunits-jedi
+packages_win64=winunits-base winunits-jedi
 
 [target]
 units=contnrs inifiles ezcgi rtfpars idea base64 gettext \

packages/winunits-base/Makefile

@@ -0,0 +1,2745 @@
+#
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/02]
+#
+default: all
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
+BSDs = freebsd netbsd openbsd darwin
+UNIXs = linux $(BSDs) solaris qnx
+LIMIT83fs = go32v2 os2 emx watcom
+OSNeedsComspecToRunBatch = go32v2 watcom
+FORCE:
+.PHONY: FORCE
+override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
+ifneq ($(findstring darwin,$(OSTYPE)),)
+inUnix=1 #darwin
+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
+else
+ifeq ($(findstring ;,$(PATH)),)
+inUnix=1
+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
+else
+SEARCHPATH:=$(subst ;, ,$(PATH))
+endif
+endif
+SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
+PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
+ifeq ($(PWD),)
+PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
+ifeq ($(PWD),)
+$(error You need the GNU utils package to use this Makefile)
+else
+PWD:=$(firstword $(PWD))
+SRCEXEEXT=
+endif
+else
+PWD:=$(firstword $(PWD))
+SRCEXEEXT=.exe
+endif
+ifndef inUnix
+ifeq ($(OS),Windows_NT)
+inWinNT=1
+else
+ifdef OS2_SHELL
+inOS2=1
+endif
+endif
+else
+ifneq ($(findstring cygdrive,$(PATH)),)
+inCygWin=1
+endif
+endif
+ifdef inUnix
+SRCBATCHEXT=.sh
+else
+ifdef inOS2
+SRCBATCHEXT=.cmd
+else
+SRCBATCHEXT=.bat
+endif
+endif
+ifdef COMSPEC
+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
+RUNBATCH=$(COMSPEC) /C
+endif
+endif
+ifdef inUnix
+PATHSEP=/
+else
+PATHSEP:=$(subst /,\,/)
+ifdef inCygWin
+PATHSEP=/
+endif
+endif
+ifdef PWD
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
+ifdef inCygWin
+ifneq ($(findstring /cygdrive/,$(BASEDIR)),)
+BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))
+BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))
+BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))
+endif
+endif
+else
+BASEDIR=.
+endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
+override DEFAULT_FPCDIR=../..
+ifndef FPC
+ifdef PP
+FPC=$(PP)
+endif
+endif
+ifndef FPC
+FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(FPCPROG),)
+FPCPROG:=$(firstword $(FPCPROG))
+ifneq ($(CPU_TARGET),)
+FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
+else
+FPC:=$(shell $(FPCPROG) -PB)
+endif
+ifneq ($(findstring Error,$(FPC)),)
+override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+endif
+else
+override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+endif
+endif
+override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
+FOUNDFPC:=$(strip $(wildcard $(FPC)))
+ifeq ($(FOUNDFPC),)
+FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))
+ifeq ($(FOUNDFPC),)
+$(error Compiler $(FPC) not found)
+endif
+endif
+ifndef FPC_COMPILERINFO
+FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
+endif
+ifndef FPC_VERSION
+FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
+endif
+export FPC FPC_VERSION FPC_COMPILERINFO
+unexport CHECKDEPEND ALLDEPENDENCIES
+ifndef CPU_TARGET
+ifdef CPU_TARGET_DEFAULT
+CPU_TARGET=$(CPU_TARGET_DEFAULT)
+endif
+endif
+ifndef OS_TARGET
+ifdef OS_TARGET_DEFAULT
+OS_TARGET=$(OS_TARGET_DEFAULT)
+endif
+endif
+ifneq ($(words $(FPC_COMPILERINFO)),5)
+FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
+FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
+FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
+FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
+endif
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
+endif
+ifndef CPU_TARGET
+CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
+endif
+ifndef OS_TARGET
+OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
+endif
+FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
+FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+TARGETSUFFIX=$(OS_TARGET)
+SOURCESUFFIX=$(OS_SOURCE)
+else
+TARGETSUFFIX=$(FULL_TARGET)
+SOURCESUFFIX=$(FULL_SOURCE)
+endif
+ifneq ($(FULL_TARGET),$(FULL_SOURCE))
+CROSSCOMPILE=1
+endif
+ifeq ($(findstring makefile,$(MAKECMDGOALS)),)
+ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)
+$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first)
+endif
+endif
+ifneq ($(findstring $(OS_TARGET),$(BSDs)),)
+BSDhier=1
+endif
+ifeq ($(OS_TARGET),linux)
+linuxHier=1
+endif
+export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ifdef FPCDIR
+override FPCDIR:=$(subst \,/,$(FPCDIR))
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR=wrong
+endif
+else
+override FPCDIR=wrong
+endif
+ifdef DEFAULT_FPCDIR
+ifeq ($(FPCDIR),wrong)
+override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
+ifdef inUnix
+override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
+endif
+else
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+override FPCDIR:=$(FPCDIR)/..
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR:=$(FPCDIR)/..
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR:=$(BASEDIR)
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR=c:/pp
+endif
+endif
+endif
+endif
+endif
+ifndef CROSSBINDIR
+CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
+endif
+ifndef BINUTILSPREFIX
+ifndef CROSSBINDIR
+ifdef CROSSCOMPILE
+BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
+endif
+endif
+endif
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ifeq ($(UNITSDIR),)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+endif
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+override PACKAGE_NAME=winunits-base
+override PACKAGE_VERSION=2.2.0
+ifeq ($(FULL_TARGET),i386-linux)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_EXAMPLES+=examples
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_EXAMPLES+=examples
+endif
+override INSTALL_BUILDUNIT=buildwinutilsbase
+override INSTALL_FPCPACKAGE=y
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_SOURCEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
+ifdef REQUIRE_UNITSDIR
+override UNITSDIR+=$(REQUIRE_UNITSDIR)
+endif
+ifdef REQUIRE_PACKAGESDIR
+override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)
+endif
+ifdef ZIPINSTALL
+ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)
+UNIXHier=1
+endif
+else
+ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)
+UNIXHier=1
+endif
+endif
+ifndef INSTALL_PREFIX
+ifdef PREFIX
+INSTALL_PREFIX=$(PREFIX)
+endif
+endif
+ifndef INSTALL_PREFIX
+ifdef UNIXHier
+INSTALL_PREFIX=/usr/local
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
+endif
+endif
+export INSTALL_PREFIX
+ifdef INSTALL_FPCSUBDIR
+export INSTALL_FPCSUBDIR
+endif
+ifndef DIST_DESTDIR
+DIST_DESTDIR:=$(BASEDIR)
+endif
+export DIST_DESTDIR
+ifndef COMPILER_UNITTARGETDIR
+ifdef PACKAGEDIR_MAIN
+COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)
+else
+COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)
+endif
+endif
+ifndef COMPILER_TARGETDIR
+COMPILER_TARGETDIR=.
+endif
+ifndef INSTALL_BASEDIR
+ifdef UNIXHier
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
+endif
+endif
+ifndef INSTALL_BINDIR
+ifdef UNIXHier
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+else
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+ifdef CROSSCOMPILE
+ifdef CROSSINSTALL
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)
+else
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)
+endif
+else
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)
+endif
+endif
+endif
+endif
+ifndef INSTALL_UNITDIR
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)
+ifdef INSTALL_FPCPACKAGE
+ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
+endif
+endif
+endif
+ifndef INSTALL_LIBDIR
+ifdef UNIXHier
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
+else
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
+endif
+endif
+ifndef INSTALL_SOURCEDIR
+ifdef UNIXHier
+ifdef BSDhier
+SRCPREFIXDIR=share/src
+else
+ifdef linuxHier
+SRCPREFIXDIR=share/src
+else
+SRCPREFIXDIR=src
+endif
+endif
+ifdef INSTALL_FPCPACKAGE
+ifdef INSTALL_FPCSUBDIR
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+endif
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+ifdef INSTALL_FPCSUBDIR
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+endif
+else
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
+endif
+endif
+endif
+ifndef INSTALL_DOCDIR
+ifdef UNIXHier
+ifdef BSDhier
+DOCPREFIXDIR=share/doc
+else
+ifdef linuxHier
+DOCPREFIXDIR=share/doc
+else
+DOCPREFIXDIR=doc
+endif
+endif
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
+endif
+endif
+ifndef INSTALL_EXAMPLEDIR
+ifdef UNIXHier
+ifdef INSTALL_FPCPACKAGE
+ifdef BSDhier
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+ifdef linuxHier
+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+endif
+endif
+else
+ifdef BSDhier
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+else
+ifdef linuxHier
+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+endif
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
+endif
+endif
+endif
+ifndef INSTALL_DATADIR
+INSTALL_DATADIR=$(INSTALL_BASEDIR)
+endif
+ifndef INSTALL_SHAREDDIR
+INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
+endif
+ifdef CROSSCOMPILE
+ifndef CROSSBINDIR
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
+ifeq ($(CROSSBINDIR),)
+CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$(FULL_SOURCE))
+endif
+endif
+else
+CROSSBINDIR=
+endif
+BATCHEXT=.bat
+LOADEREXT=.as
+EXEEXT=.exe
+PPLEXT=.ppl
+PPUEXT=.ppu
+OEXT=.o
+ASMEXT=.s
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.so
+SHAREDLIBPREFIX=libfp
+STATICLIBPREFIX=libp
+IMPORTLIBPREFIX=libimp
+RSTEXT=.rst
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifeq ($(OS_TARGET),go32v1)
+STATICLIBPREFIX=
+SHORTSUFFIX=v1
+endif
+ifeq ($(OS_TARGET),go32v2)
+STATICLIBPREFIX=
+SHORTSUFFIX=dos
+endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+OEXT=.obj
+ASMEXT=.asm
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
+endif
+ifeq ($(OS_TARGET),linux)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=lnx
+endif
+ifeq ($(OS_TARGET),freebsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=fbs
+endif
+ifeq ($(OS_TARGET),netbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=nbs
+endif
+ifeq ($(OS_TARGET),openbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=obs
+endif
+ifeq ($(OS_TARGET),win32)
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=w32
+endif
+ifeq ($(OS_TARGET),os2)
+BATCHEXT=.cmd
+AOUTEXT=.out
+STATICLIBPREFIX=
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=os2
+ECHO=echo
+endif
+ifeq ($(OS_TARGET),emx)
+BATCHEXT=.cmd
+AOUTEXT=.out
+STATICLIBPREFIX=
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=emx
+ECHO=echo
+endif
+ifeq ($(OS_TARGET),amiga)
+EXEEXT=
+SHAREDLIBEXT=.library
+SHORTSUFFIX=amg
+endif
+ifeq ($(OS_TARGET),morphos)
+EXEEXT=
+SHAREDLIBEXT=.library
+SHORTSUFFIX=mos
+endif
+ifeq ($(OS_TARGET),atari)
+EXEEXT=.ttp
+SHORTSUFFIX=ata
+endif
+ifeq ($(OS_TARGET),beos)
+BATCHEXT=.sh
+EXEEXT=
+SHORTSUFFIX=be
+endif
+ifeq ($(OS_TARGET),solaris)
+BATCHEXT=.sh
+EXEEXT=
+SHORTSUFFIX=sun
+endif
+ifeq ($(OS_TARGET),qnx)
+BATCHEXT=.sh
+EXEEXT=
+SHORTSUFFIX=qnx
+endif
+ifeq ($(OS_TARGET),netware)
+EXEEXT=.nlm
+STATICLIBPREFIX=
+SHORTSUFFIX=nw
+endif
+ifeq ($(OS_TARGET),netwlibc)
+EXEEXT=.nlm
+STATICLIBPREFIX=
+SHORTSUFFIX=nwl
+endif
+ifeq ($(OS_TARGET),macos)
+BATCHEXT=
+EXEEXT=
+DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
+endif
+ifeq ($(OS_TARGET),darwin)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=dwn
+endif
+ifeq ($(OS_TARGET),gba)
+EXEEXT=.gba
+SHAREDLIBEXT=.so
+SHORTSUFFIX=gba
+endif
+ifeq ($(OS_TARGET),symbian)
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=symbian
+endif
+else
+ifeq ($(OS_TARGET),go32v1)
+PPUEXT=.pp1
+OEXT=.o1
+ASMEXT=.s1
+SMARTEXT=.sl1
+STATICLIBEXT=.a1
+SHAREDLIBEXT=.so1
+STATICLIBPREFIX=
+SHORTSUFFIX=v1
+endif
+ifeq ($(OS_TARGET),go32v2)
+STATICLIBPREFIX=
+SHORTSUFFIX=dos
+endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+SHORTSUFFIX=wat
+endif
+ifeq ($(OS_TARGET),linux)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=lnx
+endif
+ifeq ($(OS_TARGET),freebsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=fbs
+endif
+ifeq ($(OS_TARGET),netbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=nbs
+endif
+ifeq ($(OS_TARGET),openbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=obs
+endif
+ifeq ($(OS_TARGET),win32)
+PPUEXT=.ppw
+OEXT=.ow
+ASMEXT=.sw
+SMARTEXT=.slw
+STATICLIBEXT=.aw
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=w32
+endif
+ifeq ($(OS_TARGET),os2)
+BATCHEXT=.cmd
+PPUEXT=.ppo
+ASMEXT=.so2
+OEXT=.oo2
+AOUTEXT=.out
+SMARTEXT=.sl2
+STATICLIBPREFIX=
+STATICLIBEXT=.ao2
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=os2
+ECHO=echo
+endif
+ifeq ($(OS_TARGET),amiga)
+EXEEXT=
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.library
+SHORTSUFFIX=amg
+endif
+ifeq ($(OS_TARGET),atari)
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=.ttp
+SHORTSUFFIX=ata
+endif
+ifeq ($(OS_TARGET),beos)
+BATCHEXT=.sh
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+SHORTSUFFIX=be
+endif
+ifeq ($(OS_TARGET),solaris)
+BATCHEXT=.sh
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+SHORTSUFFIX=sun
+endif
+ifeq ($(OS_TARGET),qnx)
+BATCHEXT=.sh
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+SHORTSUFFIX=qnx
+endif
+ifeq ($(OS_TARGET),netware)
+STATICLIBPREFIX=
+PPUEXT=.ppu
+OEXT=.o
+ASMEXT=.s
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.nlm
+EXEEXT=.nlm
+SHORTSUFFIX=nw
+endif
+ifeq ($(OS_TARGET),netwlibc)
+STATICLIBPREFIX=
+PPUEXT=.ppu
+OEXT=.o
+ASMEXT=.s
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.nlm
+EXEEXT=.nlm
+SHORTSUFFIX=nwl
+endif
+ifeq ($(OS_TARGET),macos)
+BATCHEXT=
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
+else
+FPCMADE=fpcmade.$(TARGETSUFFIX)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(SOURCESUFFIX)
+ZIPCROSSPREFIX=$(TARGETSUFFIX)-
+else
+ZIPSUFFIX=.$(TARGETSUFFIX)
+ZIPCROSSPREFIX=
+endif
+endif
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO= __missing_command_ECHO
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+ifndef DATE
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(DATE),)
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(DATE),)
+DATE= __missing_command_DATE
+else
+DATE:=$(firstword $(DATE))
+endif
+else
+DATE:=$(firstword $(DATE))
+endif
+endif
+export DATE
+ifndef GINSTALL
+GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(GINSTALL),)
+GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(GINSTALL),)
+GINSTALL= __missing_command_GINSTALL
+else
+GINSTALL:=$(firstword $(GINSTALL))
+endif
+else
+GINSTALL:=$(firstword $(GINSTALL))
+endif
+endif
+export GINSTALL
+ifndef CPPROG
+CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(CPPROG),)
+CPPROG= __missing_command_CPPROG
+else
+CPPROG:=$(firstword $(CPPROG))
+endif
+endif
+export CPPROG
+ifndef RMPROG
+RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(RMPROG),)
+RMPROG= __missing_command_RMPROG
+else
+RMPROG:=$(firstword $(RMPROG))
+endif
+endif
+export RMPROG
+ifndef MVPROG
+MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(MVPROG),)
+MVPROG= __missing_command_MVPROG
+else
+MVPROG:=$(firstword $(MVPROG))
+endif
+endif
+export MVPROG
+ifndef MKDIRPROG
+MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(MKDIRPROG),)
+MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(MKDIRPROG),)
+MKDIRPROG= __missing_command_MKDIRPROG
+else
+MKDIRPROG:=$(firstword $(MKDIRPROG))
+endif
+else
+MKDIRPROG:=$(firstword $(MKDIRPROG))
+endif
+endif
+export MKDIRPROG
+ifndef ECHOREDIR
+ifndef inUnix
+ECHOREDIR=echo
+else
+ECHOREDIR=$(ECHO)
+endif
+endif
+ifndef COPY
+COPY:=$(CPPROG) -fp
+endif
+ifndef COPYTREE
+COPYTREE:=$(CPPROG) -Rfp
+endif
+ifndef MKDIRTREE
+MKDIRTREE:=$(MKDIRPROG) -p
+endif
+ifndef MOVE
+MOVE:=$(MVPROG) -f
+endif
+ifndef DEL
+DEL:=$(RMPROG) -f
+endif
+ifndef DELTREE
+DELTREE:=$(RMPROG) -rf
+endif
+ifndef INSTALL
+ifdef inUnix
+INSTALL:=$(GINSTALL) -c -m 644
+else
+INSTALL:=$(COPY)
+endif
+endif
+ifndef INSTALLEXE
+ifdef inUnix
+INSTALLEXE:=$(GINSTALL) -c -m 755
+else
+INSTALLEXE:=$(COPY)
+endif
+endif
+ifndef MKDIR
+MKDIR:=$(GINSTALL) -m 755 -d
+endif
+export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+ifndef PPUMOVE
+PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(PPUMOVE),)
+PPUMOVE= __missing_command_PPUMOVE
+else
+PPUMOVE:=$(firstword $(PPUMOVE))
+endif
+endif
+export PPUMOVE
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE= __missing_command_FPCMAKE
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
+ifndef ZIPPROG
+ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ZIPPROG),)
+ZIPPROG= __missing_command_ZIPPROG
+else
+ZIPPROG:=$(firstword $(ZIPPROG))
+endif
+endif
+export ZIPPROG
+ifndef TARPROG
+TARPROG:=$(strip $(wildcard $(addsuffix /gtar$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(TARPROG),)
+TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(TARPROG),)
+TARPROG= __missing_command_TARPROG
+else
+TARPROG:=$(firstword $(TARPROG))
+endif
+else
+TARPROG:=$(firstword $(TARPROG))
+endif
+endif
+export TARPROG
+ASNAME=$(BINUTILSPREFIX)as
+LDNAME=$(BINUTILSPREFIX)ld
+ARNAME=$(BINUTILSPREFIX)ar
+RCNAME=$(BINUTILSPREFIX)rc
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifeq ($(OS_TARGET),win32)
+ifeq ($(CROSSBINDIR),)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
+endif
+endif
+ifndef ASPROG
+ifdef CROSSBINDIR
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
+else
+ASPROG=$(ASNAME)
+endif
+endif
+ifndef LDPROG
+ifdef CROSSBINDIR
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
+else
+LDPROG=$(LDNAME)
+endif
+endif
+ifndef RCPROG
+ifdef CROSSBINDIR
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
+else
+ARPROG=$(ARNAME)
+endif
+endif
+AS=$(ASPROG)
+LD=$(LDPROG)
+RC=$(RCPROG)
+AR=$(ARPROG)
+PPAS=ppas$(SRCBATCHEXT)
+ifdef inUnix
+LDCONFIG=ldconfig
+else
+LDCONFIG=
+endif
+ifdef DATE
+DATESTR:=$(shell $(DATE) +%Y%m%d)
+else
+DATESTR=
+endif
+ifndef UPXPROG
+ifeq ($(OS_TARGET),go32v2)
+UPXPROG:=1
+endif
+ifeq ($(OS_TARGET),win32)
+UPXPROG:=1
+endif
+ifdef UPXPROG
+UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(UPXPROG),)
+UPXPROG=
+else
+UPXPROG:=$(firstword $(UPXPROG))
+endif
+else
+UPXPROG=
+endif
+endif
+export UPXPROG
+ZIPOPT=-9
+ZIPEXT=.zip
+ifeq ($(USETAR),bz2)
+TAROPT=vj
+TAREXT=.tar.bz2
+else
+TAROPT=vz
+TAREXT=.tar.gz
+endif
+override REQUIRE_PACKAGES=rtl 
+ifeq ($(FULL_TARGET),i386-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifdef REQUIRE_PACKAGES_RTL
+PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_RTL),)
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
+else
+UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_RTL=
+UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_RTL),)
+UNITDIR_RTL:=$(firstword $(UNITDIR_RTL))
+else
+UNITDIR_RTL=
+endif
+endif
+ifdef UNITDIR_RTL
+override COMPILER_UNITDIR+=$(UNITDIR_RTL)
+endif
+endif
+ifndef NOCPUDEF
+override FPCOPTDEF=$(CPU_TARGET)
+endif
+ifneq ($(OS_TARGET),$(OS_SOURCE))
+override FPCOPT+=-T$(OS_TARGET)
+endif
+ifneq ($(CPU_TARGET),$(CPU_SOURCE))
+override FPCOPT+=-P$(CPU_TARGET)
+endif
+ifeq ($(OS_SOURCE),openbsd)
+override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+endif
+ifndef CROSSBOOTSTRAP
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-XP$(BINUTILSPREFIX)
+endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
+endif
+endif
+ifdef UNITDIR
+override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
+endif
+ifdef LIBDIR
+override FPCOPT+=$(addprefix -Fl,$(LIBDIR))
+endif
+ifdef OBJDIR
+override FPCOPT+=$(addprefix -Fo,$(OBJDIR))
+endif
+ifdef INCDIR
+override FPCOPT+=$(addprefix -Fi,$(INCDIR))
+endif
+ifdef LINKSMART
+override FPCOPT+=-XX
+endif
+ifdef CREATESMART
+override FPCOPT+=-CX
+endif
+ifdef DEBUG
+override FPCOPT+=-gl
+override FPCOPTDEF+=DEBUG
+endif
+ifdef RELEASE
+ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+endif
+ifeq ($(CPU_TARGET),powerpc)
+FPCCPUOPT:=-O1r
+endif
+else
+FPCCPUOPT:=-O2
+endif
+override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+override FPCOPTDEF+=RELEASE
+endif
+ifdef STRIP
+override FPCOPT+=-Xs
+endif
+ifdef OPTIMIZE
+override FPCOPT+=-O2
+endif
+ifdef VERBOSE
+override FPCOPT+=-vwni
+endif
+ifdef COMPILER_OPTIONS
+override FPCOPT+=$(COMPILER_OPTIONS)
+endif
+ifdef COMPILER_UNITDIR
+override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))
+endif
+ifdef COMPILER_LIBRARYDIR
+override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))
+endif
+ifdef COMPILER_OBJECTDIR
+override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))
+endif
+ifdef COMPILER_INCLUDEDIR
+override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))
+endif
+ifdef CROSSBINDIR
+override FPCOPT+=-FD$(CROSSBINDIR)
+endif
+ifdef COMPILER_TARGETDIR
+override FPCOPT+=-FE$(COMPILER_TARGETDIR)
+ifeq ($(COMPILER_TARGETDIR),.)
+override TARGETDIRPREFIX=
+else
+override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+endif
+endif
+ifdef COMPILER_UNITTARGETDIR
+override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
+ifeq ($(COMPILER_UNITTARGETDIR),.)
+override UNITTARGETDIRPREFIX=
+else
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
+endif
+else
+ifdef COMPILER_TARGETDIR
+override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
+override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
+endif
+endif
+ifdef CREATESHARED
+override FPCOPT+=-Cg
+ifeq ($(CPU_TARGET),i386)
+override FPCOPT+=-Aas
+endif
+endif
+ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),x86_64)
+override FPCOPT+=-Cg
+endif
+endif
+endif
+ifdef LINKSHARED
+endif
+ifdef OPT
+override FPCOPT+=$(OPT)
+endif
+ifdef FPCOPTDEF
+override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))
+endif
+ifdef CFGFILE
+override FPCOPT+=@$(CFGFILE)
+endif
+ifdef USEENV
+override FPCEXTCMD:=$(FPCOPT)
+override FPCOPT:=!FPCEXTCMD
+export FPCEXTCMD
+endif
+override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
+override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
+ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
+override ACROSSCOMPILE=1
+endif
+ifdef ACROSSCOMPILE
+override FPCOPT+=$(CROSSOPT)
+endif
+override COMPILER:=$(FPC) $(FPCOPT)
+ifeq (,$(findstring -s ,$(COMPILER)))
+EXECPPAS=
+else
+ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+ifdef RUNBATCH
+EXECPPAS:=@$(RUNBATCH) $(PPAS)
+else
+EXECPPAS:=@$(PPAS)
+endif
+endif
+endif
+.PHONY: fpc_units
+ifneq ($(TARGET_UNITS),)
+override ALLTARGET+=fpc_units
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
+override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
+override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
+override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
+endif
+fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
+ifneq ($(TARGET_EXAMPLES),)
+HASEXAMPLES=1
+override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
+override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
+override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
+override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+ifeq ($(OS_TARGET),os2)
+override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
+endif
+ifeq ($(OS_TARGET),emx)
+override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
+endif
+endif
+ifneq ($(TARGET_EXAMPLEDIRS),)
+HASEXAMPLES=1
+endif
+fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
+.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
+	@$(ECHOREDIR) Compiled > $(FPCMADE)
+fpc_all: $(FPCMADE)
+fpc_smart:
+	$(MAKE) all LINKSMART=1 CREATESMART=1
+fpc_debug:
+	$(MAKE) all DEBUG=1
+fpc_release:
+	$(MAKE) all RELEASE=1
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
+$(COMPILER_UNITTARGETDIR):
+	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
+$(COMPILER_TARGETDIR):
+	$(MKDIRTREE) $(COMPILER_TARGETDIR)
+%$(PPUEXT): %.pp
+	$(COMPILER) $<
+	$(EXECPPAS)
+%$(PPUEXT): %.pas
+	$(COMPILER) $<
+	$(EXECPPAS)
+%$(EXEEXT): %.pp
+	$(COMPILER) $<
+	$(EXECPPAS)
+%$(EXEEXT): %.pas
+	$(COMPILER) $<
+	$(EXECPPAS)
+%$(EXEEXT): %.lpr
+	$(COMPILER) $<
+	$(EXECPPAS)
+%$(EXEEXT): %.dpr
+	$(COMPILER) $<
+	$(EXECPPAS)
+%.res: %.rc
+	windres -i $< -o $@
+vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.inc $(COMPILER_INCLUDEDIR)
+vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
+vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
+.PHONY: fpc_shared
+override INSTALLTARGET+=fpc_shared_install
+ifndef SHARED_LIBVERSION
+SHARED_LIBVERSION=$(FPC_VERSION)
+endif
+ifndef SHARED_LIBNAME
+SHARED_LIBNAME=$(PACKAGE_NAME)
+endif
+ifndef SHARED_FULLNAME
+SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
+endif
+ifndef SHARED_LIBUNITS
+SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
+override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
+endif
+fpc_shared:
+ifdef HASSHAREDLIB
+	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
+ifneq ($(SHARED_BUILD),n)
+	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
+endif
+else
+	@$(ECHO) Shared Libraries not supported
+endif
+fpc_shared_install:
+ifneq ($(SHARED_BUILD),n)
+ifneq ($(SHARED_LIBUNITS),)
+ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
+	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
+endif
+endif
+endif
+.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
+ifdef INSTALL_UNITS
+override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
+endif
+ifdef INSTALL_BUILDUNIT
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+endif
+ifdef INSTALLPPUFILES
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+ifneq ($(UNITTARGETDIRPREFIX),)
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+endif
+override INSTALL_CREATEPACKAGEFPC=1
+endif
+ifdef INSTALLEXEFILES
+ifneq ($(TARGETDIRPREFIX),)
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
+endif
+endif
+fpc_install: all $(INSTALLTARGET)
+ifdef INSTALLEXEFILES
+	$(MKDIR) $(INSTALL_BINDIR)
+ifdef UPXPROG
+	-$(UPXPROG) $(INSTALLEXEFILES)
+endif
+	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
+endif
+ifdef INSTALL_CREATEPACKAGEFPC
+ifdef FPCMAKE
+ifdef PACKAGE_VERSION
+ifneq ($(wildcard Makefile.fpc),)
+	$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
+endif
+endif
+endif
+ifdef INSTALLPPUFILES
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
+ifneq ($(INSTALLPPULINKFILES),)
+	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
+endif
+ifneq ($(wildcard $(LIB_FULLNAME)),)
+	$(MKDIR) $(INSTALL_LIBDIR)
+	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
+ifdef inUnix
+	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
+endif
+endif
+endif
+ifdef INSTALL_FILES
+	$(MKDIR) $(INSTALL_DATADIR)
+	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
+endif
+fpc_sourceinstall: distclean
+	$(MKDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+ifdef HASEXAMPLES
+	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
+	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef TARGET_EXAMPLEDIRS
+	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+endif
+.PHONY: fpc_distinstall
+fpc_distinstall: install exampleinstall
+.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
+ifndef PACKDIR
+ifndef inUnix
+PACKDIR=$(BASEDIR)/../fpc-pack
+else
+PACKDIR=/tmp/fpc-pack
+endif
+endif
+ifndef ZIPNAME
+ifdef DIST_ZIPNAME
+ZIPNAME=$(DIST_ZIPNAME)
+else
+ZIPNAME=$(PACKAGE_NAME)
+endif
+endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
+endif
+ifndef ZIPTARGET
+ifdef DIST_ZIPTARGET
+ZIPTARGET=DIST_ZIPTARGET
+else
+ZIPTARGET=install
+endif
+endif
+ifndef USEZIP
+ifdef inUnix
+USETAR=1
+endif
+endif
+ifndef inUnix
+USEZIPWRAPPER=1
+endif
+ifdef USEZIPWRAPPER
+ZIPPATHSEP=$(PATHSEP)
+ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))
+else
+ZIPPATHSEP=/
+endif
+ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
+ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
+ifdef USETAR
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
+ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
+else
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
+ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
+endif
+fpc_zipinstall:
+	$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1
+	$(MKDIR) $(DIST_DESTDIR)
+	$(DEL) $(ZIPDESTFILE)
+ifdef USEZIPWRAPPER
+ifneq ($(ECHOREDIR),echo)
+	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER)
+	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)
+	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER)
+else
+	echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)
+	echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)
+	echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
+endif
+ifdef inUnix
+	/bin/sh $(ZIPWRAPPER)
+else
+ifdef RUNBATCH
+	$(RUNBATCH) (ZIPWRAPPER)
+else
+	$(ZIPWRAPPER)
+endif
+endif
+	$(DEL) $(ZIPWRAPPER)
+else
+	$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
+endif
+	$(DELTREE) $(PACKDIR)
+fpc_zipsourceinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
+fpc_zipexampleinstall:
+ifdef HASEXAMPLES
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
+endif
+fpc_zipdistinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
+ifdef EXEFILES
+override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
+endif
+ifdef CLEAN_UNITS
+override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
+endif
+ifdef CLEANPPUFILES
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+ifdef DEBUGSYMEXT
+override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
+endif
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
+endif
+fpc_clean: $(CLEANTARGET)
+ifdef CLEANEXEFILES
+	-$(DEL) $(CLEANEXEFILES)
+endif
+ifdef CLEANPPUFILES
+	-$(DEL) $(CLEANPPUFILES)
+endif
+ifneq ($(CLEANPPULINKFILES),)
+	-$(DEL) $(CLEANPPULINKFILES)
+endif
+ifdef CLEANRSTFILES
+	-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
+endif
+ifdef CLEAN_FILES
+	-$(DEL) $(CLEAN_FILES)
+endif
+ifdef LIB_NAME
+	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+endif
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
+fpc_cleanall: $(CLEANTARGET)
+ifdef CLEANEXEFILES
+	-$(DEL) $(CLEANEXEFILES)
+endif
+ifdef COMPILER_UNITTARGETDIR
+ifdef CLEANPPUFILES
+	-$(DEL) $(CLEANPPUFILES)
+endif
+ifneq ($(CLEANPPULINKFILES),)
+	-$(DEL) $(CLEANPPULINKFILES)
+endif
+ifdef CLEANRSTFILES
+	-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
+endif
+endif
+	-$(DELTREE) units
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ifneq ($(PPUEXT),.ppu)
+	-$(DEL) *.o *.ppu *.a
+endif
+	-$(DELTREE) *$(SMARTEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT)
+ifdef AOUTEXT
+	-$(DEL) *$(AOUTEXT)
+endif
+ifdef DEBUGSYMEXT
+	-$(DEL) *$(DEBUGSYMEXT)
+endif
+fpc_distclean: cleanall
+.PHONY: fpc_baseinfo
+override INFORULES+=fpc_baseinfo
+fpc_baseinfo:
+	@$(ECHO)
+	@$(ECHO)  == Package info ==
+	@$(ECHO)  Package Name..... $(PACKAGE_NAME)
+	@$(ECHO)  Package Version.. $(PACKAGE_VERSION)
+	@$(ECHO)
+	@$(ECHO)  == Configuration info ==
+	@$(ECHO)
+	@$(ECHO)  FPC.......... $(FPC)
+	@$(ECHO)  FPC Version.. $(FPC_VERSION)
+	@$(ECHO)  Source CPU... $(CPU_SOURCE)
+	@$(ECHO)  Target CPU... $(CPU_TARGET)
+	@$(ECHO)  Source OS.... $(OS_SOURCE)
+	@$(ECHO)  Target OS.... $(OS_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
+	@$(ECHO)  SourceSuffix. $(SOURCESUFFIX)
+	@$(ECHO)  TargetSuffix. $(TARGETSUFFIX)
+	@$(ECHO)
+	@$(ECHO)  == Directory info ==
+	@$(ECHO)
+	@$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)
+	@$(ECHO)
+	@$(ECHO)  Basedir......... $(BASEDIR)
+	@$(ECHO)  FPCDir.......... $(FPCDIR)
+	@$(ECHO)  CrossBinDir..... $(CROSSBINDIR)
+	@$(ECHO)  UnitsDir........ $(UNITSDIR)
+	@$(ECHO)  PackagesDir..... $(PACKAGESDIR)
+	@$(ECHO)
+	@$(ECHO)  GCC library..... $(GCCLIBDIR)
+	@$(ECHO)  Other library... $(OTHERLIBDIR)
+	@$(ECHO)
+	@$(ECHO)  == Tools info ==
+	@$(ECHO)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)
+	@$(ECHO)  Mv........ $(MVPROG)
+	@$(ECHO)  Cp........ $(CPPROG)
+	@$(ECHO)  Rm........ $(RMPROG)
+	@$(ECHO)  GInstall.. $(GINSTALL)
+	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Shell..... $(SHELL)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
+	@$(ECHO)  PPUMove... $(PPUMOVE)
+	@$(ECHO)  Upx....... $(UPXPROG)
+	@$(ECHO)  Zip....... $(ZIPPROG)
+	@$(ECHO)
+	@$(ECHO)  == Object info ==
+	@$(ECHO)
+	@$(ECHO)  Target Loaders........ $(TARGET_LOADERS)
+	@$(ECHO)  Target Units.......... $(TARGET_UNITS)
+	@$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)
+	@$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)
+	@$(ECHO)  Target Dirs........... $(TARGET_DIRS)
+	@$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)
+	@$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)
+	@$(ECHO)
+	@$(ECHO)  Clean Units......... $(CLEAN_UNITS)
+	@$(ECHO)  Clean Files......... $(CLEAN_FILES)
+	@$(ECHO)
+	@$(ECHO)  Install Units....... $(INSTALL_UNITS)
+	@$(ECHO)  Install Files....... $(INSTALL_FILES)
+	@$(ECHO)
+	@$(ECHO)  == Install info ==
+	@$(ECHO)
+	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
+	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
+	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
+	@$(ECHO)
+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
+	@$(ECHO)
+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
+	@$(ECHO)
+.PHONY: fpc_info
+fpc_info: $(INFORULES)
+.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2 \
+	fpc_makefile_dirs
+fpc_makefile:
+	$(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc
+fpc_makefile_sub1:
+ifdef TARGET_DIRS
+	$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_DIRS))
+endif
+ifdef TARGET_EXAMPLEDIRS
+	$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_EXAMPLEDIRS))
+endif
+fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
+fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
+fpc_makefiles: fpc_makefile fpc_makefile_dirs
+all: fpc_all
+debug: fpc_debug
+smart: fpc_smart
+release: fpc_release
+units: fpc_units
+examples: fpc_examples
+shared: fpc_shared
+install: fpc_install
+sourceinstall: fpc_sourceinstall
+exampleinstall: fpc_exampleinstall
+distinstall: fpc_distinstall
+zipinstall: fpc_zipinstall
+zipsourceinstall: fpc_zipsourceinstall
+zipexampleinstall: fpc_zipexampleinstall
+zipdistinstall: fpc_zipdistinstall
+clean: fpc_clean
+distclean: fpc_distclean
+cleanall: fpc_cleanall
+info: fpc_info
+makefiles: fpc_makefiles
+.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+ifneq ($(wildcard fpcmake.loc),)
+include fpcmake.loc
+endif
+.NOTPARALLEL:

packages/winunits-base/Makefile.fpc

@@ -0,0 +1,30 @@
+#
+#   Makefile.fpc for WinUnits
+#
+
+[package]
+name=winunits-base
+version=2.2.0
+
+[target]
+units=buildwinutilsbase
+implicitunits=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver \
+               shfolder richedit
+
+examples=examples
+
+rsts = jwawintype comconst
+
+[install]
+buildunit=buildwinutilsbase
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+options=-Ur
+sourcedir=src
+
+[rules]
+.NOTPARALLEL:

packages/winunits-base/fpmake.inc

@@ -0,0 +1,24 @@
+    StartPackage('winunits-base');
+    {$IF defined(ALLPACKAGES)}
+    Directory:='winunits-base';
+    {$ELSEIF defined(EXTRAPACKAGES)}
+    Directory:='winunits-base';
+    {$ENDIF}
+    OS:=[win32,win64];
+    T:=Targets.AddUnit('buildwinutils');
+    T.Install:=False;
+    T:=Targets.AddUnit('activex');
+    T:=Targets.AddUnit('comconst');
+    T:=Targets.AddUnit('commctrl');
+    T:=Targets.AddUnit('comobj');
+    T:=Targets.AddUnit('flatsb');
+    T:=Targets.AddUnit('mmsystem');
+    T:=Targets.AddUnit('ole2');
+    T:=Targets.AddUnit('oleserver');
+    T:=Targets.AddUnit('richedit');
+    T:=Targets.AddUnit('shellapi');
+    T:=Targets.AddUnit('shfolder');
+    T:=Targets.AddUnit('shlobj');
+    T:=Targets.AddUnit('winver');
+    T:=Targets.AddExampleunit('examples');
+    EndPackage;

packages/winunits-base/src/buildwinutilsbase.pp

@@ -0,0 +1,29 @@
+{
+   Dummy unit to compile everything in one go
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+}
+unit buildwinutilsbase;
+
+interface
+
+uses
+    flatsb, winver, mmsystem, comconst, commctrl, comobj, 
+    ole2, activex, shellapi, shlobj, oleserver,  shfolder, richedit;
+
+implementation
+
+end.

packages/base/winunits/comobj.pp → packages/winunits-base/src/comobj.pp

@@ -803,7 +803,12 @@ implementation
           case InvokeKind of
             DISPATCH_PROPERTYPUT:
               begin
-                { !! FIXME}
+                if (Arguments[0].VType and varDispatch)<>0 then
+                  InvokeKind:=DISPATCH_PROPERTYPUTREF;
+                { first name is actually the name of the property to set }
+                DispIDs^[0]:=DISPATCH_PROPERTYPUT;
+                DispParams.rgdispidNamedArgs:=@DispIDs^[0];
+                inc(DispParams.cNamedArgs);
               end;
             DISPATCH_METHOD:
               if assigned(Result) and (CallDesc^.ArgCount=0) then

packages/base/winunits/richedit.pp → packages/winunits-base/src/richedit.pp

@@ -1,632 +1,632 @@
-{ Converted by H2Pas from richedit.h }
-unit richedit;
-
-{$mode objfpc}
-{$calling stdcall}
-
-interface
-
-uses Messages, Windows;
-
-{$IFDEF FPC}
-{$PACKRECORDS C}
-{$ENDIF}
-
-{$ifdef UNICODE }
-  const
-     RICHEDIT_CLASS = 'RichEdit20W';
-{$else}
-  const
-     RICHEDIT_CLASS = 'RichEdit20A';
-{$endif}
-
-  const
-     RICHEDIT_CLASS10A = 'RICHEDIT';
-     CF_RTF = 'Rich Text Format';
-     CF_RTFNOOBJS = 'Rich Text Format Without Objects';
-     CF_RETEXTOBJ = 'RichEdit Text and Objects';
-     CFM_BOLD = 1;
-     CFM_ITALIC = 2;
-     CFM_UNDERLINE = 4;
-     CFM_STRIKEOUT = 8;
-     CFM_PROTECTED = 16;
-     CFM_LINK = 32;
-     CFM_SIZE = $80000000;
-     CFM_COLOR = $40000000;
-     CFM_FACE = $20000000;
-     CFM_OFFSET = $10000000;
-     CFM_CHARSET = $08000000;
-     CFM_SUBSCRIPT = $00030000;
-     CFM_SUPERSCRIPT = $00030000;
-     CFM_EFFECTS = (((((CFM_BOLD or CFM_ITALIC) or CFM_UNDERLINE) or CFM_COLOR) or CFM_STRIKEOUT) or CFE_PROTECTED) or CFM_LINK;
-     CFE_BOLD = 1;
-     CFE_ITALIC = 2;
-     CFE_UNDERLINE = 4;
-     CFE_STRIKEOUT = 8;
-     CFE_PROTECTED = 16;
-     CFE_AUTOCOLOR = $40000000;
-     CFE_SUBSCRIPT = $00010000;
-     CFE_SUPERSCRIPT = $00020000;
-     IMF_FORCENONE = 1;
-     IMF_FORCEENABLE = 2;
-     IMF_FORCEDISABLE = 4;
-     IMF_CLOSESTATUSWINDOW = 8;
-     IMF_VERTICAL = 32;
-     IMF_FORCEACTIVE = 64;
-     IMF_FORCEINACTIVE = 128;
-     IMF_FORCEREMEMBER = 256;
-     SEL_EMPTY = 0;
-     SEL_TEXT = 1;
-     SEL_OBJECT = 2;
-     SEL_MULTICHAR = 4;
-     SEL_MULTIOBJECT = 8;
-     MAX_TAB_STOPS = 32;
-     PFM_ALIGNMENT = 8;
-     PFM_NUMBERING = 32;
-     PFM_OFFSET = 4;
-     PFM_OFFSETINDENT = $80000000;
-     PFM_RIGHTINDENT = 2;
-     PFM_STARTINDENT = 1;
-     PFM_TABSTOPS = 16;
-     PFM_BORDER = 2048;
-     PFM_LINESPACING = 256;
-     PFM_NUMBERINGSTART = 32768;
-     PFM_NUMBERINGSTYLE = 8192;
-     PFM_NUMBERINGTAB = 16384;
-     PFM_SHADING = 4096;
-     PFM_SPACEAFTER = 128;
-     PFM_SPACEBEFORE = 64;
-     PFM_STYLE = 1024;
-     PFM_DONOTHYPHEN = 4194304;
-     PFM_KEEP = 131072;
-     PFM_KEEPNEXT = 262144;
-     PFM_NOLINENUMBER = 1048576;
-     PFM_NOWIDOWCONTROL = 2097152;
-     PFM_PAGEBREAKBEFORE = 524288;
-     PFM_RTLPARA = 65536;
-     PFM_SIDEBYSIDE = 8388608;
-     PFM_TABLE = 1073741824;
-     PFN_BULLET = 1;
-     PFE_DONOTHYPHEN = 64;
-     PFE_KEEP = 2;
-     PFE_KEEPNEXT = 4;
-     PFE_NOLINENUMBER = 16;
-     PFE_NOWIDOWCONTROL = 32;
-     PFE_PAGEBREAKBEFORE = 8;
-     PFE_RTLPARA = 1;
-     PFE_SIDEBYSIDE = 128;
-     PFE_TABLE = 16384;
-     PFA_LEFT = 1;
-     PFA_RIGHT = 2;
-     PFA_CENTER = 3;
-     PFA_JUSTIFY = 4;
-     PFA_FULL_INTERWORD = 4;
-     SF_TEXT = 1;
-     SF_RTF = 2;
-     SF_RTFNOOBJS = 3;
-     SF_TEXTIZED = 4;
-     SF_UNICODE = 16;
-     SF_USECODEPAGE = 32;
-     SF_NCRFORNONASCII = 64;
-     SF_RTFVAL = $0700;
-     SFF_PWD = $0800;
-     SFF_KEEPDOCINFO = $1000;
-     SFF_PERSISTVIEWSCALE = $2000;
-     SFF_PLAINRTF = $4000;
-     SFF_SELECTION = $8000;
-     WB_CLASSIFY = 3;
-     WB_MOVEWORDLEFT = 4;
-     WB_MOVEWORDRIGHT = 5;
-     WB_LEFTBREAK = 6;
-     WB_RIGHTBREAK = 7;
-     WB_MOVEWORDPREV = 4;
-     WB_MOVEWORDNEXT = 5;
-     WB_PREVBREAK = 6;
-     WB_NEXTBREAK = 7;
-     WBF_WORDWRAP = 16;
-     WBF_WORDBREAK = 32;
-     WBF_OVERFLOW = 64;
-     WBF_LEVEL1 = 128;
-     WBF_LEVEL2 = 256;
-     WBF_CUSTOM = 512;
-     ES_DISABLENOSCROLL = 8192;
-     ES_EX_NOCALLOLEINIT = 16777216;
-     ES_NOIME = 524288;
-     ES_NOOLEDRAGDROP = 8;
-     ES_SAVESEL = 32768;
-     ES_SELECTIONBAR = 16777216;
-     ES_SELFIME = 262144;
-     ES_SUNKEN = 16384;
-     ES_VERTICAL = 4194304;
-     EM_CANPASTE = WM_USER+50;
-     EM_DISPLAYBAND = WM_USER+51;
-     EM_EXGETSEL = WM_USER+52;
-     EM_EXLIMITTEXT = WM_USER+53;
-     EM_EXLINEFROMCHAR = WM_USER+54;
-     EM_EXSETSEL = WM_USER+55;
-     EM_FINDTEXT = WM_USER+56;
-     EM_FORMATRANGE = WM_USER+57;
-     EM_GETCHARFORMAT = WM_USER+58;
-     EM_GETEVENTMASK = WM_USER+59;
-     EM_GETOLEINTERFACE = WM_USER+60;
-     EM_GETPARAFORMAT = WM_USER+61;
-     EM_GETSELTEXT = WM_USER+62;
-     EM_HIDESELECTION = WM_USER+63;
-     EM_PASTESPECIAL = WM_USER+64;
-     EM_REQUESTRESIZE = WM_USER+65;
-     EM_SELECTIONTYPE = WM_USER+66;
-     EM_SETBKGNDCOLOR = WM_USER+67;
-     EM_SETCHARFORMAT = WM_USER+68;
-     EM_SETEVENTMASK = WM_USER+69;
-     EM_SETOLECALLBACK = WM_USER+70;
-     EM_SETPARAFORMAT = WM_USER+71;
-     EM_SETTARGETDEVICE = WM_USER+72;
-     EM_STREAMIN = WM_USER+73;
-     EM_STREAMOUT = WM_USER+74;
-     EM_GETTEXTRANGE = WM_USER+75;
-     EM_FINDWORDBREAK = WM_USER+76;
-     EM_SETOPTIONS = WM_USER+77;
-     EM_GETOPTIONS = WM_USER+78;
-     EM_FINDTEXTEX = WM_USER+79;
-     EM_GETWORDBREAKPROCEX = WM_USER+80;
-     EM_SETWORDBREAKPROCEX = WM_USER+81;
-  { RichEdit 2.0 messages  }
-     EM_SETUNDOLIMIT = WM_USER+82;
-     EM_REDO = WM_USER+84;
-     EM_CANREDO = WM_USER+85;
-     EM_GETUNDONAME = WM_USER+86;
-     EM_GETREDONAME = WM_USER+87;
-     EM_STOPGROUPTYPING = WM_USER+88;
-     EM_SETTEXTMODE = WM_USER+89;
-     EM_GETTEXTMODE = WM_USER+90;
-     EM_AUTOURLDETECT = WM_USER+91;
-     EM_GETAUTOURLDETECT = WM_USER+92;
-     EM_SETPALETTE = WM_USER+93;
-     EM_GETTEXTEX = WM_USER+94;
-     EM_GETTEXTLENGTHEX = WM_USER+95;
-     EM_SHOWSCROLLBAR = WM_USER+96;
-     EM_SETTEXTEX = WM_USER+97;
-     EM_SETPUNCTUATION = WM_USER+100;
-     EM_GETPUNCTUATION = WM_USER+101;
-     EM_SETWORDWRAPMODE = WM_USER+102;
-     EM_GETWORDWRAPMODE = WM_USER+103;
-     EM_SETIMECOLOR = WM_USER+104;
-     EM_GETIMECOLOR = WM_USER+105;
-     EM_SETIMEOPTIONS = WM_USER+106;
-     EM_GETIMEOPTIONS = WM_USER+107;
-     EM_SETLANGOPTIONS = WM_USER+120;
-     EM_GETLANGOPTIONS = WM_USER+121;
-     EM_GETIMECOMPMODE = WM_USER+122;
-     EM_FINDTEXTW = WM_USER+123;
-     EM_FINDTEXTEXW = WM_USER+124;
-     EM_RECONVERSION = WM_USER+125;
-     EM_SETBIDIOPTIONS = WM_USER+200;
-     EM_GETBIDIOPTIONS = WM_USER+201;
-     EM_SETTYPOGRAPHYOPTIONS = WM_USER+202;
-     EM_GETTYPOGRAPHYOPTIONS = WM_USER+203;
-     EM_SETEDITSTYLE = WM_USER+204;
-     EM_GETEDITSTYLE = WM_USER+205;
-     EM_GETSCROLLPOS = WM_USER+221;
-     EM_SETSCROLLPOS = WM_USER+222;
-     EM_SETFONTSIZE = WM_USER+223;
-     EM_GETZOOM = WM_USER+224;
-     EM_SETZOOM = WM_USER+225;
-     EN_CORRECTTEXT = 1797;
-     EN_DROPFILES = 1795;
-     EN_IMECHANGE = 1799;
-     EN_LINK = 1803;
-     EN_MSGFILTER = 1792;
-     EN_OLEOPFAILED = 1801;
-     EN_PROTECTED = 1796;
-     EN_REQUESTRESIZE = 1793;
-     EN_SAVECLIPBOARD = 1800;
-     EN_SELCHANGE = 1794;
-     EN_STOPNOUNDO = 1798;
-     ENM_NONE = 0;
-     ENM_CHANGE = 1;
-     ENM_CORRECTTEXT = 4194304;
-     ENM_DRAGDROPDONE = 16;
-     ENM_DROPFILES = 1048576;
-     ENM_IMECHANGE = 8388608;
-     ENM_KEYEVENTS = 65536;
-     ENM_LANGCHANGE = 16777216;
-     ENM_LINK = 67108864;
-     ENM_MOUSEEVENTS = 131072;
-     ENM_OBJECTPOSITIONS = 33554432;
-     ENM_PROTECTED = 2097152;
-     ENM_REQUESTRESIZE = 262144;
-     ENM_SCROLL = 4;
-     ENM_SCROLLEVENTS = 8;
-     ENM_SELCHANGE = 524288;
-     ENM_UPDATE = 2;
-     ECO_AUTOWORDSELECTION = 1;
-     ECO_AUTOVSCROLL = 64;
-     ECO_AUTOHSCROLL = 128;
-     ECO_NOHIDESEL = 256;
-     ECO_READONLY = 2048;
-     ECO_WANTRETURN = 4096;
-     ECO_SAVESEL = $8000;
-     ECO_SELECTIONBAR = $1000000;
-     ECO_VERTICAL = $400000;
-     ECOOP_SET = 1;
-     ECOOP_OR = 2;
-     ECOOP_AND = 3;
-     ECOOP_XOR = 4;
-     SCF_DEFAULT = 0;
-     SCF_SELECTION = 1;
-     SCF_WORD = 2;
-     SCF_ALL = 4;
-     SCF_USEUIRULES = 8;
-     TM_PLAINTEXT = 1;
-     TM_RICHTEXT = 2;
-     TM_SINGLELEVELUNDO = 4;
-     TM_MULTILEVELUNDO = 8;
-     TM_SINGLECODEPAGE = 16;
-     TM_MULTICODEPAGE = 32;
-     GT_DEFAULT = 0;
-     GT_USECRLF = 1;
-     yHeightCharPtsMost = 1638;
-     lDefaultTab = 720;
-     FT_MATCHCASE = 4;
-     FT_WHOLEWORD = 2;
-
-  type
-
-     _charformat = record
-          cbSize : UINT;
-          dwMask : DWORD;
-          dwEffects : DWORD;
-          yHeight : LONG;
-          yOffset : LONG;
-          crTextColor : COLORREF;
-          bCharSet : BYTE;
-          bPitchAndFamily : BYTE;
-          szFaceName : array[0..(LF_FACESIZE)-1] of char;
-       end;
-     CHARFORMATA = _charformat;
-     TCHARFORMATA = _charformat;
-
-     _charformatw = record
-          cbSize : UINT;
-          dwMask : DWORD;
-          dwEffects : DWORD;
-          yHeight : LONG;
-          yOffset : LONG;
-          crTextColor : COLORREF;
-          bCharSet : BYTE;
-          bPitchAndFamily : BYTE;
-          szFaceName : array[0..(LF_FACESIZE)-1] of WCHAR;
-       end;
-     CHARFORMATW = _charformatw;
-     TCHARFORMATW = _charformatw;
-
-     _charformat2a = record
-          cbSize : UINT;
-          dwMask : DWORD;
-          dwEffects : DWORD;
-          yHeight : LONG;
-          yOffset : LONG;
-          crTextColor : COLORREF;
-          bCharSet : BYTE;
-          bPitchAndFamily : BYTE;
-          szFaceName : array[0..(LF_FACESIZE)-1] of char;
-          wWeight : WORD;
-          sSpacing : SHORT;
-          crBackColor : COLORREF;
-          lcid : LCID;
-          dwReserved : DWORD;
-          sStyle : SHORT;
-          wKerning : WORD;
-          bUnderlineType : BYTE;
-          bAnimation : BYTE;
-          bRevAuthor : BYTE;
-       end;
-     CHARFORMAT2A = _charformat2a;
-     TCHARFORMAT2A = _charformat2a;
-
-     _charformat2w = record
-          cbSize : UINT;
-          dwMask : DWORD;
-          dwEffects : DWORD;
-          yHeight : LONG;
-          yOffset : LONG;
-          crTextColor : COLORREF;
-          bCharSet : BYTE;
-          bPitchAndFamily : BYTE;
-          szFaceName : array[0..(LF_FACESIZE)-1] of WCHAR;
-          wWeight : WORD;
-          sSpacing : SHORT;
-          crBackColor : COLORREF;
-          lcid : LCID;
-          dwReserved : DWORD;
-          sStyle : SHORT;
-          wKerning : WORD;
-          bUnderlineType : BYTE;
-          bAnimation : BYTE;
-          bRevAuthor : BYTE;
-       end;
-     CHARFORMAT2W = _charformat2w;
-     TCHARFORMAT2W = _charformat2w;
-
-     _charrange = record
-          cpMin : LONG;
-          cpMax : LONG;
-       end;
-     CHARRANGE = _charrange;
-     TCHARRANGE = _charrange;
-
-     _compcolor = record
-          crText : COLORREF;
-          crBackground : COLORREF;
-          dwEffects : DWORD;
-       end;
-     COMPCOLOR = _compcolor;
-     TCOMPCOLOR = _compcolor;
-
-     EDITSTREAMCALLBACK = function (dwCookie:PDWORD; pbBuff:LPBYTE; cb:LONG; var pcb:LONG):DWORD;
-
-     _editstream = record
-          dwCookie : DWORD;
-          dwError : DWORD;
-          pfnCallback : EDITSTREAMCALLBACK;
-       end;
-     EDITSTREAM = _editstream;
-     TEDITSTREAM = _editstream;
-
-     _encorrecttext = record
-          nmhdr : NMHDR;
-          chrg : CHARRANGE;
-          seltyp : WORD;
-       end;
-     ENCORRECTTEXT = _encorrecttext;
-     TENCORRECTTEXT = _encorrecttext;
-
-     _endropfiles = record
-          nmhdr : NMHDR;
-          hDrop : HANDLE;
-          cp : LONG;
-          fProtected : BOOL;
-       end;
-     ENDROPFILES = _endropfiles;
-     TENDROPFILES = _endropfiles;
-
-     _enlink = record
-          nmhdr : NMHDR;
-          msg : UINT;
-          wParam : WPARAM;
-          lParam : LPARAM;
-          chrg : CHARRANGE;
-       end;
-     ENLINK = _enlink;
-     TENLINK = _enlink;
-
-     ENOLEOPFAILED = record
-          nmhdr : NMHDR;
-          iob : LONG;
-          lOper : LONG;
-          hr : HRESULT;
-       end;
-
-     _enprotected = record
-          nmhdr : NMHDR;
-          msg : UINT;
-          wParam : WPARAM;
-          lParam : LPARAM;
-          chrg : CHARRANGE;
-       end;
-     ENPROTECTED = _enprotected;
-     TENPROTECTED = _enprotected;
-     LPENPROTECTED = ^_enprotected;
-
-     _ensaveclipboard = record
-          nmhdr : NMHDR;
-          cObjectCount : LONG;
-          cch : LONG;
-       end;
-     ENSAVECLIPBOARD = _ensaveclipboard;
-     TENSAVECLIPBOARD = _ensaveclipboard;
-
-     _findtextA = record
-          chrg : CHARRANGE;
-          lpstrText : LPSTR;
-       end;
-     FINDTEXTA = _findtextA;
-     TFINDTEXTA = _findtextA;
-
-     _findtextW = record
-          chrg : CHARRANGE;
-          lpstrText : LPWSTR;
-       end;
-     FINDTEXTW = _findtextW;
-     TFINDTEXTW = _findtextW;
-
-     _findtextexA = record
-          chrg : CHARRANGE;
-          lpstrText : LPSTR;
-          chrgText : CHARRANGE;
-       end;
-     FINDTEXTEXA = _findtextexA;
-     TFINDTEXTEXA = _findtextexA;
-
-     _findtextexW = record
-          chrg : CHARRANGE;
-          lpstrText : LPWSTR;
-          chrgText : CHARRANGE;
-       end;
-     FINDTEXTEXW = _findtextexW;
-     TFINDTEXTEXW = _findtextexW;
-
-     _formatrange = record
-          hdc : HDC;
-          hdcTarget : HDC;
-          rc : RECT;
-          rcPage : RECT;
-          chrg : CHARRANGE;
-       end;
-     FORMATRANGE = _formatrange;
-     TFORMATRANGE = _formatrange;
-
-     _msgfilter = record
-          nmhdr : NMHDR;
-          msg : UINT;
-          wParam : WPARAM;
-          lParam : LPARAM;
-       end;
-     MSGFILTER = _msgfilter;
-     TMSGFILTER = _msgfilter;
-
-     TReqSize = record
-       nmhdr: TNMHdr;
-       rc: TRect;
-     end;
-     PReqSize = ^TReqSize;
-
-     _paraformat = record
-          cbSize : UINT;
-          dwMask : DWORD;
-          wNumbering : WORD;
-          wReserved : WORD;
-          dxStartIndent : LONG;
-          dxRightIndent : LONG;
-          dxOffset : LONG;
-          wAlignment : WORD;
-          cTabCount : SHORT;
-          rgxTabs : array[0..(MAX_TAB_STOPS)-1] of LONG;
-       end;
-     PARAFORMAT = _paraformat;
-     TParaFormat = _paraformat;
-
-     _paraformat2 = record
-          cbSize : UINT;
-          dwMask : DWORD;
-          wNumbering : WORD;
-          wEffects : WORD;
-          dxStartIndent : LONG;
-          dxRightIndent : LONG;
-          dxOffset : LONG;
-          wAlignment : WORD;
-          cTabCount : SHORT;
-          rgxTabs : array[0..(MAX_TAB_STOPS)-1] of LONG;
-          dySpaceBefore : LONG;
-          dySpaceAfter : LONG;
-          dyLineSpacing : LONG;
-          sStype : SHORT;
-          bLineSpacingRule : BYTE;
-          bOutlineLevel : BYTE;
-          wShadingWeight : WORD;
-          wShadingStyle : WORD;
-          wNumberingStart : WORD;
-          wNumberingStyle : WORD;
-          wNumberingTab : WORD;
-          wBorderSpace : WORD;
-          wBorderWidth : WORD;
-          wBorders : WORD;
-       end;
-     PARAFORMAT2 = _paraformat2;
-     TPARAFORMAT2 = _paraformat2;
-
-     _selchange = record
-          nmhdr : NMHDR;
-          chrg : CHARRANGE;
-          seltyp : WORD;
-       end;
-     SELCHANGE = _selchange;
-     TSELCHANGE = _selchange;
-
-     _textrange = record
-          chrg : CHARRANGE;
-          lpstrText : LPSTR;
-       end;
-     TEXTRANGEA = _textrange;
-     TTEXTRANGEA = _textrange;
-
-     _textrangew = record
-          chrg : CHARRANGE;
-          lpstrText : LPWSTR;
-       end;
-     TEXTRANGEW = _textrangew;
-     TTEXTRANGEW = _textrangew;
-
-     _reqresize = record
-          nmhdr : NMHDR;
-          rc : RECT;
-       end;
-     REQRESIZE = _reqresize;
-     TREQRESIZE = _reqresize;
-
-     _repastespecial = record
-          dwAspect : DWORD;
-          dwParam : DWORD;
-       end;
-     REPASTESPECIAL = _repastespecial;
-     TREPASTESPECIAL = _repastespecial;
-
-     _punctuation = record
-          iSize : UINT;
-          szPunctuation : LPSTR;
-       end;
-     PUNCTUATION = _punctuation;
-     TPUNCTUATION = _punctuation;
-
-     _gettextex = record
-          cb : DWORD;
-          flags : DWORD;
-          codepage : UINT;
-          lpDefaultChar : LPCSTR;
-          lpUsedDefaultChar : LPBOOL;
-       end;
-     GETTEXTEX = _gettextex;
-     TGETTEXTEX = _gettextex;
-
-     EDITWORDBREAKPROCEX = function (pchText:pchar; cchText:LONG; bCharSet:BYTE; action:LONG):LONG;
-  { Defines for EM_SETTYPOGRAPHYOPTIONS  }
-
-  const
-     TO_ADVANCEDTYPOGRAPHY = 1;
-     TO_SIMPLELINEBREAK = 2;
-  { Defines for GETTEXTLENGTHEX  }
-     GTL_DEFAULT = 0;
-     GTL_USECRLF = 1;
-     GTL_PRECISE = 2;
-     GTL_CLOSE = 4;
-     GTL_NUMCHARS = 8;
-     GTL_NUMBYTES = 16;
-
-  type
-
-     _gettextlengthex = record
-          flags : DWORD;
-          codepage : UINT;
-       end;
-     GETTEXTLENGTHEX = _gettextlengthex;
-{$ifdef UNICODE}
-
-     CHARFORMAT = CHARFORMATW;
-     TCHARFORMAT = CHARFORMATW;
-     CHARFORMAT2 = CHARFORMAT2W;
-     TCHARFORMAT2 = CHARFORMAT2W;
-     FINDTEXT = FINDTEXTW;
-     TFINDTEXT = FINDTEXTW;
-     FINDTEXTEX = FINDTEXTEXW;
-     TFINDTEXTEX = FINDTEXTEXW;
-     TEXTRANGE = TEXTRANGEW;
-     TTEXTRANGE = TEXTRANGEW;
-{$else}
-
-  type
-
-     CHARFORMAT = CHARFORMATA;
-     TCHARFORMAT = CHARFORMATA;
-     CHARFORMAT2 = CHARFORMAT2A;
-     TCHARFORMAT2 = CHARFORMAT2A;
-     FINDTEXT = FINDTEXTA;
-     TFINDTEXT = FINDTEXTA;
-     FINDTEXTEX = FINDTEXTEXA;
-     TFINDTEXTEX = FINDTEXTEXA;
-     TEXTRANGE = TEXTRANGEA;
-     TTEXTRANGE = TEXTRANGEA;
-{$endif}
-
-implementation
-
-end.
+{ Converted by H2Pas from richedit.h }
+unit richedit;
+
+{$mode objfpc}
+{$calling stdcall}
+
+interface
+
+uses Messages, Windows;
+
+{$IFDEF FPC}
+{$PACKRECORDS C}
+{$ENDIF}
+
+{$ifdef UNICODE }
+  const
+     RICHEDIT_CLASS = 'RichEdit20W';
+{$else}
+  const
+     RICHEDIT_CLASS = 'RichEdit20A';
+{$endif}
+
+  const
+     RICHEDIT_CLASS10A = 'RICHEDIT';
+     CF_RTF = 'Rich Text Format';
+     CF_RTFNOOBJS = 'Rich Text Format Without Objects';
+     CF_RETEXTOBJ = 'RichEdit Text and Objects';
+     CFM_BOLD = 1;
+     CFM_ITALIC = 2;
+     CFM_UNDERLINE = 4;
+     CFM_STRIKEOUT = 8;
+     CFM_PROTECTED = 16;
+     CFM_LINK = 32;
+     CFM_SIZE = $80000000;
+     CFM_COLOR = $40000000;
+     CFM_FACE = $20000000;
+     CFM_OFFSET = $10000000;
+     CFM_CHARSET = $08000000;
+     CFM_SUBSCRIPT = $00030000;
+     CFM_SUPERSCRIPT = $00030000;
+     CFM_EFFECTS = (((((CFM_BOLD or CFM_ITALIC) or CFM_UNDERLINE) or CFM_COLOR) or CFM_STRIKEOUT) or CFE_PROTECTED) or CFM_LINK;
+     CFE_BOLD = 1;
+     CFE_ITALIC = 2;
+     CFE_UNDERLINE = 4;
+     CFE_STRIKEOUT = 8;
+     CFE_PROTECTED = 16;
+     CFE_AUTOCOLOR = $40000000;
+     CFE_SUBSCRIPT = $00010000;
+     CFE_SUPERSCRIPT = $00020000;
+     IMF_FORCENONE = 1;
+     IMF_FORCEENABLE = 2;
+     IMF_FORCEDISABLE = 4;
+     IMF_CLOSESTATUSWINDOW = 8;
+     IMF_VERTICAL = 32;
+     IMF_FORCEACTIVE = 64;
+     IMF_FORCEINACTIVE = 128;
+     IMF_FORCEREMEMBER = 256;
+     SEL_EMPTY = 0;
+     SEL_TEXT = 1;
+     SEL_OBJECT = 2;
+     SEL_MULTICHAR = 4;
+     SEL_MULTIOBJECT = 8;
+     MAX_TAB_STOPS = 32;
+     PFM_ALIGNMENT = 8;
+     PFM_NUMBERING = 32;
+     PFM_OFFSET = 4;
+     PFM_OFFSETINDENT = $80000000;
+     PFM_RIGHTINDENT = 2;
+     PFM_STARTINDENT = 1;
+     PFM_TABSTOPS = 16;
+     PFM_BORDER = 2048;
+     PFM_LINESPACING = 256;
+     PFM_NUMBERINGSTART = 32768;
+     PFM_NUMBERINGSTYLE = 8192;
+     PFM_NUMBERINGTAB = 16384;
+     PFM_SHADING = 4096;
+     PFM_SPACEAFTER = 128;
+     PFM_SPACEBEFORE = 64;
+     PFM_STYLE = 1024;
+     PFM_DONOTHYPHEN = 4194304;
+     PFM_KEEP = 131072;
+     PFM_KEEPNEXT = 262144;
+     PFM_NOLINENUMBER = 1048576;
+     PFM_NOWIDOWCONTROL = 2097152;
+     PFM_PAGEBREAKBEFORE = 524288;
+     PFM_RTLPARA = 65536;
+     PFM_SIDEBYSIDE = 8388608;
+     PFM_TABLE = 1073741824;
+     PFN_BULLET = 1;
+     PFE_DONOTHYPHEN = 64;
+     PFE_KEEP = 2;
+     PFE_KEEPNEXT = 4;
+     PFE_NOLINENUMBER = 16;
+     PFE_NOWIDOWCONTROL = 32;
+     PFE_PAGEBREAKBEFORE = 8;
+     PFE_RTLPARA = 1;
+     PFE_SIDEBYSIDE = 128;
+     PFE_TABLE = 16384;
+     PFA_LEFT = 1;
+     PFA_RIGHT = 2;
+     PFA_CENTER = 3;
+     PFA_JUSTIFY = 4;
+     PFA_FULL_INTERWORD = 4;
+     SF_TEXT = 1;
+     SF_RTF = 2;
+     SF_RTFNOOBJS = 3;
+     SF_TEXTIZED = 4;
+     SF_UNICODE = 16;
+     SF_USECODEPAGE = 32;
+     SF_NCRFORNONASCII = 64;
+     SF_RTFVAL = $0700;
+     SFF_PWD = $0800;
+     SFF_KEEPDOCINFO = $1000;
+     SFF_PERSISTVIEWSCALE = $2000;
+     SFF_PLAINRTF = $4000;
+     SFF_SELECTION = $8000;
+     WB_CLASSIFY = 3;
+     WB_MOVEWORDLEFT = 4;
+     WB_MOVEWORDRIGHT = 5;
+     WB_LEFTBREAK = 6;
+     WB_RIGHTBREAK = 7;
+     WB_MOVEWORDPREV = 4;
+     WB_MOVEWORDNEXT = 5;
+     WB_PREVBREAK = 6;
+     WB_NEXTBREAK = 7;
+     WBF_WORDWRAP = 16;
+     WBF_WORDBREAK = 32;
+     WBF_OVERFLOW = 64;
+     WBF_LEVEL1 = 128;
+     WBF_LEVEL2 = 256;
+     WBF_CUSTOM = 512;
+     ES_DISABLENOSCROLL = 8192;
+     ES_EX_NOCALLOLEINIT = 16777216;
+     ES_NOIME = 524288;
+     ES_NOOLEDRAGDROP = 8;
+     ES_SAVESEL = 32768;
+     ES_SELECTIONBAR = 16777216;
+     ES_SELFIME = 262144;
+     ES_SUNKEN = 16384;
+     ES_VERTICAL = 4194304;
+     EM_CANPASTE = WM_USER+50;
+     EM_DISPLAYBAND = WM_USER+51;
+     EM_EXGETSEL = WM_USER+52;
+     EM_EXLIMITTEXT = WM_USER+53;
+     EM_EXLINEFROMCHAR = WM_USER+54;
+     EM_EXSETSEL = WM_USER+55;
+     EM_FINDTEXT = WM_USER+56;
+     EM_FORMATRANGE = WM_USER+57;
+     EM_GETCHARFORMAT = WM_USER+58;
+     EM_GETEVENTMASK = WM_USER+59;
+     EM_GETOLEINTERFACE = WM_USER+60;
+     EM_GETPARAFORMAT = WM_USER+61;
+     EM_GETSELTEXT = WM_USER+62;
+     EM_HIDESELECTION = WM_USER+63;
+     EM_PASTESPECIAL = WM_USER+64;
+     EM_REQUESTRESIZE = WM_USER+65;
+     EM_SELECTIONTYPE = WM_USER+66;
+     EM_SETBKGNDCOLOR = WM_USER+67;
+     EM_SETCHARFORMAT = WM_USER+68;
+     EM_SETEVENTMASK = WM_USER+69;
+     EM_SETOLECALLBACK = WM_USER+70;
+     EM_SETPARAFORMAT = WM_USER+71;
+     EM_SETTARGETDEVICE = WM_USER+72;
+     EM_STREAMIN = WM_USER+73;
+     EM_STREAMOUT = WM_USER+74;
+     EM_GETTEXTRANGE = WM_USER+75;
+     EM_FINDWORDBREAK = WM_USER+76;
+     EM_SETOPTIONS = WM_USER+77;
+     EM_GETOPTIONS = WM_USER+78;
+     EM_FINDTEXTEX = WM_USER+79;
+     EM_GETWORDBREAKPROCEX = WM_USER+80;
+     EM_SETWORDBREAKPROCEX = WM_USER+81;
+  { RichEdit 2.0 messages  }
+     EM_SETUNDOLIMIT = WM_USER+82;
+     EM_REDO = WM_USER+84;
+     EM_CANREDO = WM_USER+85;
+     EM_GETUNDONAME = WM_USER+86;
+     EM_GETREDONAME = WM_USER+87;
+     EM_STOPGROUPTYPING = WM_USER+88;
+     EM_SETTEXTMODE = WM_USER+89;
+     EM_GETTEXTMODE = WM_USER+90;
+     EM_AUTOURLDETECT = WM_USER+91;
+     EM_GETAUTOURLDETECT = WM_USER+92;
+     EM_SETPALETTE = WM_USER+93;
+     EM_GETTEXTEX = WM_USER+94;
+     EM_GETTEXTLENGTHEX = WM_USER+95;
+     EM_SHOWSCROLLBAR = WM_USER+96;
+     EM_SETTEXTEX = WM_USER+97;
+     EM_SETPUNCTUATION = WM_USER+100;
+     EM_GETPUNCTUATION = WM_USER+101;
+     EM_SETWORDWRAPMODE = WM_USER+102;
+     EM_GETWORDWRAPMODE = WM_USER+103;
+     EM_SETIMECOLOR = WM_USER+104;
+     EM_GETIMECOLOR = WM_USER+105;
+     EM_SETIMEOPTIONS = WM_USER+106;
+     EM_GETIMEOPTIONS = WM_USER+107;
+     EM_SETLANGOPTIONS = WM_USER+120;
+     EM_GETLANGOPTIONS = WM_USER+121;
+     EM_GETIMECOMPMODE = WM_USER+122;
+     EM_FINDTEXTW = WM_USER+123;
+     EM_FINDTEXTEXW = WM_USER+124;
+     EM_RECONVERSION = WM_USER+125;
+     EM_SETBIDIOPTIONS = WM_USER+200;
+     EM_GETBIDIOPTIONS = WM_USER+201;
+     EM_SETTYPOGRAPHYOPTIONS = WM_USER+202;
+     EM_GETTYPOGRAPHYOPTIONS = WM_USER+203;
+     EM_SETEDITSTYLE = WM_USER+204;
+     EM_GETEDITSTYLE = WM_USER+205;
+     EM_GETSCROLLPOS = WM_USER+221;
+     EM_SETSCROLLPOS = WM_USER+222;
+     EM_SETFONTSIZE = WM_USER+223;
+     EM_GETZOOM = WM_USER+224;
+     EM_SETZOOM = WM_USER+225;
+     EN_CORRECTTEXT = 1797;
+     EN_DROPFILES = 1795;
+     EN_IMECHANGE = 1799;
+     EN_LINK = 1803;
+     EN_MSGFILTER = 1792;
+     EN_OLEOPFAILED = 1801;
+     EN_PROTECTED = 1796;
+     EN_REQUESTRESIZE = 1793;
+     EN_SAVECLIPBOARD = 1800;
+     EN_SELCHANGE = 1794;
+     EN_STOPNOUNDO = 1798;
+     ENM_NONE = 0;
+     ENM_CHANGE = 1;
+     ENM_CORRECTTEXT = 4194304;
+     ENM_DRAGDROPDONE = 16;
+     ENM_DROPFILES = 1048576;
+     ENM_IMECHANGE = 8388608;
+     ENM_KEYEVENTS = 65536;
+     ENM_LANGCHANGE = 16777216;
+     ENM_LINK = 67108864;
+     ENM_MOUSEEVENTS = 131072;
+     ENM_OBJECTPOSITIONS = 33554432;
+     ENM_PROTECTED = 2097152;
+     ENM_REQUESTRESIZE = 262144;
+     ENM_SCROLL = 4;
+     ENM_SCROLLEVENTS = 8;
+     ENM_SELCHANGE = 524288;
+     ENM_UPDATE = 2;
+     ECO_AUTOWORDSELECTION = 1;
+     ECO_AUTOVSCROLL = 64;
+     ECO_AUTOHSCROLL = 128;
+     ECO_NOHIDESEL = 256;
+     ECO_READONLY = 2048;
+     ECO_WANTRETURN = 4096;
+     ECO_SAVESEL = $8000;
+     ECO_SELECTIONBAR = $1000000;
+     ECO_VERTICAL = $400000;
+     ECOOP_SET = 1;
+     ECOOP_OR = 2;
+     ECOOP_AND = 3;
+     ECOOP_XOR = 4;
+     SCF_DEFAULT = 0;
+     SCF_SELECTION = 1;
+     SCF_WORD = 2;
+     SCF_ALL = 4;
+     SCF_USEUIRULES = 8;
+     TM_PLAINTEXT = 1;
+     TM_RICHTEXT = 2;
+     TM_SINGLELEVELUNDO = 4;
+     TM_MULTILEVELUNDO = 8;
+     TM_SINGLECODEPAGE = 16;
+     TM_MULTICODEPAGE = 32;
+     GT_DEFAULT = 0;
+     GT_USECRLF = 1;
+     yHeightCharPtsMost = 1638;
+     lDefaultTab = 720;
+     FT_MATCHCASE = 4;
+     FT_WHOLEWORD = 2;
+
+  type
+
+     _charformat = record
+          cbSize : UINT;
+          dwMask : DWORD;
+          dwEffects : DWORD;
+          yHeight : LONG;
+          yOffset : LONG;
+          crTextColor : COLORREF;
+          bCharSet : BYTE;
+          bPitchAndFamily : BYTE;
+          szFaceName : array[0..(LF_FACESIZE)-1] of char;
+       end;
+     CHARFORMATA = _charformat;
+     TCHARFORMATA = _charformat;
+
+     _charformatw = record
+          cbSize : UINT;
+          dwMask : DWORD;
+          dwEffects : DWORD;
+          yHeight : LONG;
+          yOffset : LONG;
+          crTextColor : COLORREF;
+          bCharSet : BYTE;
+          bPitchAndFamily : BYTE;
+          szFaceName : array[0..(LF_FACESIZE)-1] of WCHAR;
+       end;
+     CHARFORMATW = _charformatw;
+     TCHARFORMATW = _charformatw;
+
+     _charformat2a = record
+          cbSize : UINT;
+          dwMask : DWORD;
+          dwEffects : DWORD;
+          yHeight : LONG;
+          yOffset : LONG;
+          crTextColor : COLORREF;
+          bCharSet : BYTE;
+          bPitchAndFamily : BYTE;
+          szFaceName : array[0..(LF_FACESIZE)-1] of char;
+          wWeight : WORD;
+          sSpacing : SHORT;
+          crBackColor : COLORREF;
+          lcid : LCID;
+          dwReserved : DWORD;
+          sStyle : SHORT;
+          wKerning : WORD;
+          bUnderlineType : BYTE;
+          bAnimation : BYTE;
+          bRevAuthor : BYTE;
+       end;
+     CHARFORMAT2A = _charformat2a;
+     TCHARFORMAT2A = _charformat2a;
+
+     _charformat2w = record
+          cbSize : UINT;
+          dwMask : DWORD;
+          dwEffects : DWORD;
+          yHeight : LONG;
+          yOffset : LONG;
+          crTextColor : COLORREF;
+          bCharSet : BYTE;
+          bPitchAndFamily : BYTE;
+          szFaceName : array[0..(LF_FACESIZE)-1] of WCHAR;
+          wWeight : WORD;
+          sSpacing : SHORT;
+          crBackColor : COLORREF;
+          lcid : LCID;
+          dwReserved : DWORD;
+          sStyle : SHORT;
+          wKerning : WORD;
+          bUnderlineType : BYTE;
+          bAnimation : BYTE;
+          bRevAuthor : BYTE;
+       end;
+     CHARFORMAT2W = _charformat2w;
+     TCHARFORMAT2W = _charformat2w;
+
+     _charrange = record
+          cpMin : LONG;
+          cpMax : LONG;
+       end;
+     CHARRANGE = _charrange;
+     TCHARRANGE = _charrange;
+
+     _compcolor = record
+          crText : COLORREF;
+          crBackground : COLORREF;
+          dwEffects : DWORD;
+       end;
+     COMPCOLOR = _compcolor;
+     TCOMPCOLOR = _compcolor;
+
+     EDITSTREAMCALLBACK = function (dwCookie:PDWORD; pbBuff:LPBYTE; cb:LONG; var pcb:LONG):DWORD;
+
+     _editstream = record
+          dwCookie : DWORD;
+          dwError : DWORD;
+          pfnCallback : EDITSTREAMCALLBACK;
+       end;
+     EDITSTREAM = _editstream;
+     TEDITSTREAM = _editstream;
+
+     _encorrecttext = record
+          nmhdr : NMHDR;
+          chrg : CHARRANGE;
+          seltyp : WORD;
+       end;
+     ENCORRECTTEXT = _encorrecttext;
+     TENCORRECTTEXT = _encorrecttext;
+
+     _endropfiles = record
+          nmhdr : NMHDR;
+          hDrop : HANDLE;
+          cp : LONG;
+          fProtected : BOOL;
+       end;
+     ENDROPFILES = _endropfiles;
+     TENDROPFILES = _endropfiles;
+
+     _enlink = record
+          nmhdr : NMHDR;
+          msg : UINT;
+          wParam : WPARAM;
+          lParam : LPARAM;
+          chrg : CHARRANGE;
+       end;
+     ENLINK = _enlink;
+     TENLINK = _enlink;
+
+     ENOLEOPFAILED = record
+          nmhdr : NMHDR;
+          iob : LONG;
+          lOper : LONG;
+          hr : HRESULT;
+       end;
+
+     _enprotected = record
+          nmhdr : NMHDR;
+          msg : UINT;
+          wParam : WPARAM;
+          lParam : LPARAM;
+          chrg : CHARRANGE;
+       end;
+     ENPROTECTED = _enprotected;
+     TENPROTECTED = _enprotected;
+     LPENPROTECTED = ^_enprotected;
+
+     _ensaveclipboard = record
+          nmhdr : NMHDR;
+          cObjectCount : LONG;
+          cch : LONG;
+       end;
+     ENSAVECLIPBOARD = _ensaveclipboard;
+     TENSAVECLIPBOARD = _ensaveclipboard;
+
+     _findtextA = record
+          chrg : CHARRANGE;
+          lpstrText : LPSTR;
+       end;
+     FINDTEXTA = _findtextA;
+     TFINDTEXTA = _findtextA;
+
+     _findtextW = record
+          chrg : CHARRANGE;
+          lpstrText : LPWSTR;
+       end;
+     FINDTEXTW = _findtextW;
+     TFINDTEXTW = _findtextW;
+
+     _findtextexA = record
+          chrg : CHARRANGE;
+          lpstrText : LPSTR;
+          chrgText : CHARRANGE;
+       end;
+     FINDTEXTEXA = _findtextexA;
+     TFINDTEXTEXA = _findtextexA;
+
+     _findtextexW = record
+          chrg : CHARRANGE;
+          lpstrText : LPWSTR;
+          chrgText : CHARRANGE;
+       end;
+     FINDTEXTEXW = _findtextexW;
+     TFINDTEXTEXW = _findtextexW;
+
+     _formatrange = record
+          hdc : HDC;
+          hdcTarget : HDC;
+          rc : RECT;
+          rcPage : RECT;
+          chrg : CHARRANGE;
+       end;
+     FORMATRANGE = _formatrange;
+     TFORMATRANGE = _formatrange;
+
+     _msgfilter = record
+          nmhdr : NMHDR;
+          msg : UINT;
+          wParam : WPARAM;
+          lParam : LPARAM;
+       end;
+     MSGFILTER = _msgfilter;
+     TMSGFILTER = _msgfilter;
+
+     TReqSize = record
+       nmhdr: TNMHdr;
+       rc: TRect;
+     end;
+     PReqSize = ^TReqSize;
+
+     _paraformat = record
+          cbSize : UINT;
+          dwMask : DWORD;
+          wNumbering : WORD;
+          wReserved : WORD;
+          dxStartIndent : LONG;
+          dxRightIndent : LONG;
+          dxOffset : LONG;
+          wAlignment : WORD;
+          cTabCount : SHORT;
+          rgxTabs : array[0..(MAX_TAB_STOPS)-1] of LONG;
+       end;
+     PARAFORMAT = _paraformat;
+     TParaFormat = _paraformat;
+
+     _paraformat2 = record
+          cbSize : UINT;
+          dwMask : DWORD;
+          wNumbering : WORD;
+          wEffects : WORD;
+          dxStartIndent : LONG;
+          dxRightIndent : LONG;
+          dxOffset : LONG;
+          wAlignment : WORD;
+          cTabCount : SHORT;
+          rgxTabs : array[0..(MAX_TAB_STOPS)-1] of LONG;
+          dySpaceBefore : LONG;
+          dySpaceAfter : LONG;
+          dyLineSpacing : LONG;
+          sStype : SHORT;
+          bLineSpacingRule : BYTE;
+          bOutlineLevel : BYTE;
+          wShadingWeight : WORD;
+          wShadingStyle : WORD;
+          wNumberingStart : WORD;
+          wNumberingStyle : WORD;
+          wNumberingTab : WORD;
+          wBorderSpace : WORD;
+          wBorderWidth : WORD;
+          wBorders : WORD;
+       end;
+     PARAFORMAT2 = _paraformat2;
+     TPARAFORMAT2 = _paraformat2;
+
+     _selchange = record
+          nmhdr : NMHDR;
+          chrg : CHARRANGE;
+          seltyp : WORD;
+       end;
+     SELCHANGE = _selchange;
+     TSELCHANGE = _selchange;
+
+     _textrange = record
+          chrg : CHARRANGE;
+          lpstrText : LPSTR;
+       end;
+     TEXTRANGEA = _textrange;
+     TTEXTRANGEA = _textrange;
+
+     _textrangew = record
+          chrg : CHARRANGE;
+          lpstrText : LPWSTR;
+       end;
+     TEXTRANGEW = _textrangew;
+     TTEXTRANGEW = _textrangew;
+
+     _reqresize = record
+          nmhdr : NMHDR;
+          rc : RECT;
+       end;
+     REQRESIZE = _reqresize;
+     TREQRESIZE = _reqresize;
+
+     _repastespecial = record
+          dwAspect : DWORD;
+          dwParam : DWORD;
+       end;
+     REPASTESPECIAL = _repastespecial;
+     TREPASTESPECIAL = _repastespecial;
+
+     _punctuation = record
+          iSize : UINT;
+          szPunctuation : LPSTR;
+       end;
+     PUNCTUATION = _punctuation;
+     TPUNCTUATION = _punctuation;
+
+     _gettextex = record
+          cb : DWORD;
+          flags : DWORD;
+          codepage : UINT;
+          lpDefaultChar : LPCSTR;
+          lpUsedDefaultChar : LPBOOL;
+       end;
+     GETTEXTEX = _gettextex;
+     TGETTEXTEX = _gettextex;
+
+     EDITWORDBREAKPROCEX = function (pchText:pchar; cchText:LONG; bCharSet:BYTE; action:LONG):LONG;
+  { Defines for EM_SETTYPOGRAPHYOPTIONS  }
+
+  const
+     TO_ADVANCEDTYPOGRAPHY = 1;
+     TO_SIMPLELINEBREAK = 2;
+  { Defines for GETTEXTLENGTHEX  }
+     GTL_DEFAULT = 0;
+     GTL_USECRLF = 1;
+     GTL_PRECISE = 2;
+     GTL_CLOSE = 4;
+     GTL_NUMCHARS = 8;
+     GTL_NUMBYTES = 16;
+
+  type
+
+     _gettextlengthex = record
+          flags : DWORD;
+          codepage : UINT;
+       end;
+     GETTEXTLENGTHEX = _gettextlengthex;
+{$ifdef UNICODE}
+
+     CHARFORMAT = CHARFORMATW;
+     TCHARFORMAT = CHARFORMATW;
+     CHARFORMAT2 = CHARFORMAT2W;
+     TCHARFORMAT2 = CHARFORMAT2W;
+     FINDTEXT = FINDTEXTW;
+     TFINDTEXT = FINDTEXTW;
+     FINDTEXTEX = FINDTEXTEXW;
+     TFINDTEXTEX = FINDTEXTEXW;
+     TEXTRANGE = TEXTRANGEW;
+     TTEXTRANGE = TEXTRANGEW;
+{$else}
+
+  type
+
+     CHARFORMAT = CHARFORMATA;
+     TCHARFORMAT = CHARFORMATA;
+     CHARFORMAT2 = CHARFORMAT2A;
+     TCHARFORMAT2 = CHARFORMAT2A;
+     FINDTEXT = FINDTEXTA;
+     TFINDTEXT = FINDTEXTA;
+     FINDTEXTEX = FINDTEXTEXA;
+     TFINDTEXTEX = FINDTEXTEXA;
+     TEXTRANGE = TEXTRANGEA;
+     TTEXTRANGE = TEXTRANGEA;
+{$endif}
+
+implementation
+
+end.

packages/base/winunits/examples/OOTest.pp → packages/winunits-base/tests/OOTest.pp

@@ -63,21 +63,21 @@ begin
     writeln('done.')
   else
     error;
-{  
+{  
   try
     writeln('Inserting Table ...');
     Sample.InsertTable(Edit2.Text, Edit1.Text);
     writeln('Ready');
-  except
+  except
     Error;
   end;
 }   
   write('Disconnection from StarOffice ... ');
   Sample.Disconnect();
-  writeln('done.');
+  writeln('done.');
   writeln('Finished');
 end.
-
+
 {
 end;
 

packages/base/winunits/Makefile.fpc → packages/winunits-jedi/Makefile.fpc

@@ -3,13 +3,16 @@
 #
 
 [package]
-name=winunits
-version=2.2.1
+name=winunits-jedi
+version=2.2.0
+
+[require]
+packages_win32=winunits-base
+packages_win64=winunits-base
 
 [target]
 units=buildjwa
-implicitunits=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver \
- jwawintype jwawinbase jwawinnt \
+implicitunits= jwawintype jwawinbase jwawinnt \
  jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz  \
  jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname \
  jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde \
@@ -45,23 +48,26 @@ implicitunits=flatsb winver mmsystem comobj comconst commctrl ole2 activex shell
  jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes \
  jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip \
  jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts \
- jwaadstlb jwanative shfolder richedit jwawindows jwacarderr jwaactivex \
+ jwaadstlb jwanative jwawindows jwacarderr jwaactivex \
  jwawindllnames jwawinternl jwawinsta jwavista
 
 
 examples=examples
 
-rsts = jwawintype comconst
+rsts = jwawintype 
 
 [install]
 buildunit=buildjwa
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../..
 
 [compiler]
 options=-Ur
+sourcedir=src
+includedir=src
+unitdir=units
 
 [rules]
 .NOTPARALLEL:

packages/winunits-jedi/fpmake.pp

@@ -0,0 +1,17 @@
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T : TTarget;
+
+begin
+  With Installer do 
+    begin
+    { Base packages }
+    {$i fpmake.inc}
+    Run;
+    end;
+end.
+

packages/base/winunits/buildjwa.pp → packages/winunits-jedi/src/buildjwa.pp

@@ -21,8 +21,7 @@ unit buildjwa;
 interface
 
 uses
-    flatsb, winver, mmsystem, comconst, commctrl, comobj, ole2, activex, shellapi, shlobj, oleserver,
-    jwawintype, jwawinbase, jwawinnt, shfolder, richedit,
+    jwawintype, jwawinbase, jwawinnt, 
     jwalmerr, jwalmmsg, jwaaclui, jwaadsdb, jwalmerrlog, jwalmjoin, jwaauthz,
     jwabits, jwalmremutl, jwalmrepl, jwalmserver, jwalmshare, jwalmsname,
     jwalmstats, jwaaccctrl, jwaaclapi, jwacderr, jwacpl, jwaactiveds, jwadbt, jwadde,
@@ -58,7 +57,7 @@ uses
     jwawpcrsmsg, jwawpftpmsg, jwawppstmsg, jwawpspihlp, jwawptypes,
     jwawpwizmsg, jwaws2atm, jwaws2bth, jwaws2dnet, jwaws2spi, jwaws2tcpip,
     jwawshisotp, jwawsnetbs, jwawsnwlink, jwawtsapi32, jwazmouse, jwasensevts,
-    jwaadstlb, jwanative, jwawindows, jwacarderr,jwawinsta, jwavista;
+    jwaadstlb, jwanative, jwawindows, jwacarderr,jwawinsta, jwavista,jwawinternl;
 
 implementation
 

packages/winunits-jedi/src/jwahtmlguid.pas

@@ -0,0 +1,109 @@
+{******************************************************************************}
+{                                                                              }
+{ GUID Definitions for HTML Viewer object API interface Unit for Object Pascal }
+{                                                                              }
+{ Portions created by Microsoft are Copyright (C) 1995-2001 Microsoft          }
+{ Corporation. All Rights Reserved.                                            }
+{                                                                              }
+{ The original file is: htmlguid.h, released November 2002. The original Pascal}
+{ code is: HtmlGuid.pas, released March 2002. The initial developer of the     }
+{ Pascal code is Marcel van Brakel (brakelm att chello dott nl).               }
+{                                                                              }
+{ Portions created by Marcel van Brakel are Copyright (C) 1999-2001            }
+{ Marcel van Brakel. All Rights Reserved.                                      }
+{                                                                              }
+{ Obtained through: Joint Endeavour of Delphi Innovators (Project JEDI)        }
+{                                                                              }
+{ You may retrieve the latest version of this file at the Project JEDI         }
+{ APILIB home page, located at http://jedi-apilib.sourceforge.net              }
+{                                                                              }
+{ The contents of this file are used with permission, subject to the Mozilla   }
+{ Public License Version 1.1 (the "License"); you may not use this file except }
+{ in compliance with the License. You may obtain a copy of the License at      }
+{ http://www.mozilla.org/MPL/MPL-1.1.html                                      }
+{                                                                              }
+{ Software distributed under the License is distributed on an "AS IS" basis,   }
+{ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for }
+{ the specific language governing rights and limitations under the License.    }
+{                                                                              }
+{ Alternatively, the contents of this file may be used under the terms of the  }
+{ GNU Lesser General Public License (the  "LGPL License"), in which case the   }
+{ provisions of the LGPL License are applicable instead of those above.        }
+{ If you wish to allow use of your version of this file only under the terms   }
+{ of the LGPL License and not to allow others to use your version of this file }
+{ under the MPL, indicate your decision by deleting  the provisions above and  }
+{ replace  them with the notice and other provisions required by the LGPL      }
+{ License.  If you do not delete the provisions above, a recipient may use     }
+{ your version of this file under either the MPL or the LGPL License.          }
+{                                                                              }
+{ For more information about the LGPL: http://www.gnu.org/copyleft/lesser.html }
+{                                                                              }
+{******************************************************************************}
+
+// $Id: JwaHtmlGuid.pas,v 1.6 2007/09/05 11:58:49 dezipaitor Exp $
+{$IFNDEF JWA_OMIT_SECTIONS}
+unit JwaHtmlGuid;
+
+{$WEAKPACKAGEUNIT}
+{$ENDIF JWA_OMIT_SECTIONS}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "htmlguid.h"'}
+{$HPPEMIT ''}
+
+{$IFNDEF JWA_OMIT_SECTIONS}
+{$I jediapilib.inc}
+
+interface
+{$ENDIF JWA_OMIT_SECTIONS}
+
+{$IFNDEF JWA_IMPLEMENTATIONSECTION}
+
+const
+// GUID for HTML viewer is: {25336920-03F9-11cf-8FD0-00AA00686F13}
+  CLSID_HTMLViewer: TGUID = (D1:$25336920; D2:$3f9; D3:$11cf; D4:($8f, $d0, $0, $aa, $0, $68, $6f, $13));
+  {$EXTERNALSYM CLSID_HTMLViewer}
+
+// GUID for BSCB proxy is: {25336922-03F9-11cf-8FD0-00AA00686F13}
+  CLSID_HTMLBSCBProxy: TGUID = (D1:$25336922; D2:$3f9; D3:$11cf; D4:($8f, $d0, $0, $aa, $0, $68, $6f, $13));
+  {$EXTERNALSYM CLSID_HTMLBSCBProxy}
+
+// The GUID used to identify the TypeLib of the HTML Page
+// {71BC8840-60BB-11cf-8B97-00AA00476DA6}
+  GUID_PageTL: TGUID = (D1:$71bc8840; D2:$60bb; D3:$11cf; D4:($8b, $97, $0, $aa, $0, $47, $6d, $a6));
+  {$EXTERNALSYM GUID_PageTL}
+
+// The GUID used to identify the Primary dispinterface of the HTML Page
+// {71BC8841-60BB-11cf-8B97-00AA00476DA6}
+  IID_PageProps: TGUID = (D1:$71bc8841; D2:$60bb; D3:$11cf; D4:($8b, $97, $0, $aa, $0, $47, $6d, $a6));
+  {$EXTERNALSYM IID_PageProps}
+
+// The GUID used to identify the Event dispinterface of the HTML Page
+// The page events are currently commented out but will be added later
+// so I grabbed a guid for the events now.
+// {71BC8842-60BB-11cf-8B97-00AA00476DA6}
+  IID_PageEvents: TGUID = (D1:$71bc8842; D2:$60bb; D3:$11cf; D4:($8b, $97, $0, $aa, $0, $47, $6d, $a6));
+  {$EXTERNALSYM IID_PageEvents}
+
+// The GUID used to identify the coclass of the HTML Page
+// {71BC8843-60BB-11cf-8B97-00AA00476DA6}
+  CLSID_Page: TGUID = (D1:$71bc8843; D2:$60bb; D3:$11cf; D4:($8b, $97, $0, $aa, $0, $47, $6d, $a6));
+  {$EXTERNALSYM CLSID_Page}
+
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+
+
+{$IFNDEF JWA_OMIT_SECTIONS}
+implementation
+//uses ...
+{$ENDIF JWA_OMIT_SECTIONS}
+
+{$IFNDEF JWA_INTERFACESECTION}
+//your implementation here
+{$ENDIF JWA_INTERFACESECTION}
+
+
+{$IFNDEF JWA_OMIT_SECTIONS}
+end.
+{$ENDIF JWA_OMIT_SECTIONS}