Skip to content

Commit

Permalink
Merge pull request #14908 from AlwinEsch/remove-cpluff
Browse files Browse the repository at this point in the history
[addons] remove cpluff
  • Loading branch information
AlwinEsch committed Jul 19, 2019
2 parents 1f51aec + 503fc57 commit cc2a7c8
Show file tree
Hide file tree
Showing 263 changed files with 2,046 additions and 28,690 deletions.
24 changes: 0 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -142,30 +142,6 @@ cmake_install.cmake
/lib/*/1
/lib/*/win32/1

# /lib/cpluff/
/lib/cpluff/ABOUT-NLS
/lib/cpluff/Makefile
/lib/cpluff/Makefile.in
/lib/cpluff/aclocal.m4
/lib/cpluff/autom4te.cache/
/lib/cpluff/auxliary/
/lib/cpluff/config.h
/lib/cpluff/config.h.in
/lib/cpluff/config.log
/lib/cpluff/config.status
/lib/cpluff/configure
/lib/cpluff/**/Makefile
/lib/cpluff/**/Makefile.in
/lib/cpluff/console/cpluff-console
/lib/cpluff/examples/cpfile/cpfile
/lib/cpluff/kazlib/.dirstamp
/lib/cpluff/libcpluff/cpluffdef.h
/lib/cpluff/libcpluff/docsrc/Doxyfile-*
/lib/cpluff/libtool
/lib/cpluff/loader/cpluff-loader
/lib/cpluff/m4/
/lib/cpluff/stamp-h1

# /lib/gtest
/lib/gtest/Makefile.in
/lib/gtest/aclocal.m4
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ endforeach()
# Required dependencies. Keep in alphabetical order please
set(required_deps ASS
Cdio
Cpluff
CrossGUID
Curl
FFMPEG
Expand Down Expand Up @@ -287,7 +286,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
${CORE_BUILD_DIR}/DllPaths_generated_android.h @ONLY)
endif()

set(GLOBAL_TARGET_DEPS libcpluff ffmpeg dvdnav crossguid fmt fstrcmp flatbuffers ${PLATFORM_GLOBAL_TARGET_DEPS})
set(GLOBAL_TARGET_DEPS ffmpeg dvdnav crossguid fmt fstrcmp flatbuffers ${PLATFORM_GLOBAL_TARGET_DEPS})

# main library (used for main binary and tests)
add_library(lib${APP_NAME_LC} STATIC $<TARGET_OBJECTS:compileinfo>)
Expand Down
46 changes: 0 additions & 46 deletions cmake/modules/FindCpluff.cmake

This file was deleted.

1 change: 1 addition & 0 deletions cmake/treedata/common/subdirs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
xbmc xbmc
xbmc/addons addons
xbmc/addons/addoninfo addons_addoninfo
xbmc/addons/binary-addons addons_binary-addons
xbmc/addons/interfaces addons_interfaces
xbmc/addons/interfaces/Addon addons_interfaces_addon
Expand Down
17 changes: 0 additions & 17 deletions lib/cpluff/.gitignore

This file was deleted.

57 changes: 0 additions & 57 deletions lib/cpluff/CMakeLists.txt

This file was deleted.

65 changes: 0 additions & 65 deletions lib/cpluff/COPYRIGHT.txt

This file was deleted.

73 changes: 0 additions & 73 deletions lib/cpluff/ChangeLog.txt

This file was deleted.

0 comments on commit cc2a7c8

Please sign in to comment.