[win32] cmake: make use of ADDONS_TO_BUILD in make-addons.bat

[vuplus_xbmc] / Makefile.include.in

diff --git a/Makefile.include.in b/Makefile.include.in
index 2b7b89a..6ee228a 100644 (file)
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -28,10 +28,15 @@ dvidir=@dvidir@
 pdfdir=@pdfdir@
 psdir=@psdir@
 CXX=@CXX@
+CXX_FOR_BUILD=@CXX_FOR_BUILD@
 CC=@CC@
+CC_FOR_BUILD=@CC_FOR_BUILD@
 CXXFLAGS+=@CXXFLAGS@
+CXXFLAGS_FOR_BUILD+=@CXXFLAGS_FOR_BUILD@
 CFLAGS+=@CFLAGS@
+CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
 LDFLAGS+=@LDFLAGS@
+LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
 INCLUDES+=-I@abs_top_srcdir@/lib
 INCLUDES+=-I@abs_top_srcdir@/xbmc
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
@@ -39,15 +44,8 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
 INCLUDES+=$(sort @INCLUDES@)
-ifneq (@USE_EXTERNAL_FFMPEG@,1)
-       INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
-endif
 INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
 INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
-ifeq (@USE_OMXPLAYER@,1)
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/AudioEngine
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/AudioEngine/Utils
-endif
 DEFINES+= \
        @ARCH_DEFINES@ \
        -D_FILE_DEFINED \
@@ -55,6 +53,7 @@ DEFINES+= \
        -DBIN_INSTALL_PATH="\"$(libdir)/xbmc\"" \
        -DINSTALL_PATH="\"$(datarootdir)/xbmc\"" \
        @SDL_DEFINES@ \
+       @UPNP_DEFINES@ \
        @DEFS@ \
 
 ifeq ($(findstring osx,$(ARCH)), osx)