* re-merge smpeg (cannot be separated due to heavy type dependence sadly)

git-svn-id: trunk@6768 -
This commit is contained in:
Almindor 2007-03-09 22:27:59 +00:00
parent faf3b065f8
commit e2dda2ba2b
12 changed files with 88 additions and 2233 deletions

6
.gitattributes vendored
View File

@ -3349,12 +3349,8 @@ packages/extra/sdl/sdlwebftp.pas svneol=native#text/plain
packages/extra/sdl/sdlwebhttp.pas svneol=native#text/plain
packages/extra/sdl/sdlwindow.pas svneol=native#text/plain
packages/extra/sdl/sfont.pas svneol=native#text/plain
packages/extra/sdl/smpeg.pas svneol=native#text/plain
packages/extra/sdl/userpreferences.pas svneol=native#text/plain
packages/extra/smpeg/Makefile svneol=native#text/plain
packages/extra/smpeg/Makefile.fpc svneol=native#text/plain
packages/extra/smpeg/fpmake.inc svneol=native#text/plain
packages/extra/smpeg/fpmake.pp svneol=native#text/plain
packages/extra/smpeg/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

View File

@ -231,34 +231,34 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo smpeg sdl unixutil
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo sdl unixutil
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_DIRS+=unzip
endif
ifeq ($(FULL_TARGET),i386-win32)
override TARGET_DIRS+=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw mad openal oggvorbis a52 libpng openssl pcap smpeg sdl
override TARGET_DIRS+=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw mad openal oggvorbis a52 libpng openssl pcap sdl
endif
ifeq ($(FULL_TARGET),i386-os2)
override TARGET_DIRS+=os2units rexx unzip zlib x11 gtk libpng tcl imlib fpgtk
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),i386-netware)
override TARGET_DIRS+=unzip zlib
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),i386-darwin)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl cairo smpeg sdl univint
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl cairo sdl univint
endif
ifeq ($(FULL_TARGET),i386-emx)
override TARGET_DIRS+=os2units rexx unzip zlib x11 gtk libpng tcl imlib fpgtk
@ -270,55 +270,55 @@ ifeq ($(FULL_TARGET),i386-wince)
override TARGET_DIRS+=unzip zlib tcl fftw
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_DIRS+=amunits
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_DIRS+=palmunits
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override TARGET_DIRS+=amunits
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl cairo smpeg sdl univint
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl cairo sdl univint
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_DIRS+=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw openssl
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_DIRS+=palmunits
@ -327,10 +327,10 @@ ifeq ($(FULL_TARGET),arm-wince)
override TARGET_DIRS+=unzip zlib tcl fftw
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo sdl
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl cairo smpeg sdl
override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl cairo sdl
endif
override INSTALL_FPCPACKAGE=y
override INSTALL_FPCSUBDIR=packages/extra
@ -1443,7 +1443,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
TARGET_DIRS_UNIXUTIL=1
endif
@ -1467,7 +1466,6 @@ TARGET_DIRS_A52=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),i386-os2)
@ -1508,7 +1506,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
@ -1535,7 +1532,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),i386-solaris)
@ -1564,7 +1560,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),i386-netware)
@ -1595,7 +1590,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),i386-darwin)
@ -1621,7 +1615,6 @@ TARGET_DIRS_GNOME1=1
TARGET_DIRS_OPENSSL=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
TARGET_DIRS_UNIVINT=1
endif
@ -1683,7 +1676,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
@ -1712,7 +1704,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
@ -1739,7 +1730,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),m68k-amiga)
@ -1769,7 +1759,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),m68k-palmos)
@ -1811,7 +1800,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
@ -1838,7 +1826,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
@ -1867,7 +1854,6 @@ TARGET_DIRS_GNOME1=1
TARGET_DIRS_OPENSSL=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
TARGET_DIRS_UNIVINT=1
endif
@ -1907,7 +1893,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
@ -1934,7 +1919,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),sparc-solaris)
@ -1963,7 +1947,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),x86_64-linux)
@ -2002,7 +1985,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
@ -2031,7 +2013,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
@ -2082,7 +2063,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),arm-palmos)
@ -2130,7 +2110,6 @@ TARGET_DIRS_OPENSSL=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
@ -2156,7 +2135,6 @@ TARGET_DIRS_GNOME1=1
TARGET_DIRS_OPENSSL=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_CAIRO=1
TARGET_DIRS_SMPEG=1
TARGET_DIRS_SDL=1
endif
ifdef TARGET_DIRS_UNZIP
@ -3734,51 +3712,6 @@ cairo:
$(MAKE) -C cairo all
.PHONY: cairo_all cairo_debug cairo_smart cairo_release cairo_units cairo_examples cairo_shared cairo_install cairo_sourceinstall cairo_exampleinstall cairo_distinstall cairo_zipinstall cairo_zipsourceinstall cairo_zipexampleinstall cairo_zipdistinstall cairo_clean cairo_distclean cairo_cleanall cairo_info cairo_makefiles cairo
endif
ifdef TARGET_DIRS_SMPEG
smpeg_all:
$(MAKE) -C smpeg all
smpeg_debug:
$(MAKE) -C smpeg debug
smpeg_smart:
$(MAKE) -C smpeg smart
smpeg_release:
$(MAKE) -C smpeg release
smpeg_units:
$(MAKE) -C smpeg units
smpeg_examples:
$(MAKE) -C smpeg examples
smpeg_shared:
$(MAKE) -C smpeg shared
smpeg_install:
$(MAKE) -C smpeg install
smpeg_sourceinstall:
$(MAKE) -C smpeg sourceinstall
smpeg_exampleinstall:
$(MAKE) -C smpeg exampleinstall
smpeg_distinstall:
$(MAKE) -C smpeg distinstall
smpeg_zipinstall:
$(MAKE) -C smpeg zipinstall
smpeg_zipsourceinstall:
$(MAKE) -C smpeg zipsourceinstall
smpeg_zipexampleinstall:
$(MAKE) -C smpeg zipexampleinstall
smpeg_zipdistinstall:
$(MAKE) -C smpeg zipdistinstall
smpeg_clean:
$(MAKE) -C smpeg clean
smpeg_distclean:
$(MAKE) -C smpeg distclean
smpeg_cleanall:
$(MAKE) -C smpeg cleanall
smpeg_info:
$(MAKE) -C smpeg info
smpeg_makefiles:
$(MAKE) -C smpeg makefiles
smpeg:
$(MAKE) -C smpeg all
.PHONY: smpeg_all smpeg_debug smpeg_smart smpeg_release smpeg_units smpeg_examples smpeg_shared smpeg_install smpeg_sourceinstall smpeg_exampleinstall smpeg_distinstall smpeg_zipinstall smpeg_zipsourceinstall smpeg_zipexampleinstall smpeg_zipdistinstall smpeg_clean smpeg_distclean smpeg_cleanall smpeg_info smpeg_makefiles smpeg
endif
ifdef TARGET_DIRS_SDL
sdl_all:
$(MAKE) -C sdl all

View File

@ -8,26 +8,26 @@ dirs_linux=unzip zlib fftw \
utmp bfd gdbm ncurses tcl cdrom \
imlib gnome1 fpgtk newt uuid \
ldap openal mad oggvorbis a52 \
modplug dts openssl pcap libcurl cairo smpeg sdl
modplug dts openssl pcap libcurl cairo sdl
dirs_i386_linux=unixutil
dirs_netbsd=unzip zlib \
x11 opengl gtk syslog \
forms svgalib ggi libpng libgd \
utmp bfd gdbm ncurses fpgtk \
tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
tcl imlib gnome1 openssl pcap libcurl cairo sdl
dirs_freebsd=unzip zlib fftw \
x11 opengl gtk gtk2 syslog \
forms svgalib ggi libpng libgd \
utmp bfd gdbm ncurses fpgtk \
tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
tcl imlib gnome1 openssl pcap libcurl cairo sdl
dirs_openbsd=unzip zlib \
x11 opengl gtk syslog \
forms svgalib ggi libpng libgd \
utmp bfd gdbm ncurses fpgtk \
tcl imlib gnome1 openssl pcap libcurl cairo smpeg sdl
tcl imlib gnome1 openssl pcap libcurl cairo sdl
# libcurl should work on Win32 too, but I haven't tested this. Skip it for now. MVC.
dirs_win32=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw \
mad openal oggvorbis a52 libpng openssl pcap smpeg sdl
mad openal oggvorbis a52 libpng openssl pcap sdl
dirs_win64=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk fftw openssl
dirs_wince=unzip zlib tcl fftw
dirs_os2=os2units \
@ -53,14 +53,14 @@ dirs_darwin= unzip zlib fftw \
x11 opengl gtk gtk2 syslog \
forms libpng libgd \
utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 \
openssl libcurl cairo smpeg sdl
openssl libcurl cairo sdl
dirs_powerpc_darwin=univint
dirs_i386_darwin=univint
dirs_solaris= unzip zlib fftw \
x11 opengl gtk gtk2 syslog \
forms svgalib ggi libpng libgd \
utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 \
openssl pcap libcurl cairo smpeg sdl
openssl pcap libcurl cairo sdl
[install]
fpcpackage=y

View File

@ -115,7 +115,4 @@
{$i pcap/fpmake.inc}
{ sdl }
{$i sdl/fpmake.inc}
{ smpeg }
{$ smpeg/fpmake.inc}
{$i sdl/fpmake.inc}

View File

@ -233,160 +233,160 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
override PACKAGE_NAME=sdl
override PACKAGE_VERSION=1.0.0
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-win32)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-os2)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-qnx)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-netware)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-darwin)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-emx)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-watcom)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-wince)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-embedded)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-atari)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),arm-gba)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),arm-nds)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),arm-embedded)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
endif
override INSTALL_FPCPACKAGE=y
ifdef REQUIRE_UNITSDIR
@ -1167,318 +1167,266 @@ else
TAROPT=vz
TAREXT=.tar.gz
endif
override REQUIRE_PACKAGES=rtl pthreads x11 smpeg
override REQUIRE_PACKAGES=rtl pthreads x11
ifeq ($(FULL_TARGET),i386-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-go32v2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-win32)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-os2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-qnx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-netware)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-wdosx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-emx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-watcom)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),i386-symbian)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-atari)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-palmos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),m68k-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc-macos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),sparc-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),sparc-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),x86_64-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),arm-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),arm-palmos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),arm-gba)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),arm-nds)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),arm-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),arm-symbian)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_SMPEG=1
endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@ -1558,32 +1506,6 @@ ifdef UNITDIR_X11
override COMPILER_UNITDIR+=$(UNITDIR_X11)
endif
endif
ifdef REQUIRE_PACKAGES_SMPEG
PACKAGEDIR_SMPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /smpeg/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_SMPEG),)
ifneq ($(wildcard $(PACKAGEDIR_SMPEG)/units/$(TARGETSUFFIX)),)
UNITDIR_SMPEG=$(PACKAGEDIR_SMPEG)/units/$(TARGETSUFFIX)
else
UNITDIR_SMPEG=$(PACKAGEDIR_SMPEG)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_SMPEG)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_SMPEG) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_SMPEG)/$(FPCMADE)
endif
else
PACKAGEDIR_SMPEG=
UNITDIR_SMPEG:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /smpeg/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_SMPEG),)
UNITDIR_SMPEG:=$(firstword $(UNITDIR_SMPEG))
else
UNITDIR_SMPEG=
endif
endif
ifdef UNITDIR_SMPEG
override COMPILER_UNITDIR+=$(UNITDIR_SMPEG)
endif
endif
ifndef NOCPUDEF
override FPCOPTDEF=$(CPU_TARGET)
endif

View File

@ -8,10 +8,10 @@ version=1.0.0
[require]
libc=y
packages=pthreads x11 smpeg
packages=pthreads x11
[target]
units=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net
units=sdl sdl_image sdl_mixer sdl_ttf sdl_gfx sdl_net smpeg
[install]
fpcpackage=y

View File

@ -14,4 +14,5 @@
T:=Targets.AddUnit('sdl_ttf');
T:=Targets.AddUnit('sdl_gfx');
T:=Targets.AddUnit('sdl_net');
T:=Targets.AddUnit('smpeg');
EndPackage;

View File

@ -126,10 +126,7 @@ unit smpeg;
}
{******************************************************************************}
//{$I jedi-sdl.inc}
{$mode delphi}
{$packrecords C}
{$I jedi-sdl.inc}
interface

File diff suppressed because it is too large Load Diff

View File

@ -1,22 +0,0 @@
#
# Makefile.fpc for libsmpeg bindings
#
[package]
name=smpeg
version=1.0.0
[require]
libc=y
[target]
units=smpeg
[install]
fpcpackage=y
[default]
fpcdir=../../..
[rules]
.NOTPARALLEL:

View File

@ -1,9 +0,0 @@
StartPackage('smpeg');
{$IF defined(ALLPACKAGES)}
Directory:='extra/smpeg';
{$ELSEIF defined(EXTRAPACKAGES)}
Directory:='smpeg';
{$ENDIF}
OS:=[linux,netbsd,freebsd,openbsd,win32];
T:=Targets.AddUnit('smpeg');
EndPackage;

View File

@ -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.