* examples moved

git-svn-id: trunk@9995 -
This commit is contained in:
marco 2008-01-26 23:00:46 +00:00
parent 2fe958e87a
commit 5e41b056d0
6 changed files with 113 additions and 210 deletions

10
.gitattributes vendored
View File

@ -3068,13 +3068,13 @@ 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/examples/Makefile svneol=native#text/plain
packages/fpgtk/examples/Makefile.fpc svneol=native#text/plain
packages/fpgtk/examples/lister.pp svneol=native#text/plain
packages/fpgtk/examples/testgtk.pp svneol=native#text/plain
packages/fpgtk/examples/testgtk.ppr 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

View File

@ -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)
@ -1341,395 +1341,324 @@ override REQUIRE_PACKAGES=rtl fpgtk
ifeq ($(FULL_TARGET),i386-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-go32v2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=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_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-os2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-qnx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-netware)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-wdosx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-emx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-watcom)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-symbian)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-atari)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-palmos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),m68k-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc-macos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),sparc-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),sparc-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),x86_64-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=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_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-palmos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-gba)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-nds)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-symbian)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_GTK1=1
REQUIRE_PACKAGES_FPGTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@ -1783,30 +1712,30 @@ 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_FPGTK
@ -1835,82 +1764,56 @@ ifdef UNITDIR_FPGTK
override COMPILER_UNITDIR+=$(UNITDIR_FPGTK)
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

View File

@ -15,7 +15,7 @@ units=lister
fpcpackage=y
[default]
fpcdir=../../../..
fpcdir=../../..
[rules]
.NOTPARALLEL: