Skip to content

Commit

Permalink
Remove built-in support for XMP, GME and SID players
Browse files Browse the repository at this point in the history
Those will be plugins instead
  • Loading branch information
andoma committed Aug 15, 2016
1 parent 2c00e9a commit abbef3e
Show file tree
Hide file tree
Showing 15 changed files with 2 additions and 2,269 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "ext/rtmpdump"]
path = ext/rtmpdump
url = git://github.com/andoma/rtmpdump.git
[submodule "ext/xmp"]
path = ext/xmp
url = git://github.com/andoma/xmp
[submodule "ext/libntfs_ext"]
path = ext/libntfs_ext
url = https://github.com/andoma/libntfs_ext.git
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -242,16 +242,12 @@ SRCS-$(CONFIG_LIBAV) += \
src/fileaccess/fa_video.c \
src/fileaccess/fa_audio.c \

SRCS-$(CONFIG_XMP) += src/fileaccess/fa_xmp.c
SRCS-$(CONFIG_LIBGME) += src/fileaccess/fa_gmefile.c
SRCS-$(CONFIG_LOCATEDB) += src/fileaccess/fa_locatedb.c
SRCS-$(CONFIG_SPOTLIGHT) += src/fileaccess/fa_spotlight.c
SRCS-$(CONFIG_LIBNTFS) += src/fileaccess/fa_ntfs.c
SRCS-$(CONFIG_NATIVESMB) += src/fileaccess/smb/fa_nativesmb.c \
src/fileaccess/smb/nmb.c
SRCS-$(CONFIG_RAR) += src/fileaccess/fa_rar.c
SRCS-$(CONFIG_SID) += src/fileaccess/fa_sidfile.c \
ext/audio/sid.c

BUNDLES += res/fileaccess

Expand Down
13 changes: 1 addition & 12 deletions configure.linux
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ enable inotify
enable realpath
enable webkit
enable librtmp

#enable airplay -- not functional yet
#enable libxrandr -- code does not really work yet

Expand Down Expand Up @@ -559,18 +560,6 @@ if enabled nvctrl; then
fi



#
# libgme
#
if enabled libgme; then

check_header "gme/gme.h" || fatal "libgme" "Missing include file gme/gme.h"
check_lib "gme" || fatal "libgme" "Unable to link with libgme"
echo >>${CONFIG_MAK} "LDFLAGS_cfg += -lgme"
fi


#
# Check for valgrind include files
#
Expand Down
1 change: 0 additions & 1 deletion configure.nacl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ enable sqlite_locking
enable glw_backend_opengl_es


disable xmp
disable ftpserver
disable netlog

Expand Down
1 change: 0 additions & 1 deletion configure.sunxi
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ fi

libav_setup
rtmpdump_setup
xmp_setup
gumbo_setup

cat >> ${CONFIG_MAK} <<EOF
Expand Down
Loading

0 comments on commit abbef3e

Please sign in to comment.