* fftw, minor updates to xforms

git-svn-id: trunk@10016 -
This commit is contained in:
marco 2008-01-27 10:04:56 +00:00
parent 857da2934c
commit d2b1c7a65c
10 changed files with 384 additions and 49 deletions

12
.gitattributes vendored
View File

@ -1091,12 +1091,6 @@ packages/extra/amunits/utilunits/tagsarray.pas svneol=native#text/plain
packages/extra/amunits/utilunits/timerutils.pas svneol=native#text/plain
packages/extra/amunits/utilunits/vartags.pas svneol=native#text/plain
packages/extra/amunits/utilunits/wbargs.pas svneol=native#text/plain
packages/extra/fftw/Makefile -text
packages/extra/fftw/Makefile.fpc -text
packages/extra/fftw/example.pas -text
packages/extra/fftw/fftw_s.pas -text
packages/extra/fftw/readme.txt -text
packages/extra/forms/fpmake.inc svneol=native#text/plain
packages/extra/gbaunits/Makefile -text
packages/extra/gbaunits/Makefile.fpc -text
packages/extra/gbaunits/bios_asm.as -text
@ -2903,6 +2897,12 @@ 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/fftw/Makefile svneol=native#text/plain
packages/fftw/Makefile.fpc svneol=native#text/plain
packages/fftw/examples/example.pas svneol=native#text/plain
packages/fftw/fpmake.pp svneol=native#text/plain
packages/fftw/readme.txt svneol=native#text/plain
packages/fftw/src/fftw_s.pas 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

23
.gitignore vendored
View File

@ -591,29 +591,6 @@ packages/extra/amunits/utilunits/*.ppu
packages/extra/amunits/utilunits/*.s
packages/extra/amunits/utilunits/fpcmade.*
packages/extra/amunits/utilunits/units
packages/extra/fftw/*.bak
packages/extra/fftw/*.exe
packages/extra/fftw/*.o
packages/extra/fftw/*.ppu
packages/extra/fftw/*.s
packages/extra/fftw/.gdbinit
packages/extra/fftw/fpcmade.*
packages/extra/fftw/units
packages/extra/forms/*.bak
packages/extra/forms/*.exe
packages/extra/forms/*.o
packages/extra/forms/*.ppu
packages/extra/forms/*.s
packages/extra/forms/demo/*.bak
packages/extra/forms/demo/*.exe
packages/extra/forms/demo/*.o
packages/extra/forms/demo/*.ppu
packages/extra/forms/demo/*.s
packages/extra/forms/demo/fpcmade.*
packages/extra/forms/demo/units
packages/extra/forms/fd2pascal
packages/extra/forms/fpcmade.*
packages/extra/forms/units
packages/extra/fpcmade.*
packages/extra/gbaunits/*.bat
packages/extra/ggi/*.bak

View File

@ -1,11 +0,0 @@
StartPackage('forms');
{$IF defined(ALLPACKAGES)}
Directory:='extra/forms';
{$ELSEIF defined(EXTRAPACKAGES)}
Directory:='forms';
{$ENDIF}
OS:=[linux,netbsd,freebsd,openbsd,darwin];
Dependencies.Add('x11');
T:=Targets.AddUnit('xforms');
T:=Targets.AddProgram('fd2pascal');
EndPackage;

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)
@ -402,6 +402,324 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=fftw_s
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 tests
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_SOURCEDIR+=src tests
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_SOURCEDIR+=src tests
endif
override SHARED_BUILD=n
override SHARED_BUILD=n
ifdef REQUIRE_UNITSDIR
@ -1491,7 +1809,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))

View File

@ -19,7 +19,11 @@ libc=
fpcpackage=y
[default]
fpcdir=../../..
fpcdir=../..
[compiler]
includedir=src
sourcedir=src tests
[shared]
build=n

29
packages/fftw/fpmake.pp Normal file
View File

@ -0,0 +1,29 @@
{$ifndef ALLPACKAGES}
{$mode objfpc}{$H+}
program fpmake;
uses fpmkunit;
Var
P : TPackage;
T : TTarget;
begin
With Installer do
begin
{$endif ALLPACKAGES}
P:=AddPackage('fftw');
{$ifdef ALLPACKAGES}
P.Directory:='fftw';
{$endif ALLPACKAGES}
P.Version:='2.0.0';
P.SourcePath.Add('src');
// P.Dependencies.Add('x11');
T:=P.Targets.AddUnit('fftw_s.pas');
{$ifndef ALLPACKAGES}
Run;
end;
end.
{$endif ALLPACKAGES}

View File

@ -1,17 +1,35 @@
{$ifndef ALLPACKAGES}
{$mode objfpc}{$H+}
program fpmake;
uses fpmkunit;
Var
P : TPackage;
T : TTarget;
begin
With Installer do
With Installer do
begin
{ Base packages }
{$i fpmake.inc}
{$endif ALLPACKAGES}
P:=AddPackage('xforms');
{$ifdef ALLPACKAGES}
P.Directory:='xforms';
{$endif ALLPACKAGES}
P.Version:='2.0.0';
P.SourcePath.Add('src');
// P.Dependencies.Add('x11');
T:=P.Targets.AddUnit('xforms.pp');
with T.Dependencies do
begin
AddInclude('cursorfont.inc');
AddUnit('xlib');
AddUnit('xresource');
end;
{$ifndef ALLPACKAGES}
Run;
end;
end.
{$endif ALLPACKAGES}