From cda8ea8c45d0921a0f1c95c4d25c06be4c93088c Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 27 Jan 2008 10:35:18 +0000 Subject: [PATCH] * sdl moved git-svn-id: trunk@10024 - --- .gitattributes | 39 ++- packages/extra/sdl/fpmake.pp | 38 -- packages/{extra => }/sdl/LGPL | 0 packages/{extra => }/sdl/LGPL.addon | 0 packages/{extra => }/sdl/MPL-1.1 | 0 packages/{extra => }/sdl/Makefile | 324 +++++++++++++++++- packages/{extra => }/sdl/Makefile.fpc | 6 +- packages/{extra => }/sdl/README | 0 packages/sdl/fpmake.pp | 91 +++++ packages/{extra/sdl => sdl/src}/jedi-sdl.inc | 0 .../{extra/sdl => sdl/src}/libxmlparser.pas | 0 packages/{extra/sdl => sdl/src}/logger.pas | 0 packages/{extra/sdl => sdl/src}/powersdl.inc | 0 packages/{extra/sdl => sdl/src}/sdl.pas | 0 packages/{extra/sdl => sdl/src}/sdl_gfx.pas | 0 packages/{extra/sdl => sdl/src}/sdl_image.pas | 0 packages/{extra/sdl => sdl/src}/sdl_mixer.pas | 0 .../sdl => sdl/src}/sdl_mixer_nosmpeg.pas | 0 packages/{extra/sdl => sdl/src}/sdl_net.pas | 0 packages/{extra/sdl => sdl/src}/sdl_ttf.pas | 0 packages/{extra/sdl => sdl/src}/sdlutils.pas | 0 packages/{extra/sdl => sdl/src}/smpeg.pas | 0 22 files changed, 437 insertions(+), 61 deletions(-) delete mode 100644 packages/extra/sdl/fpmake.pp rename packages/{extra => }/sdl/LGPL (100%) rename packages/{extra => }/sdl/LGPL.addon (100%) rename packages/{extra => }/sdl/MPL-1.1 (100%) rename packages/{extra => }/sdl/Makefile (86%) rename packages/{extra => }/sdl/Makefile.fpc (87%) rename packages/{extra => }/sdl/README (100%) create mode 100644 packages/sdl/fpmake.pp rename packages/{extra/sdl => sdl/src}/jedi-sdl.inc (100%) rename packages/{extra/sdl => sdl/src}/libxmlparser.pas (100%) rename packages/{extra/sdl => sdl/src}/logger.pas (100%) rename packages/{extra/sdl => sdl/src}/powersdl.inc (100%) rename packages/{extra/sdl => sdl/src}/sdl.pas (100%) rename packages/{extra/sdl => sdl/src}/sdl_gfx.pas (100%) rename packages/{extra/sdl => sdl/src}/sdl_image.pas (100%) rename packages/{extra/sdl => sdl/src}/sdl_mixer.pas (100%) rename packages/{extra/sdl => sdl/src}/sdl_mixer_nosmpeg.pas (100%) rename packages/{extra/sdl => sdl/src}/sdl_net.pas (100%) rename packages/{extra/sdl => sdl/src}/sdl_ttf.pas (100%) rename packages/{extra/sdl => sdl/src}/sdlutils.pas (100%) rename packages/{extra/sdl => sdl/src}/smpeg.pas (100%) diff --git a/.gitattributes b/.gitattributes index efbb54d5cc..317d585f4b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1770,25 +1770,6 @@ packages/extra/ptc/x11/x11modesi.inc svneol=native#text/x-pascal packages/extra/ptc/x11/x11windowdisplayd.inc svneol=native#text/x-pascal packages/extra/ptc/x11/x11windowdisplayi.inc svneol=native#text/x-pascal packages/extra/ptc/x11/xunikey.inc svneol=native#text/x-pascal -packages/extra/sdl/LGPL -text -packages/extra/sdl/LGPL.addon -text -packages/extra/sdl/MPL-1.1 -text -packages/extra/sdl/Makefile.fpc -text -packages/extra/sdl/README -text -packages/extra/sdl/fpmake.pp svneol=native#text/plain -packages/extra/sdl/jedi-sdl.inc svneol=native#text/plain -packages/extra/sdl/libxmlparser.pas svneol=native#text/plain -packages/extra/sdl/logger.pas svneol=native#text/plain -packages/extra/sdl/powersdl.inc -text -packages/extra/sdl/sdl.pas svneol=native#text/plain -packages/extra/sdl/sdl_gfx.pas -text svneol=unset#text/plain -packages/extra/sdl/sdl_image.pas -text svneol=unset#text/plain -packages/extra/sdl/sdl_mixer.pas -text svneol=unset#text/plain -packages/extra/sdl/sdl_mixer_nosmpeg.pas -text svneol=unset#text/plain -packages/extra/sdl/sdl_net.pas svneol=native#text/plain -packages/extra/sdl/sdl_ttf.pas svneol=native#text/plain -packages/extra/sdl/sdlutils.pas svneol=native#text/plain -packages/extra/sdl/smpeg.pas svneol=native#text/plain packages/extra/sndfile/Makefile svneol=native#text/plain packages/extra/sndfile/Makefile.fpc svneol=native#text/plain packages/extra/sndfile/README -text @@ -4252,6 +4233,26 @@ packages/rexx/examples/callrexx.pas svneol=native#text/plain packages/rexx/fpmake.pp svneol=native#text/plain packages/rexx/readme.txt svneol=native#text/plain packages/rexx/src/rexxsaa.pp svneol=native#text/plain +packages/sdl/LGPL svneol=native#text/plain +packages/sdl/LGPL.addon svneol=native#text/plain +packages/sdl/MPL-1.1 svneol=native#text/plain +packages/sdl/Makefile svneol=native#text/plain +packages/sdl/Makefile.fpc svneol=native#text/plain +packages/sdl/README svneol=native#text/plain +packages/sdl/fpmake.pp svneol=native#text/plain +packages/sdl/src/jedi-sdl.inc svneol=native#text/plain +packages/sdl/src/libxmlparser.pas svneol=native#text/plain +packages/sdl/src/logger.pas svneol=native#text/plain +packages/sdl/src/powersdl.inc svneol=native#text/plain +packages/sdl/src/sdl.pas svneol=native#text/plain +packages/sdl/src/sdl_gfx.pas svneol=native#text/plain +packages/sdl/src/sdl_image.pas svneol=native#text/plain +packages/sdl/src/sdl_mixer.pas svneol=native#text/plain +packages/sdl/src/sdl_mixer_nosmpeg.pas svneol=native#text/plain +packages/sdl/src/sdl_net.pas svneol=native#text/plain +packages/sdl/src/sdl_ttf.pas svneol=native#text/plain +packages/sdl/src/sdlutils.pas svneol=native#text/plain +packages/sdl/src/smpeg.pas svneol=native#text/plain packages/sqlite/Makefile svneol=native#text/plain packages/sqlite/Makefile.fpc svneol=native#text/plain packages/sqlite/fpmake.pp svneol=native#text/plain diff --git a/packages/extra/sdl/fpmake.pp b/packages/extra/sdl/fpmake.pp deleted file mode 100644 index fd3d8c2b34..0000000000 --- a/packages/extra/sdl/fpmake.pp +++ /dev/null @@ -1,38 +0,0 @@ -{$ifndef ALLPACKAGES} -{$mode objfpc}{$H+} -program fpmake; - -uses fpmkunit; - -Var - P : TPackage; - T : TTarget; -begin - With Installer do - begin -{$endif ALLPACKAGES} - - P:=AddPackage('sdl'); -{$ifdef ALLPACKAGES} - P.Directory:='sdl'; -{$endif ALLPACKAGES} - P.Version:='1.2.12'; - T:=P.Targets.AddUnit('sdl.pas'); - T:=P.Targets.AddUnit('sdl_gfx.pas'); - T:=P.Targets.AddUnit('sdl_image.pas'); - T:=P.Targets.AddUnit('sdl_mixer.pas'); - T:=P.Targets.AddUnit('sdl_ttf.pas'); - T:=P.Targets.AddUnit('sdl_net.pas'); - T:=P.Targets.AddUnit('sdl_mixer_nosmpeg.pas'); - T:=P.Targets.AddUnit('sdlutils.pas'); - T:=P.Targets.AddUnit('smpeg.pas'); - T:=P.Targets.AddUnit('logger.pas'); - T.Dependencies.AddInclude('jedi-sdl.inc'); - T.Dependencies.AddInclude('powersdl.inc'); - T.OSes:=[linux,freebsd,win32,win64,darwin]; - -{$ifndef ALLPACKAGES} - Run; - end; -end. -{$endif ALLPACKAGES} diff --git a/packages/extra/sdl/LGPL b/packages/sdl/LGPL similarity index 100% rename from packages/extra/sdl/LGPL rename to packages/sdl/LGPL diff --git a/packages/extra/sdl/LGPL.addon b/packages/sdl/LGPL.addon similarity index 100% rename from packages/extra/sdl/LGPL.addon rename to packages/sdl/LGPL.addon diff --git a/packages/extra/sdl/MPL-1.1 b/packages/sdl/MPL-1.1 similarity index 100% rename from packages/extra/sdl/MPL-1.1 rename to packages/sdl/MPL-1.1 diff --git a/packages/extra/sdl/Makefile b/packages/sdl/Makefile similarity index 86% rename from packages/extra/sdl/Makefile rename to packages/sdl/Makefile index 6e2de5826e..e05c656714 100644 --- a/packages/extra/sdl/Makefile +++ b/packages/sdl/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+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger 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 ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1684,7 +2002,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/sdl/Makefile.fpc b/packages/sdl/Makefile.fpc similarity index 87% rename from packages/extra/sdl/Makefile.fpc rename to packages/sdl/Makefile.fpc index 391d07c3c2..55a9cf6f1f 100644 --- a/packages/extra/sdl/Makefile.fpc +++ b/packages/sdl/Makefile.fpc @@ -23,7 +23,11 @@ units_i386_darwin=sdlutils fpcpackage=y [default] -fpcdir=../../.. +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests [rules] .NOTPARALLEL: diff --git a/packages/extra/sdl/README b/packages/sdl/README similarity index 100% rename from packages/extra/sdl/README rename to packages/sdl/README diff --git a/packages/sdl/fpmake.pp b/packages/sdl/fpmake.pp new file mode 100644 index 0000000000..c3626bcc61 --- /dev/null +++ b/packages/sdl/fpmake.pp @@ -0,0 +1,91 @@ +{$ifndef ALLPACKAGES} +{$mode objfpc}{$H+} +program fpmake; + +uses fpmkunit; + +Var + P : TPackage; + T : TTarget; +begin + With Installer do + begin +{$endif ALLPACKAGES} + + P:=AddPackage('sdl'); +{$ifdef ALLPACKAGES} + P.Directory:='sdl'; +{$endif ALLPACKAGES} + P.Version:='2.0.0'; + P.SourcePath.Add('src'); + P.Dependencies.Add('x11'); + P.Dependencies.Add('pthreads'); + + T:=P.Targets.AddUnit('logger.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + end; + T:=P.Targets.AddUnit('sdl_gfx.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('sdl'); + end; + T:=P.Targets.AddUnit('sdl_image.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('sdl'); + end; + T:=P.Targets.AddUnit('sdl_mixer_nosmpeg.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('sdl'); + end; + T:=P.Targets.AddUnit('sdl_mixer.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('smpeg'); + AddUnit('sdl'); + end; + T:=P.Targets.AddUnit('sdl_net.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('sdl'); + end; + T:=P.Targets.AddUnit('sdl.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('pthreads'); + AddUnit('xlib'); + end; + T:=P.Targets.AddUnit('sdl_ttf.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('sdl'); + end; + T:=P.Targets.AddUnit('sdlutils.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('xlib'); + AddUnit('sdl'); + end; + T:=P.Targets.AddUnit('smpeg.pas'); + with T.Dependencies do + begin + AddInclude('jedi-sdl.inc'); + AddUnit('sdl'); + end; + +{$ifndef ALLPACKAGES} + Run; + end; +end. +{$endif ALLPACKAGES} diff --git a/packages/extra/sdl/jedi-sdl.inc b/packages/sdl/src/jedi-sdl.inc similarity index 100% rename from packages/extra/sdl/jedi-sdl.inc rename to packages/sdl/src/jedi-sdl.inc diff --git a/packages/extra/sdl/libxmlparser.pas b/packages/sdl/src/libxmlparser.pas similarity index 100% rename from packages/extra/sdl/libxmlparser.pas rename to packages/sdl/src/libxmlparser.pas diff --git a/packages/extra/sdl/logger.pas b/packages/sdl/src/logger.pas similarity index 100% rename from packages/extra/sdl/logger.pas rename to packages/sdl/src/logger.pas diff --git a/packages/extra/sdl/powersdl.inc b/packages/sdl/src/powersdl.inc similarity index 100% rename from packages/extra/sdl/powersdl.inc rename to packages/sdl/src/powersdl.inc diff --git a/packages/extra/sdl/sdl.pas b/packages/sdl/src/sdl.pas similarity index 100% rename from packages/extra/sdl/sdl.pas rename to packages/sdl/src/sdl.pas diff --git a/packages/extra/sdl/sdl_gfx.pas b/packages/sdl/src/sdl_gfx.pas similarity index 100% rename from packages/extra/sdl/sdl_gfx.pas rename to packages/sdl/src/sdl_gfx.pas diff --git a/packages/extra/sdl/sdl_image.pas b/packages/sdl/src/sdl_image.pas similarity index 100% rename from packages/extra/sdl/sdl_image.pas rename to packages/sdl/src/sdl_image.pas diff --git a/packages/extra/sdl/sdl_mixer.pas b/packages/sdl/src/sdl_mixer.pas similarity index 100% rename from packages/extra/sdl/sdl_mixer.pas rename to packages/sdl/src/sdl_mixer.pas diff --git a/packages/extra/sdl/sdl_mixer_nosmpeg.pas b/packages/sdl/src/sdl_mixer_nosmpeg.pas similarity index 100% rename from packages/extra/sdl/sdl_mixer_nosmpeg.pas rename to packages/sdl/src/sdl_mixer_nosmpeg.pas diff --git a/packages/extra/sdl/sdl_net.pas b/packages/sdl/src/sdl_net.pas similarity index 100% rename from packages/extra/sdl/sdl_net.pas rename to packages/sdl/src/sdl_net.pas diff --git a/packages/extra/sdl/sdl_ttf.pas b/packages/sdl/src/sdl_ttf.pas similarity index 100% rename from packages/extra/sdl/sdl_ttf.pas rename to packages/sdl/src/sdl_ttf.pas diff --git a/packages/extra/sdl/sdlutils.pas b/packages/sdl/src/sdlutils.pas similarity index 100% rename from packages/extra/sdl/sdlutils.pas rename to packages/sdl/src/sdlutils.pas diff --git a/packages/extra/sdl/smpeg.pas b/packages/sdl/src/smpeg.pas similarity index 100% rename from packages/extra/sdl/smpeg.pas rename to packages/sdl/src/smpeg.pas