diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-07-22 22:38:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 22:38:17 +0200 |
| commit | db51af40b5c6854302766bd98f3fd3d96363c00c (patch) | |
| tree | acc87d0e0cfc51855902adac365fdc2686e22a97 /project | |
| parent | 6638834ad3602b3177f498520e2579abd98f5d2b (diff) | |
| parent | e3391adb4f74b0a13de1e76a967fd604771ad6e8 (diff) | |
Merge pull request #10155 from Paxxi/dll_loader
[xbmc][fix] Fix on demand dll loading to point to the correct files
Diffstat (limited to 'project')
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 6 | ||||
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 1 |
2 files changed, 5 insertions, 2 deletions
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.*" |