Skip to content

Commit

Permalink
Merge pull request #5329 from wsnipex/binary_addon_depends
Browse files Browse the repository at this point in the history 
[binary addons] move RSXS and some visualizations to binary addons
  • Loading branch information
@Montellese
Montellese committed Sep 4, 2015
2 parents 070c44f + 1ac88f9 commit 4eb1437
Show file tree
Hide file tree
Showing 2,307 changed files with 89 additions and 420,368 deletions.
117 changes: 0 additions & 117 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,11 @@ config.log
/*.patch

# /addons/
/addons/com.nullsoft.milkdrop.xbmc/*.vis
/addons/org.xbmc.addons.dxspectrum/*.vis
/addons/packages
/addons/screensaver.rsxs.euphoria/Euphoria.xbs
/addons/screensaver.rsxs.plasma/Plasma.xbs
/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs
/addons/skin.confluence/media/Makefile
/addons/skin.confluence/media/Textures.xbt
/addons/skin.pm3-hd/media/Textures.xbt
/addons/visualization.dxspectrum/Spectrum_win32dx.vis
/addons/visualization.glspectrum/opengl_spectrum.vis
/addons/visualization.milkdrop/MilkDrop_win32dx.vis
/addons/visualization.projectm/projectM.vis
/addons/visualization.projectm/resources/presets.zip
/addons/visualization.vortex/Vortex_win32dx.vis
/addons/visualization.waveform/Waveform.vis
/addons/visualization.waveform/Waveform_win32.vis
/addons/visualization.itunes/iTunes.mvis
/addons/visualization.fishbmc/fishbmc.vis
/addons/script.module.pil/
/addons/audioencoder.*
/addons/pvr.*
Expand Down Expand Up @@ -411,12 +397,6 @@ lib/cpluff/stamp-h1
# /system
/system/zlib1.dll


# /screensavers/
/screensavers/Solarwinds.xbs
/screensavers/Euphoria.xbs
/screensavers/Plasma.xbs

# /skin/Confluence/
/skin/Confluence/BUILD

Expand Down Expand Up @@ -494,7 +474,6 @@ lib/cpluff/stamp-h1

# /xbmc/addons/
/xbmc/addons/Makefile
/xbmc/addons/visualization.waveform

# /xbmc/android
/xbmc/android/Makefile
Expand Down Expand Up @@ -586,105 +565,9 @@ lib/cpluff/stamp-h1
# /xbmc/main/posix/
xbmc/main/posix/Makefile

#/xbmc/screensavers/
/xbmc/screensavers/Makefile
/xbmc/screensavers/rsxs-0.9/Makefile
/xbmc/screensavers/rsxs-0.9/configure
/xbmc/screensavers/rsxs-0.9/config.h
/xbmc/screensavers/rsxs-0.9/config.log
/xbmc/screensavers/rsxs-0.9/config/Makefile
/xbmc/screensavers/rsxs-0.9/lib/Makefile
/xbmc/screensavers/rsxs-0.9/libltdl/Makefile
/xbmc/screensavers/rsxs-0.9/src/Makefile
/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile
/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile
/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile
/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile
/xbmc/screensavers/rsxs-0.9/src/flux/Makefile
/xbmc/screensavers/rsxs-0.9/src/helios/Makefile
/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile
/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile
/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile
/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile
/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile
/xbmc/screensavers/rsxs-0.9/xbmc/Makefile
/xbmc/screensavers/rsxs-0.9/autom4te.cache/
/xbmc/screensavers/rsxs-0.9/lib/alloca.h
/xbmc/screensavers/rsxs-0.9/lib/argz.h
/xbmc/screensavers/rsxs-0.9/lib/getopt.h
/xbmc/screensavers/rsxs-0.9/rsxs.spec
/xbmc/screensavers/rsxs-0.9/src/.dirstamp
/xbmc/screensavers/rsxs-0.9/src/euphoria/rs-euphoria
/xbmc/screensavers/rsxs-0.9/src/plasma/rs-plasma
/xbmc/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds
/xbmc/screensavers/rsxs-0.9/stamp-h1
/xbmc/screensavers/rsxs-0.9/aclocal.m4
/xbmc/screensavers/rsxs-0.9/compile
/xbmc/screensavers/rsxs-0.9/config.guess
/xbmc/screensavers/rsxs-0.9/config.h.in
/xbmc/screensavers/rsxs-0.9/config.h.in~
/xbmc/screensavers/rsxs-0.9/config.sub
/xbmc/screensavers/rsxs-0.9/config/Makefile.in
/xbmc/screensavers/rsxs-0.9/depcomp
/xbmc/screensavers/rsxs-0.9/INSTALL
/xbmc/screensavers/rsxs-0.9/install-sh
/xbmc/screensavers/rsxs-0.9/lib/Makefile.in
/xbmc/screensavers/rsxs-0.9/libltdl/Makefile.in
/xbmc/screensavers/rsxs-0.9/Makefile.in
/xbmc/screensavers/rsxs-0.9/missing
/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in

#/xbmc/utils
/xbmc/utils/Makefile

#/xbmc/visualizations/
/xbmc/visualizations/DirectXSpectrum/Debug (DirectX)
/xbmc/visualizations/DirectXSpectrum/Release (DirectX)
/xbmc/visualizations/EGLHelpers/Makefile
/xbmc/visualizations/fishBMC/Makefile
/xbmc/visualizations/Goom/Makefile
/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4
/xbmc/visualizations/Goom/goom2k4-0/compile
/xbmc/visualizations/Goom/goom2k4-0/configure
/xbmc/visualizations/Goom/goom2k4-0/INSTALL
/xbmc/visualizations/Goom/goom2k4-0/mkinstalldirs
/xbmc/visualizations/Goom/goom2k4-0/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/config.guess
/xbmc/visualizations/Goom/goom2k4-0/config.sub
/xbmc/visualizations/Goom/goom2k4-0/depcomp
/xbmc/visualizations/Goom/goom2k4-0/install-sh
/xbmc/visualizations/Goom/goom2k4-0/ltmain.sh
/xbmc/visualizations/Goom/goom2k4-0/missing
/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/ylwrap
/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/confdefs.h
/xbmc/visualizations/Milkdrop/Debug
/xbmc/visualizations/Milkdrop/Release
/xbmc/visualizations/OpenGLSpectrum/Makefile
/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.metaproj
/xbmc/visualizations/WaveForm/Makefile
/xbmc/visualizations/WaveForm/Debug (DirectX)
/xbmc/visualizations/WaveForm/Release (DirectX)
/xbmc/visualizations/XBMCProjectM/Makefile
/xbmc/visualizations/XBMCProjectM/libprojectM/Makefile
/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeCache.txt
/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeFiles/
/xbmc/visualizations/XBMCProjectM/libprojectM/cmake_install.cmake
/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp

#/xbmc/win32/
/xbmc/win32/XBMC_PC.rc
# no longer used
Expand Down
69 changes: 5 additions & 64 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ endif
ifeq (@USE_OPENGLES@,1)
DIRECTORY_ARCHIVES += xbmc/rendering/gles/rendering_gles.a
DIRECTORY_ARCHIVES += xbmc/windowing/egl/windowing_egl.a
DIRECTORY_ARCHIVES += xbmc/visualizations/EGLHelpers/eglhelpers.a
endif

ifeq (@USE_UPNP@,1)
Expand All @@ -133,9 +132,6 @@ ifeq (@USE_MDNSEMBEDDED@,1)
DIRECTORY_ARCHIVES += xbmc/network/mdns/mdns.a
endif

INSTALL_FILTER = .*visualization\.dxspectrum.*
INSTALL_FILTER += .*visualization\.milkdrop.*

ifeq ($(findstring osx,@ARCH@),osx)
DIRECTORY_ARCHIVES += xbmc/osx/osx.a
DIRECTORY_ARCHIVES += xbmc/network/osx/network.a
Expand Down Expand Up @@ -193,43 +189,6 @@ LIB_DIRS=\
lib/cpluff \
lib/xbmc-dll-symbols

SS_DIRS=
ifneq (@DISABLE_RSXS@,1)
SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
else
INSTALL_FILTER+= .*screensaver\.rsxs.*
endif

ifneq (@DISABLE_SPECTRUM@,1)
VIS_DIRS+= xbmc/visualizations/OpenGLSpectrum
else
INSTALL_FILTER+= .*visualization\.glspectrum.*
endif

ifneq (@DISABLE_WAVEFORM@,1)
VIS_DIRS+= xbmc/visualizations/WaveForm
else
INSTALL_FILTER+= .*visualization\.waveform.*
endif

ifneq (@DISABLE_FISHBMC@,1)
VIS_DIRS+= xbmc/visualizations/fishBMC
else
INSTALL_FILTER+= .*visualization\.fishbmc.*
endif

ifneq (@DISABLE_PROJECTM@,1)
VIS_DIRS+= xbmc/visualizations/XBMCProjectM
else
INSTALL_FILTER+= .*visualization\.projectm.*
endif

ifneq (@DISABLE_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
else
INSTALL_FILTER+= .*visualization\.goom.*
endif

LIBADDON_DIRS=\
lib/addons/library.xbmc.addon \
lib/addons/library.kodi.adsp \
Expand Down Expand Up @@ -321,7 +280,7 @@ all : $(FINAL_TARGETS)

include Makefile.include

.PHONY : dllloader exports visualizations screensavers eventclients \
.PHONY : dllloader exports eventclients \
dvdpcodecs dvdpextcodecs imagelib codecs externals force skins libaddon check \
testframework testsuite

Expand Down Expand Up @@ -367,20 +326,6 @@ exports: xbmc/cores/DllLoader/exports/exports.a xbmc/cores/DllLoader/exports/uti
$(MAKE) -C xbmc/cores/DllLoader/exports wrapper.def
dllloader: exports xbmc/cores/DllLoader/dllloader.a

ifeq (@USE_OPENGLES@,1)
EGLHELPERS=xbmc/visualizations/EGLHelpers/eglhelpers.a
endif

$(VIS_DIRS): force exports $(EGLHELPERS)
$(MAKE) -C $@

$(SS_DIRS): force exports
$(MAKE) -C $@

visualizations: $(VIS_DIRS)

screensavers: $(SS_DIRS)

libaddon: exports
$(MAKE) -C lib/addons/library.xbmc.addon
$(MAKE) -C lib/addons/library.kodi.adsp
Expand Down Expand Up @@ -415,10 +360,10 @@ codecs: dvdpcodecs dvdpextcodecs

libs: $(LIBSSE4) imagelib libexif system/libcpluff-@ARCH@.so

externals: codecs libs visualizations screensavers libaddon
externals: codecs libs libaddon

xcode_depends: \
codecs libs visualizations screensavers eventclients skins libaddon
codecs libs eventclients skins libaddon

DYNOBJSXBMC= \
xbmc/linux/linux.a \
Expand Down Expand Up @@ -464,7 +409,7 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS))

DIRS= $(BIN_DIRS) $(EC_DIRS) $(DVDPCODECS_DIRS) \
$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
$(LIB_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main

$(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
@$(MAKE) $(if $(V),,-s) -C $(@D)
Expand Down Expand Up @@ -645,17 +590,13 @@ clean-dvdpcodecs:
for d in $(DVDPCODECS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-libs:
for d in $(LIB_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-screensavers:
for d in $(SS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-visualisations:
for d in $(VIS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-libaddons:
for d in $(LIBADDON_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done

clean-codecs: clean-dvdpcodecs

clean-externals: clean-codecs clean-eventclients clean-libs \
clean-screensavers clean-visualisations clean-libaddons
clean-libaddons

ifeq (1,@GTEST_CONFIGURED@)
check: testsuite
Expand Down

0 comments on commit 4eb1437

Please sign in to comment.