[win32] update path to cmake C/CXX flag override files

[vuplus_xbmc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e07970f..cc0b40c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -292,14 +292,18 @@ GTEST_LIBS = $(GTEST_DIR)/lib/.libs/libgtest.a
 CHECK_DIRS = xbmc/addons/test \
              xbmc/filesystem/test \
              xbmc/utils/test \
+             xbmc/video/test \
              xbmc/threads/test \
              xbmc/interfaces/python/test \
+             xbmc/cores/AudioEngine/Sinks/test \
              xbmc/test
 CHECK_LIBS = xbmc/addons/test/addonsTest.a \
              xbmc/filesystem/test/filesystemTest.a \
              xbmc/utils/test/utilsTest.a \
+             xbmc/video/test/videoTest.a \
              xbmc/threads/test/threadTest.a \
              xbmc/interfaces/python/test/pythonSwigTest.a \
+             xbmc/cores/AudioEngine/Sinks/test/AESinkTest.a \
              xbmc/test/xbmc-test.a
 
 ifeq (@USE_WAYLAND@,1)
@@ -503,24 +507,8 @@ DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS
 $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
        @$(MAKE) $(if $(V),,-s) -C $(@D)
 
-# sync these entries manually with tools/depends/target/xbmc-addon-bindings/Makefile
-BINDINGS =xbmc/addons/include/xbmc_addon_cpp_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_addon_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_addon_types.h
-BINDINGS+=xbmc/addons/include/xbmc_codec_types.h
-BINDINGS+=xbmc/addons/include/xbmc_epg_types.h
-BINDINGS+=xbmc/addons/include/xbmc_pvr_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_pvr_types.h
-BINDINGS+=xbmc/addons/include/xbmc_scr_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_scr_types.h
-BINDINGS+=xbmc/addons/include/xbmc_vis_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_vis_types.h
-BINDINGS+=xbmc/addons/include/xbmc_stream_utils.hpp
-BINDINGS+=addons/library.xbmc.addon/libXBMC_addon.h
-BINDINGS+=addons/library.xbmc.gui/libXBMC_gui.h
-BINDINGS+=addons/library.xbmc.pvr/libXBMC_pvr.h
-BINDINGS+=addons/library.xbmc.codec/libXBMC_codec.h
-BINDINGS+=xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h
+# Binary Addon bindings
+include xbmc/addons/addon-bindings.mk
 
 libxbmc.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
 ifeq ($(findstring osx,@ARCH@), osx)
@@ -643,7 +631,7 @@ endif
 endif
        @# Icons and links
        @install -d $(DESTDIR)$(datarootdir)/applications
-       @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
+       @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
        @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
        @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
        @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
@@ -658,6 +646,9 @@ endif
        @for f in project/cmake/*.cmake; do \
          install -m 0644 $$f $(DESTDIR)$(libdir)/xbmc; \
        done
+       @for f in project/cmake/scripts/common/*.cmake; do \
+         install -m 0644 $$f $(DESTDIR)$(libdir)/xbmc; \
+       done
 
 uninstall:
        @echo "Removing XBMC..."