aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorAlasdair Campbell <alcoheca@gmail.com>2012-08-03 11:49:52 +0100
committerAlasdair Campbell <alcoheca@gmail.com>2012-09-07 19:20:21 +0100
commit3b6b078e4ddbf343b2b47ff087708f6c2fe2e711 (patch)
treef3d22e9d137f3455824cd628d5315de39ee0c777 /Makefile.in
parent47f3f67eaa6431603ee0133042d6ff2d4d6a2907 (diff)
[UPnP] changed: make UPnP optional (enabled by default), fix some missing #ifdef HAS_UPNP guards
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 352266e270..fb80df6313 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,6 @@ DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
lib/SlingboxLib/SlingboxLib.a \
lib/libRTV/librtv.a \
- lib/libUPnP/libupnp.a \
lib/libXDAAP/libxdaap.a \
lib/libhts/libhts.a \
lib/libsquish/libsquish.a \
@@ -108,6 +107,11 @@ DIRECTORY_ARCHIVES += xbmc/windowing/egl/windowing_egl.a
DIRECTORY_ARCHIVES += xbmc/visualizations/EGLHelpers/eglhelpers.a
endif
+ifeq (@USE_UPNP@,1)
+DIRECTORY_ARCHIVES += lib/libUPnP/libupnp.a \
+ xbmc/network/upnp/upnp.a
+endif
+
ifeq ($(findstring osx,@ARCH@),osx)
DIRECTORY_ARCHIVES += xbmc/osx/osx.a
DIRECTORY_ARCHIVES += xbmc/network/osx/network.a