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

[vuplus_xbmc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6f689cf..cc0b40c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    lib/libXDAAP/libxdaap.a \
                    lib/libhts/libhts.a \
                    lib/libsquish/libsquish.a \
-                   lib/xbmc-dll-symbols/dll-symbols.a \
                    xbmc/addons/addons.a \
                    xbmc/cdrip/cdrip.a \
                    xbmc/cores/AudioEngine/audioengine.a \
@@ -62,6 +61,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    xbmc/interfaces/json-rpc/json-rpc.a \
                    xbmc/linux/linux.a \
                    xbmc/listproviders/listproviders.a \
+                   xbmc/media/media.a \
                    xbmc/music/dialogs/musicdialogs.a \
                    xbmc/music/infoscanner/musicscanner.a \
                    xbmc/music/karaoke/karaoke.a \
@@ -187,10 +187,6 @@ ifeq (@USE_OMXPLAYER@,1)
 DIRECTORY_ARCHIVES += xbmc/cores/omxplayer/omxplayer.a
 endif
 
-ifeq (@USE_LIBAV_HACKS@,1)
-DIRECTORY_ARCHIVES += lib/xbmc-libav-hacks/dll-libavhacks.a
-endif
-
 PAPCODECS_DIRS= \
        lib/nosefart \
        lib/timidity \
@@ -293,15 +289,21 @@ GTEST_DIR = lib/gtest
 GTEST_INCLUDES = -I$(GTEST_DIR)/include
 GTEST_LIBS = $(GTEST_DIR)/lib/.libs/libgtest.a
 
-CHECK_DIRS = xbmc/filesystem/test \
+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/filesystem/test/filesystemTest.a \
+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)
@@ -393,7 +395,6 @@ libaddon: exports
        $(MAKE) -C lib/addons/library.xbmc.gui
        $(MAKE) -C lib/addons/library.xbmc.pvr
 dvdpcodecs: dllloader
-       $(MAKE) -C lib
        $(MAKE) -C lib/libdvd
 
 ifeq (@USE_LIBSTAGEFRIGHT@,1)
@@ -473,13 +474,13 @@ DYNOBJSXBMC+= xbmc/freebsd/freebsd.a
 endif
 
 ifeq (@USE_STATIC_FFMPEG@,1)
-FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
-             lib/ffmpeg/libavfilter/libavfilter.a \
-             lib/ffmpeg/libswresample/libswresample.a \
-             lib/ffmpeg/libavformat/libavformat.a \
-             lib/ffmpeg/libavutil/libavutil.a \
-             lib/ffmpeg/libpostproc/libpostproc.a \
-             lib/ffmpeg/libswscale/libswscale.a
+FFMPEGOBJS = @FFMPEG_LIBDIR@/libavcodec.a \
+             @FFMPEG_LIBDIR@/libavfilter.a \
+             @FFMPEG_LIBDIR@/libswresample.a \
+             @FFMPEG_LIBDIR@/libavformat.a \
+             @FFMPEG_LIBDIR@/libavutil.a \
+             @FFMPEG_LIBDIR@/libpostproc.a \
+             @FFMPEG_LIBDIR@/libswscale.a
 DYNOBJSXBMC+= $(FFMPEGOBJS)
 LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
 
@@ -506,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)
@@ -646,11 +631,11 @@ 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 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
+       @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
        @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
-       @install -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
+       @install -m 0644 media/icon256x256.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
        @test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
 
        @echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc"
@@ -661,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..."