From 4c3251ec645c8b71820dab7e51e612e5919d4e75 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Sun, 23 Jul 2017 16:59:43 +0200
Subject: sync with upstream

---
 cmake/installdata/common/addons.txt  | 5 ++---
 cmake/installdata/windows/dlls.txt   | 3 ++-
 cmake/installdata/windows/python.txt | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'cmake/installdata')

diff --git a/cmake/installdata/common/addons.txt b/cmake/installdata/common/addons.txt
index 0c8f296..9efba38 100644
--- a/cmake/installdata/common/addons.txt
+++ b/cmake/installdata/common/addons.txt
@@ -1,6 +1,5 @@
-addons/audioencoder.xbmc.builtin.aac/*
-addons/audioencoder.xbmc.builtin.wav/*
-addons/audioencoder.xbmc.builtin.wma/*
+addons/audioencoder.kodi.builtin.aac/*
+addons/audioencoder.kodi.builtin.wma/*
 addons/game.controller.default/*
 addons/kodi.adsp/*
 addons/kodi.audiodecoder/*
diff --git a/cmake/installdata/windows/dlls.txt b/cmake/installdata/windows/dlls.txt
index de82a86..25c6500 100644
--- a/cmake/installdata/windows/dlls.txt
+++ b/cmake/installdata/windows/dlls.txt
@@ -1,3 +1,4 @@
 system/*.dll .
-project/Win32BuildSetup/dependencies/python27.dll .
+project/BuildDependencies/${ARCH}/bin/libbluray*.jar .
 project/BuildDependencies/${ARCH}/bin/*.dll .
+project/BuildDependencies/mingwlibs/${ARCH}/bin/*.dll .
diff --git a/cmake/installdata/windows/python.txt b/cmake/installdata/windows/python.txt
index e487e3f..5606628 100644
--- a/cmake/installdata/windows/python.txt
+++ b/cmake/installdata/windows/python.txt
@@ -1,2 +1 @@
-system/python/*
 project/BuildDependencies/${ARCH}/bin/Python KEEP_DIR_STRUCTURE system
-- 
cgit v1.2.3