From 2fe958e87ac5816d77ca12c5c7eacc92df1300bb Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 26 Jan 2008 22:58:46 +0000 Subject: [PATCH] * fpgtk first pass git-svn-id: trunk@9994 - --- .gitattributes | 46 +- .gitignore | 56 +- packages/extra/fpgtk/fpmake.pp | 17 - packages/{extra => }/fpgtk/Makefile | 633 ++++++++++++------ packages/{extra => }/fpgtk/Makefile.fpc | 8 +- packages/fpgtk/fpmake.pp | 49 ++ .../fpgtk => fpgtk/src}/def/objectdef.pp | 0 .../{extra/fpgtk => fpgtk/src}/demo/Makefile | 0 .../fpgtk => fpgtk/src}/demo/Makefile.fpc | 0 .../{extra/fpgtk => fpgtk/src}/demo/lister.pp | 0 .../fpgtk => fpgtk/src}/demo/testgtk.pp | 0 .../fpgtk => fpgtk/src}/demo/testgtk.ppr | 0 .../fpgtk => fpgtk/src}/editor/buttonrow.pp | 0 .../fpgtk => fpgtk/src}/editor/finddlgs.pp | 0 .../fpgtk => fpgtk/src}/editor/gtkdef.pp | 0 .../fpgtk => fpgtk/src}/editor/gtkdeftexts.pp | 0 .../fpgtk => fpgtk/src}/editor/gtkeditor.pp | 0 .../fpgtk => fpgtk/src}/editor/progwin.pp | 0 .../fpgtk => fpgtk/src}/editor/settingsrec.pp | 0 .../{extra/fpgtk => fpgtk/src}/editor/xpms.pp | 0 packages/{extra/fpgtk => fpgtk/src}/fpglib.pp | 0 packages/{extra/fpgtk => fpgtk/src}/fpgtk.def | 0 packages/{extra/fpgtk => fpgtk/src}/fpgtk.pp | 0 .../{extra/fpgtk => fpgtk/src}/fpgtkext.pp | 0 .../{extra/fpgtk => fpgtk/src}/pgtk/pgtk.pp | 0 .../{extra/fpgtk => fpgtk/src}/pgtk/pgtk.ppr | 0 26 files changed, 533 insertions(+), 276 deletions(-) delete mode 100644 packages/extra/fpgtk/fpmake.pp rename packages/{extra => }/fpgtk/Makefile (79%) rename packages/{extra => }/fpgtk/Makefile.fpc (63%) create mode 100644 packages/fpgtk/fpmake.pp rename packages/{extra/fpgtk => fpgtk/src}/def/objectdef.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/demo/Makefile (100%) rename packages/{extra/fpgtk => fpgtk/src}/demo/Makefile.fpc (100%) rename packages/{extra/fpgtk => fpgtk/src}/demo/lister.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/demo/testgtk.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/demo/testgtk.ppr (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/buttonrow.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/finddlgs.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/gtkdef.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/gtkdeftexts.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/gtkeditor.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/progwin.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/settingsrec.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/editor/xpms.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/fpglib.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/fpgtk.def (100%) rename packages/{extra/fpgtk => fpgtk/src}/fpgtk.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/fpgtkext.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/pgtk/pgtk.pp (100%) rename packages/{extra/fpgtk => fpgtk/src}/pgtk/pgtk.ppr (100%) diff --git a/.gitattributes b/.gitattributes index f49e7dec32..8f2b57da21 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1164,30 +1164,7 @@ packages/extra/forms/fd2pascal.pp svneol=native#text/plain packages/extra/forms/fpmake.inc svneol=native#text/plain packages/extra/forms/fpmake.pp svneol=native#text/plain packages/extra/forms/xforms.pp svneol=native#text/plain -packages/extra/fpgtk/Makefile svneol=native#text/plain -packages/extra/fpgtk/Makefile.fpc svneol=native#text/plain -packages/extra/fpgtk/def/objectdef.pp svneol=native#text/plain -packages/extra/fpgtk/demo/Makefile svneol=native#text/plain -packages/extra/fpgtk/demo/Makefile.fpc svneol=native#text/plain -packages/extra/fpgtk/demo/lister.pp svneol=native#text/plain -packages/extra/fpgtk/demo/testgtk.pp svneol=native#text/plain -packages/extra/fpgtk/demo/testgtk.ppr -text -packages/extra/fpgtk/editor/buttonrow.pp svneol=native#text/plain -packages/extra/fpgtk/editor/finddlgs.pp svneol=native#text/plain -packages/extra/fpgtk/editor/gtkdef.pp svneol=native#text/plain -packages/extra/fpgtk/editor/gtkdeftexts.pp svneol=native#text/plain -packages/extra/fpgtk/editor/gtkeditor.pp svneol=native#text/plain -packages/extra/fpgtk/editor/progwin.pp svneol=native#text/plain -packages/extra/fpgtk/editor/settingsrec.pp svneol=native#text/plain -packages/extra/fpgtk/editor/xpms.pp svneol=native#text/plain -packages/extra/fpgtk/fpglib.pp svneol=native#text/plain -packages/extra/fpgtk/fpgtk.def -text -packages/extra/fpgtk/fpgtk.pp svneol=native#text/plain -packages/extra/fpgtk/fpgtkext.pp svneol=native#text/plain packages/extra/fpgtk/fpmake.inc svneol=native#text/plain -packages/extra/fpgtk/fpmake.pp svneol=native#text/plain -packages/extra/fpgtk/pgtk/pgtk.pp svneol=native#text/plain -packages/extra/fpgtk/pgtk/pgtk.ppr -text packages/extra/gbaunits/Makefile -text packages/extra/gbaunits/Makefile.fpc -text packages/extra/gbaunits/bios_asm.as -text @@ -3089,6 +3066,29 @@ packages/fcl-xml/src/xpath.pp svneol=native#text/plain packages/fcl-xml/tests/README svneol=native#text/plain packages/fcl-xml/tests/template.xml svneol=native#text/plain packages/fcl-xml/tests/xmlts.pp svneol=native#text/plain +packages/fpgtk/Makefile svneol=native#text/plain +packages/fpgtk/Makefile.fpc svneol=native#text/plain +packages/fpgtk/fpmake.pp svneol=native#text/plain +packages/fpgtk/src/def/objectdef.pp svneol=native#text/plain +packages/fpgtk/src/demo/Makefile svneol=native#text/plain +packages/fpgtk/src/demo/Makefile.fpc svneol=native#text/plain +packages/fpgtk/src/demo/lister.pp svneol=native#text/plain +packages/fpgtk/src/demo/testgtk.pp svneol=native#text/plain +packages/fpgtk/src/demo/testgtk.ppr -text +packages/fpgtk/src/editor/buttonrow.pp svneol=native#text/plain +packages/fpgtk/src/editor/finddlgs.pp svneol=native#text/plain +packages/fpgtk/src/editor/gtkdef.pp svneol=native#text/plain +packages/fpgtk/src/editor/gtkdeftexts.pp svneol=native#text/plain +packages/fpgtk/src/editor/gtkeditor.pp svneol=native#text/plain +packages/fpgtk/src/editor/progwin.pp svneol=native#text/plain +packages/fpgtk/src/editor/settingsrec.pp svneol=native#text/plain +packages/fpgtk/src/editor/xpms.pp svneol=native#text/plain +packages/fpgtk/src/fpglib.pp svneol=native#text/plain +packages/fpgtk/src/fpgtk.def svneol=native#text/plain +packages/fpgtk/src/fpgtk.pp svneol=native#text/plain +packages/fpgtk/src/fpgtkext.pp svneol=native#text/plain +packages/fpgtk/src/pgtk/pgtk.pp svneol=native#text/plain +packages/fpgtk/src/pgtk/pgtk.ppr -text packages/fpmake.pp svneol=native#text/plain packages/fpmkunit/Makefile svneol=native#text/plain packages/fpmkunit/Makefile.fpc svneol=native#text/plain diff --git a/.gitignore b/.gitignore index a8540f507b..50032d85e2 100644 --- a/.gitignore +++ b/.gitignore @@ -627,35 +627,7 @@ packages/extra/fpgtk/*.exe packages/extra/fpgtk/*.o packages/extra/fpgtk/*.ppu packages/extra/fpgtk/*.s -packages/extra/fpgtk/def/*.bak -packages/extra/fpgtk/def/*.exe -packages/extra/fpgtk/def/*.o -packages/extra/fpgtk/def/*.ppu -packages/extra/fpgtk/def/*.s -packages/extra/fpgtk/def/fpcmade.* -packages/extra/fpgtk/def/units -packages/extra/fpgtk/demo/*.bak -packages/extra/fpgtk/demo/*.exe -packages/extra/fpgtk/demo/*.o -packages/extra/fpgtk/demo/*.ppu -packages/extra/fpgtk/demo/*.s -packages/extra/fpgtk/demo/fpcmade.* -packages/extra/fpgtk/demo/units -packages/extra/fpgtk/editor/*.bak -packages/extra/fpgtk/editor/*.exe -packages/extra/fpgtk/editor/*.o -packages/extra/fpgtk/editor/*.ppu -packages/extra/fpgtk/editor/*.s -packages/extra/fpgtk/editor/fpcmade.* -packages/extra/fpgtk/editor/units packages/extra/fpgtk/fpcmade.* -packages/extra/fpgtk/pgtk/*.bak -packages/extra/fpgtk/pgtk/*.exe -packages/extra/fpgtk/pgtk/*.o -packages/extra/fpgtk/pgtk/*.ppu -packages/extra/fpgtk/pgtk/*.s -packages/extra/fpgtk/pgtk/fpcmade.* -packages/extra/fpgtk/pgtk/units packages/extra/fpgtk/units packages/extra/gbaunits/*.bat packages/extra/ggi/*.bak @@ -1153,6 +1125,34 @@ packages/fcl-xml/src/*.s packages/fcl-xml/src/fpcmade.* packages/fcl-xml/src/units packages/fpcmade.* +packages/fpgtk/src/def/*.bak +packages/fpgtk/src/def/*.exe +packages/fpgtk/src/def/*.o +packages/fpgtk/src/def/*.ppu +packages/fpgtk/src/def/*.s +packages/fpgtk/src/def/fpcmade.* +packages/fpgtk/src/def/units +packages/fpgtk/src/demo/*.bak +packages/fpgtk/src/demo/*.exe +packages/fpgtk/src/demo/*.o +packages/fpgtk/src/demo/*.ppu +packages/fpgtk/src/demo/*.s +packages/fpgtk/src/demo/fpcmade.* +packages/fpgtk/src/demo/units +packages/fpgtk/src/editor/*.bak +packages/fpgtk/src/editor/*.exe +packages/fpgtk/src/editor/*.o +packages/fpgtk/src/editor/*.ppu +packages/fpgtk/src/editor/*.s +packages/fpgtk/src/editor/fpcmade.* +packages/fpgtk/src/editor/units +packages/fpgtk/src/pgtk/*.bak +packages/fpgtk/src/pgtk/*.exe +packages/fpgtk/src/pgtk/*.o +packages/fpgtk/src/pgtk/*.ppu +packages/fpgtk/src/pgtk/*.s +packages/fpgtk/src/pgtk/fpcmade.* +packages/fpgtk/src/pgtk/units packages/gtk1/examples/*.bak packages/gtk1/examples/*.exe packages/gtk1/examples/*.o diff --git a/packages/extra/fpgtk/fpmake.pp b/packages/extra/fpgtk/fpmake.pp deleted file mode 100644 index d4b6178682..0000000000 --- a/packages/extra/fpgtk/fpmake.pp +++ /dev/null @@ -1,17 +0,0 @@ -{$mode objfpc}{$H+} -program fpmake; - -uses fpmkunit; - -Var - T : TTarget; - -begin - With Installer do - begin - { Base packages } - {$i fpmake.inc} - Run; - end; -end. - diff --git a/packages/extra/fpgtk/Makefile b/packages/fpgtk/Makefile similarity index 79% rename from packages/extra/fpgtk/Makefile rename to packages/fpgtk/Makefile index ae87bf2959..43b43d5e98 100644 --- a/packages/extra/fpgtk/Makefile +++ b/packages/fpgtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26] # 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 @@ -98,7 +98,7 @@ endif endif export ECHO endif -override DEFAULT_FPCDIR=../../.. +override DEFAULT_FPCDIR=../.. ifndef FPC ifdef PP FPC=$(PP) @@ -561,6 +561,324 @@ ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_RSTS+=fpgtk fpgtkext endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1339,346 +1657,275 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base gtk +override REQUIRE_PACKAGES=rtl fcl-base gtk1 ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=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 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=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 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_GTK=1 -REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1732,108 +1979,82 @@ ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif endif -ifdef REQUIRE_PACKAGES_GTK -PACKAGEDIR_GTK:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_GTK),) -ifneq ($(wildcard $(PACKAGEDIR_GTK)/units/$(TARGETSUFFIX)),) -UNITDIR_GTK=$(PACKAGEDIR_GTK)/units/$(TARGETSUFFIX) +ifdef REQUIRE_PACKAGES_GTK1 +PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_GTK1),) +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX)),) +UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX) else -UNITDIR_GTK=$(PACKAGEDIR_GTK) +UNITDIR_GTK1=$(PACKAGEDIR_GTK1) endif ifdef CHECKDEPEND -$(PACKAGEDIR_GTK)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE) +$(PACKAGEDIR_GTK1)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_GTK1)/$(FPCMADE) endif else -PACKAGEDIR_GTK= -UNITDIR_GTK:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_GTK),) -UNITDIR_GTK:=$(firstword $(UNITDIR_GTK)) +PACKAGEDIR_GTK1= +UNITDIR_GTK1:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_GTK1),) +UNITDIR_GTK1:=$(firstword $(UNITDIR_GTK1)) else -UNITDIR_GTK= +UNITDIR_GTK1= endif endif -ifdef UNITDIR_GTK -override COMPILER_UNITDIR+=$(UNITDIR_GTK) +ifdef UNITDIR_GTK1 +override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif endif -ifdef REQUIRE_PACKAGES_X11 -PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_X11),) -ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)),) -UNITDIR_X11=$(PACKAGEDIR_X11)/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_X11=$(PACKAGEDIR_X11) +UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE) endif ifdef CHECKDEPEND -$(PACKAGEDIR_X11)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE) +$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_WINUNITS-BASE) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE) endif else -PACKAGEDIR_X11= -UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_X11),) -UNITDIR_X11:=$(firstword $(UNITDIR_X11)) +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_X11= +UNITDIR_WINUNITS-BASE= endif endif -ifdef UNITDIR_X11 -override COMPILER_UNITDIR+=$(UNITDIR_X11) +ifdef UNITDIR_WINUNITS-BASE +override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-BASE) endif endif -ifdef REQUIRE_PACKAGES_OPENGL -PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_OPENGL),) -ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX)),) -UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) +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_OPENGL=$(PACKAGEDIR_OPENGL) +UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI) endif ifdef CHECKDEPEND -$(PACKAGEDIR_OPENGL)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE) +$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_WINUNITS-JEDI) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE) endif else -PACKAGEDIR_OPENGL= -UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_OPENGL),) -UNITDIR_OPENGL:=$(firstword $(UNITDIR_OPENGL)) +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_OPENGL= +UNITDIR_WINUNITS-JEDI= endif endif -ifdef UNITDIR_OPENGL -override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) -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) -else -UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_WINUNITS)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_WINUNITS) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS)/$(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)) -else -UNITDIR_WINUNITS= -endif -endif -ifdef UNITDIR_WINUNITS -override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS) +ifdef UNITDIR_WINUNITS-JEDI +override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-JEDI) endif endif ifndef NOCPUDEF @@ -1996,7 +2217,7 @@ endif endif endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS),) +ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) diff --git a/packages/extra/fpgtk/Makefile.fpc b/packages/fpgtk/Makefile.fpc similarity index 63% rename from packages/extra/fpgtk/Makefile.fpc rename to packages/fpgtk/Makefile.fpc index 48e6afccfc..43ad37f923 100644 --- a/packages/extra/fpgtk/Makefile.fpc +++ b/packages/fpgtk/Makefile.fpc @@ -2,7 +2,7 @@ # Makefile.fpc for fpgtk # [require] -packages=fcl-base gtk +packages=fcl-base gtk1 [package] name=fpgtk @@ -16,7 +16,11 @@ rsts=fpgtk fpgtkext fpcpackage=y [default] -fpcdir=../../.. +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src src/editor src/def src/pgtk tests [rules] .NOTPARALLEL: diff --git a/packages/fpgtk/fpmake.pp b/packages/fpgtk/fpmake.pp new file mode 100644 index 0000000000..e0d7de6a67 --- /dev/null +++ b/packages/fpgtk/fpmake.pp @@ -0,0 +1,49 @@ +{$ifndef ALLPACKAGES} +{$mode objfpc}{$H+} +program fpmake; + +uses fpmkunit; + +Var + P : TPackage; + T : TTarget; +begin + With Installer do + begin +{$endif ALLPACKAGES} + + P:=AddPackage('fpgtk'); +{$ifdef ALLPACKAGES} + P.Directory:='fpgtk'; +{$endif ALLPACKAGES} + P.Version:='2.0.0'; + P.SourcePath.Add('src'); + + T:=P.Targets.AddUnit('fpglib.pp'); + with T.Dependencies do + begin + AddUnit('glib'); + end; + T:=P.Targets.AddUnit('fpgtkext.pp'); + with T.Dependencies do + begin + AddUnit('fpgtk'); + AddUnit('gtk'); + AddUnit('gdk'); + AddUnit('glib'); + end; + T:=P.Targets.AddUnit('fpgtk.pp'); + with T.Dependencies do + begin + AddUnit('gtk'); + AddUnit('gdk'); + AddUnit('glib'); + AddUnit('fpglib'); + end; + + +{$ifndef ALLPACKAGES} + Run; + end; +end. +{$endif ALLPACKAGES} diff --git a/packages/extra/fpgtk/def/objectdef.pp b/packages/fpgtk/src/def/objectdef.pp similarity index 100% rename from packages/extra/fpgtk/def/objectdef.pp rename to packages/fpgtk/src/def/objectdef.pp diff --git a/packages/extra/fpgtk/demo/Makefile b/packages/fpgtk/src/demo/Makefile similarity index 100% rename from packages/extra/fpgtk/demo/Makefile rename to packages/fpgtk/src/demo/Makefile diff --git a/packages/extra/fpgtk/demo/Makefile.fpc b/packages/fpgtk/src/demo/Makefile.fpc similarity index 100% rename from packages/extra/fpgtk/demo/Makefile.fpc rename to packages/fpgtk/src/demo/Makefile.fpc diff --git a/packages/extra/fpgtk/demo/lister.pp b/packages/fpgtk/src/demo/lister.pp similarity index 100% rename from packages/extra/fpgtk/demo/lister.pp rename to packages/fpgtk/src/demo/lister.pp diff --git a/packages/extra/fpgtk/demo/testgtk.pp b/packages/fpgtk/src/demo/testgtk.pp similarity index 100% rename from packages/extra/fpgtk/demo/testgtk.pp rename to packages/fpgtk/src/demo/testgtk.pp diff --git a/packages/extra/fpgtk/demo/testgtk.ppr b/packages/fpgtk/src/demo/testgtk.ppr similarity index 100% rename from packages/extra/fpgtk/demo/testgtk.ppr rename to packages/fpgtk/src/demo/testgtk.ppr diff --git a/packages/extra/fpgtk/editor/buttonrow.pp b/packages/fpgtk/src/editor/buttonrow.pp similarity index 100% rename from packages/extra/fpgtk/editor/buttonrow.pp rename to packages/fpgtk/src/editor/buttonrow.pp diff --git a/packages/extra/fpgtk/editor/finddlgs.pp b/packages/fpgtk/src/editor/finddlgs.pp similarity index 100% rename from packages/extra/fpgtk/editor/finddlgs.pp rename to packages/fpgtk/src/editor/finddlgs.pp diff --git a/packages/extra/fpgtk/editor/gtkdef.pp b/packages/fpgtk/src/editor/gtkdef.pp similarity index 100% rename from packages/extra/fpgtk/editor/gtkdef.pp rename to packages/fpgtk/src/editor/gtkdef.pp diff --git a/packages/extra/fpgtk/editor/gtkdeftexts.pp b/packages/fpgtk/src/editor/gtkdeftexts.pp similarity index 100% rename from packages/extra/fpgtk/editor/gtkdeftexts.pp rename to packages/fpgtk/src/editor/gtkdeftexts.pp diff --git a/packages/extra/fpgtk/editor/gtkeditor.pp b/packages/fpgtk/src/editor/gtkeditor.pp similarity index 100% rename from packages/extra/fpgtk/editor/gtkeditor.pp rename to packages/fpgtk/src/editor/gtkeditor.pp diff --git a/packages/extra/fpgtk/editor/progwin.pp b/packages/fpgtk/src/editor/progwin.pp similarity index 100% rename from packages/extra/fpgtk/editor/progwin.pp rename to packages/fpgtk/src/editor/progwin.pp diff --git a/packages/extra/fpgtk/editor/settingsrec.pp b/packages/fpgtk/src/editor/settingsrec.pp similarity index 100% rename from packages/extra/fpgtk/editor/settingsrec.pp rename to packages/fpgtk/src/editor/settingsrec.pp diff --git a/packages/extra/fpgtk/editor/xpms.pp b/packages/fpgtk/src/editor/xpms.pp similarity index 100% rename from packages/extra/fpgtk/editor/xpms.pp rename to packages/fpgtk/src/editor/xpms.pp diff --git a/packages/extra/fpgtk/fpglib.pp b/packages/fpgtk/src/fpglib.pp similarity index 100% rename from packages/extra/fpgtk/fpglib.pp rename to packages/fpgtk/src/fpglib.pp diff --git a/packages/extra/fpgtk/fpgtk.def b/packages/fpgtk/src/fpgtk.def similarity index 100% rename from packages/extra/fpgtk/fpgtk.def rename to packages/fpgtk/src/fpgtk.def diff --git a/packages/extra/fpgtk/fpgtk.pp b/packages/fpgtk/src/fpgtk.pp similarity index 100% rename from packages/extra/fpgtk/fpgtk.pp rename to packages/fpgtk/src/fpgtk.pp diff --git a/packages/extra/fpgtk/fpgtkext.pp b/packages/fpgtk/src/fpgtkext.pp similarity index 100% rename from packages/extra/fpgtk/fpgtkext.pp rename to packages/fpgtk/src/fpgtkext.pp diff --git a/packages/extra/fpgtk/pgtk/pgtk.pp b/packages/fpgtk/src/pgtk/pgtk.pp similarity index 100% rename from packages/extra/fpgtk/pgtk/pgtk.pp rename to packages/fpgtk/src/pgtk/pgtk.pp diff --git a/packages/extra/fpgtk/pgtk/pgtk.ppr b/packages/fpgtk/src/pgtk/pgtk.ppr similarity index 100% rename from packages/extra/fpgtk/pgtk/pgtk.ppr rename to packages/fpgtk/src/pgtk/pgtk.ppr