@@ -100,12 +100,24 @@ public partial class MainForm : Form
100100 @"OpenCvSharp.WpfExtensions\OpenCvSharp.WpfExtensions.xml" ,
101101 } ;
102102
103- private static readonly Dictionary < string , string [ ] > platforms = new Dictionary < string , string [ ] >
103+ private static readonly IReadOnlyDictionary < string , string [ ] > architectures = new Dictionary < string , string [ ] >
104104 {
105105 [ "win" ] = new [ ] { "x86" , "x64" } ,
106106 [ "uwp" ] = new [ ] { "x86" , "x64" , "ARM" } ,
107107 } ;
108108
109+ private static readonly IReadOnlyDictionary < string , string > uwpNativeDllDirectories = new Dictionary < string , string >
110+ {
111+ [ "x86" ] = @"opencv_files\opencv451_uwp_x86\x86\vc16\bin" ,
112+ [ "x64" ] = @"opencv_files\opencv451_uwp_x64\x64\vc16\bin" ,
113+ [ "ARM" ] = @"opencv_files\opencv451_uwp_ARM\x86\vc16\bin" ,
114+ } ;
115+ private static readonly IReadOnlyList < string > uwpNativeDlls = new [ ]
116+ {
117+ "opencv_world451.dll" ,
118+ "opencv_img_hash451.dll"
119+ } ;
120+
109121 private static readonly string [ ] languages = {
110122 "Release" ,
111123 "Release-JP"
@@ -244,23 +256,38 @@ private void MakeBinaryPackage(string dir, string dirDst, string opencvVersion)
244256 }
245257
246258 // OpenCvSharpExtern.dllを、Windows用とUWP用それぞれで、x86/x64それぞれを入れる
247- foreach ( var p in platforms )
259+ foreach ( var p in architectures )
248260 {
249- foreach ( var pf in p . Value )
261+ foreach ( var arch in p . Value )
250262 {
251263 var externDir = Path . Combine ( dirSrc , "Release" ) ;
252264 if ( p . Key == "uwp" )
253265 externDir = Path . Combine ( externDir , "uwpOpenCvSharpExtern" ) ;
254- var pfExtern = ( pf == "x86" ) ? "Win32" : "x64" ;
266+ var pfExtern = ( arch == "x86" ) ? "Win32" : "x64" ;
255267 externDir = Path . Combine ( externDir , pfExtern ) ;
256268
257269 foreach ( var ext in new [ ] { "dll" , "pdb" } )
258270 {
259271 var e = zf . AddFile ( Path . Combine ( externDir , $ "OpenCvSharpExtern.{ ext } ") ) ;
260272
261- var dstDirectory = Path . Combine ( "NativeLib" , p . Key , pf ) ;
273+ var dstDirectory = Path . Combine ( "NativeLib" , p . Key , arch ) ;
262274 e . FileName = Path . Combine ( dstDirectory , $ "OpenCvSharpExtern.{ ext } ") ;
263275 }
276+
277+ // UWPはopencv_world.dll等も入れる
278+ if ( p . Key == "uwp" )
279+ {
280+ var uwpNativeDllDir = uwpNativeDllDirectories [ arch ] ;
281+ uwpNativeDllDir = Path . Combine ( dir , uwpNativeDllDir ) ;
282+ foreach ( var dllName in uwpNativeDlls )
283+ {
284+ var uwpNativeDll = Path . Combine ( uwpNativeDllDir , dllName ) ;
285+ var e = zf . AddFile ( uwpNativeDll ) ;
286+
287+ var dstDirectory = Path . Combine ( "NativeLib" , "uwp" , arch ) ;
288+ e . FileName = Path . Combine ( dstDirectory , dllName ) ;
289+ }
290+ }
264291 }
265292 }
266293
0 commit comments