From d2b1c7a65c5196b545f535d314d0e3a5f8a96a63 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 27 Jan 2008 10:04:56 +0000 Subject: [PATCH] * fftw, minor updates to xforms git-svn-id: trunk@10016 - --- .gitattributes | 12 +- .gitignore | 23 -- packages/extra/forms/fpmake.inc | 11 - packages/{extra => }/fftw/Makefile | 324 +++++++++++++++++- packages/{extra => }/fftw/Makefile.fpc | 6 +- .../{extra/fftw => fftw/examples}/example.pas | 0 packages/fftw/fpmake.pp | 29 ++ packages/{extra => }/fftw/readme.txt | 0 packages/{extra/fftw => fftw/src}/fftw_s.pas | 0 packages/xforms/fpmake.pp | 28 +- 10 files changed, 384 insertions(+), 49 deletions(-) delete mode 100644 packages/extra/forms/fpmake.inc rename packages/{extra => }/fftw/Makefile (84%) rename packages/{extra => }/fftw/Makefile.fpc (78%) rename packages/{extra/fftw => fftw/examples}/example.pas (100%) create mode 100644 packages/fftw/fpmake.pp rename packages/{extra => }/fftw/readme.txt (100%) rename packages/{extra/fftw => fftw/src}/fftw_s.pas (100%) diff --git a/.gitattributes b/.gitattributes index 1cde224c41..b0149e5492 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/.gitignore b/.gitignore index ffc84e24d2..471a5d3831 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/packages/extra/forms/fpmake.inc b/packages/extra/forms/fpmake.inc deleted file mode 100644 index 1604972f7d..0000000000 --- a/packages/extra/forms/fpmake.inc +++ /dev/null @@ -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; diff --git a/packages/extra/fftw/Makefile b/packages/fftw/Makefile similarity index 84% rename from packages/extra/fftw/Makefile rename to packages/fftw/Makefile index 76df46f676..681c0d44c8 100644 --- a/packages/extra/fftw/Makefile +++ b/packages/fftw/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) @@ -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)) diff --git a/packages/extra/fftw/Makefile.fpc b/packages/fftw/Makefile.fpc similarity index 78% rename from packages/extra/fftw/Makefile.fpc rename to packages/fftw/Makefile.fpc index 96204691b3..9aa15bc6f4 100644 --- a/packages/extra/fftw/Makefile.fpc +++ b/packages/fftw/Makefile.fpc @@ -19,7 +19,11 @@ libc= fpcpackage=y [default] -fpcdir=../../.. +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests [shared] build=n diff --git a/packages/extra/fftw/example.pas b/packages/fftw/examples/example.pas similarity index 100% rename from packages/extra/fftw/example.pas rename to packages/fftw/examples/example.pas diff --git a/packages/fftw/fpmake.pp b/packages/fftw/fpmake.pp new file mode 100644 index 0000000000..8eb01f3c4a --- /dev/null +++ b/packages/fftw/fpmake.pp @@ -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} diff --git a/packages/extra/fftw/readme.txt b/packages/fftw/readme.txt similarity index 100% rename from packages/extra/fftw/readme.txt rename to packages/fftw/readme.txt diff --git a/packages/extra/fftw/fftw_s.pas b/packages/fftw/src/fftw_s.pas similarity index 100% rename from packages/extra/fftw/fftw_s.pas rename to packages/fftw/src/fftw_s.pas diff --git a/packages/xforms/fpmake.pp b/packages/xforms/fpmake.pp index d4b6178682..744360295d 100644 --- a/packages/xforms/fpmake.pp +++ b/packages/xforms/fpmake.pp @@ -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}