diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 6 | ||||
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 1 | ||||
| -rw-r--r-- | xbmc/DllPaths_win32.h | 20 | ||||
| -rw-r--r-- | xbmc/cores/DllLoader/DllLoaderContainer.cpp | 14 |
5 files changed, 28 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index ca160b186e..060b0e5f61 100644 --- a/.gitignore +++ b/.gitignore @@ -577,3 +577,4 @@ lib/addons/library.kodi.inputstream/project/VS2010Express/Release tools/depends/native/TexturePacker/src/Win32/Debug/ tools/depends/native/TexturePacker/src/Win32/Release/ tools/depends/native/TexturePacker/src/Win32/TexturePacker.VC.db +exclude_dll.txt diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 920deff5d9..6d8c3ce57b 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -237,6 +237,9 @@ set WORKSPACE=%CD%\..\.. rem Exclude skins as they're copied by their own script Echo addons\skin.estuary\>>exclude.txt Echo addons\skin.estouchy\>>exclude.txt + + rem Exclude dlls from system to avoid duplicates + Echo .dll>>exclude_dll.txt md BUILD_WIN32\application @@ -249,7 +252,8 @@ set WORKSPACE=%CD%\..\.. xcopy dependencies\*.* BUILD_WIN32\application /Q /I /Y /EXCLUDE:exclude.txt > NUL xcopy ..\..\addons BUILD_WIN32\application\addons /E /Q /I /Y /EXCLUDE:exclude.txt > NUL - xcopy ..\..\system BUILD_WIN32\application\system /E /Q /I /Y /EXCLUDE:exclude.txt > NUL + xcopy ..\..\system\*.dll BUILD_WIN32\application /E /Q /I /Y /EXCLUDE:exclude.txt > NUL + xcopy ..\..\system BUILD_WIN32\application\system /E /Q /I /Y /EXCLUDE:exclude.txt+exclude_dll.txt > NUL xcopy ..\..\media BUILD_WIN32\application\media /E /Q /I /Y /EXCLUDE:exclude.txt > NUL REM create AppxManifest.xml diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index df19cfbf9d..e15853f142 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -233,7 +233,6 @@ Section "${APP_NAME}" SecAPP ;Start copying files SetOutPath "$INSTDIR" File "${app_root}\application\*.*" - File "${app_root}\application\system\*.dll" SetOutPath "$INSTDIR\addons" File /r "${app_root}\application\addons\*.*" File /nonfatal /r "${app_root}\addons\peripheral.*" diff --git a/xbmc/DllPaths_win32.h b/xbmc/DllPaths_win32.h index 3748589f39..2cd8880072 100644 --- a/xbmc/DllPaths_win32.h +++ b/xbmc/DllPaths_win32.h @@ -22,20 +22,20 @@ */ /* libraries */ -#define DLL_PATH_CPLUFF "special://xbmcbin/system/cpluff.dll" -#define DLL_PATH_LIBEXIF "special://xbmcbin/system/libexif.dll" -#define DLL_PATH_LIBCURL "special://xbmcbin/system/libcurl.dll" -#define DLL_PATH_LIBNFS "special://xbmcbin/system/libnfs.dll" -#define DLL_PATH_LIBPLIST "special://xbmcbin/system/airplay/libplist.dll" -#define DLL_PATH_LIBSHAIRPLAY "special://xbmcbin/system/airplay/libshairplay-1.dll" -#define DLL_PATH_LIBCEC "special://xbmcbin/system/libcec.dll" +#define DLL_PATH_CPLUFF "special://xbmcbin/cpluff.dll" +#define DLL_PATH_LIBEXIF "special://xbmcbin/libexif.dll" +#define DLL_PATH_LIBCURL "special://xbmcbin/libcurl.dll" +#define DLL_PATH_LIBNFS "special://xbmcbin/libnfs.dll" +#define DLL_PATH_LIBPLIST "special://xbmcbin/libplist.dll" +#define DLL_PATH_LIBSHAIRPLAY "special://xbmcbin/shairplay.dll" +#define DLL_PATH_LIBCEC "special://xbmcbin/cec.dll" /* VideoPlayer */ -#define DLL_PATH_LIBASS "special://xbmcbin/system/players/dvdplayer/libass.dll" -#define DLL_PATH_LIBDVDNAV "special://xbmcbin/system/players/VideoPlayer/libdvdnav.dll" +#define DLL_PATH_LIBASS "special://xbmcbin/libass.dll" +#define DLL_PATH_LIBDVDNAV "special://xbmcbin/libdvdnav.dll" /* libbluray */ -#define DLL_PATH_LIBBLURAY "special://xbmcbin/system/players/dvdplayer/libbluray.dll" +#define DLL_PATH_LIBBLURAY "special://xbmcbin/libbluray.dll" #endif diff --git a/xbmc/cores/DllLoader/DllLoaderContainer.cpp b/xbmc/cores/DllLoader/DllLoaderContainer.cpp index 9d4d341579..2d11a709c5 100644 --- a/xbmc/cores/DllLoader/DllLoaderContainer.cpp +++ b/xbmc/cores/DllLoader/DllLoaderContainer.cpp @@ -33,7 +33,17 @@ #include "utils/log.h" #include "URL.h" -#define ENV_PARTIAL_PATH "special://xbmcbin/system/;" \ +#if defined(TARGET_WINDOWS) +#define ENV_PARTIAL_PATH \ + "special://xbmcbin/;" \ + "special://xbmcbin/system/;" \ + "special://xbmcbin/system/python/;" \ + "special://xbmc/;" \ + "special://xbmc/system/;" \ + "special://xbmc/system/python/" +#else +#define ENV_PARTIAL_PATH \ + "special://xbmcbin/system/;" \ "special://xbmcbin/system/players/mplayer/;" \ "special://xbmcbin/system/players/VideoPlayer/;" \ "special://xbmcbin/system/players/paplayer/;" \ @@ -43,7 +53,7 @@ "special://xbmc/system/players/VideoPlayer/;" \ "special://xbmc/system/players/paplayer/;" \ "special://xbmc/system/python/" - +#endif #if defined(TARGET_DARWIN) #define ENV_PATH ENV_PARTIAL_PATH \ ";special://frameworks/" |