Skip to content
Permalink
Browse files

Merge branch 'MP1-4962_Update_libbluray_v1.1.2' into MP1.23_Pre_Relea…

…se_test7
  • Loading branch information...
Azzuro committed Jun 25, 2019
2 parents 97ab64e + 6bd6d68 commit 941688077e48998108ae1ab483be13eb26e72789
Showing with 3 additions and 2 deletions.
  1. +1 −1 libbluray
  2. +2 −1 mediaportal/Setup/setup.nsi
@@ -649,7 +649,7 @@ Section "MediaPortal core files (required)" SecCore
File /oname=bluray.dll "${git_DirectShowFilters}\bin_Win32\libbluray\libbluray.dll"
!endif
File /oname=libbluray.jar "${git_Libbluray}\src\.libs\libbluray-.jar"
CopyFiles /SILENT "$MPdir.Base\libbluray.jar" "$MPdir.Base\libbluray-j2se-1.1.1.jar"
CopyFiles /SILENT "$MPdir.Base\libbluray.jar" "$MPdir.Base\libbluray-j2se-1.1.2.jar"
; libbluray - Awt file
SetOutPath "$MPdir.Base\awt"
File /oname=libbluray.jar "${git_Libbluray}\src\.libs\libbluray-awt-.jar"
@@ -991,6 +991,7 @@ Section -Post
Delete "$MPdir.Base\libbluray-j2se-0.6.2.jar"
Delete "$MPdir.Base\libbluray-j2se-1.0.1.jar"
Delete "$MPdir.Base\libbluray-j2se-1.0.2.jar"
Delete "$MPdir.Base\libbluray-j2se-1.1.1.jar"

; MP1-4315 Blow windowplugins dll to separate plugin dlls
${LOG_TEXT} "INFO" "Removing obsolete WindowPlugins.dll"

0 comments on commit 9416880

Please sign in to comment.
You can’t perform that action at this time.