Merge pull request #671 from metsma/minizip

Fix minizip unicode support

Author: kristelmerilain

examples/java/build.gradle

@@ -14,9 +14,20 @@ jar {
         attributes 'Main-Class': 'ee.ria.libdigidocpp.libdigidocpp'
     }
 }
-def digidocppJarPath = file('/usr/share/digidocpp/digidocpp.jar').exists() ?
-    '/usr/share/digidocpp/digidocpp.jar' :
-    '/Library/Java/Extensions/digidocpp.jar'
+def digidocppJarPath = '/usr/share/digidocpp/digidocpp.jar'
+def nativeLibDir = null
+if (System.properties['os.name'].toLowerCase().contains('windows')) {
+    digidocppJarPath = 'C:\\Program Files\\libdigidocpp\\digidocpp.jar'
+    nativeLibDir = 'C:\\Program Files\\libdigidocpp'
+} else if (System.properties['os.name'].toLowerCase().contains('mac')) {
+    digidocppJarPath = '/Library/Java/Extensions/digidocpp.jar'
+}
 dependencies {
     implementation files(digidocppJarPath)
+}
+tasks.withType(JavaExec).configureEach {
+    if (nativeLibDir != null) {
+        environment 'PATH', "${nativeLibDir};" + System.getenv('PATH')
+        jvmArgs "-Djava.library.path=${nativeLibDir}"
+    }
 }

src/CMakeLists.txt

@@ -2,9 +2,10 @@ if(TARGET PkgConfig::MINIZIP)
     add_library(minizip ALIAS PkgConfig::MINIZIP)
 else()
     message(STATUS "MiniZip not found; using bundled copy.")
-    add_library(minizip STATIC minizip/zip.c minizip/unzip.c minizip/ioapi.c $<$<C_COMPILER_ID:MSVC>:minizip/iowin32.c>)
+    add_library(minizip STATIC minizip/zip.c minizip/unzip.c minizip/ioapi.c $<$<PLATFORM_ID:Windows>:minizip/iowin32.c>)
     target_compile_options(minizip PRIVATE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unused-parameter -Wno-unused-value>)
-    set_target_properties(minizip PROPERTIES COMPILE_DEFINITIONS "NOUNCRYPT;NOCRYPT" POSITION_INDEPENDENT_CODE YES)
+    set_target_properties(minizip PROPERTIES POSITION_INDEPENDENT_CODE YES)
+    target_compile_definitions(minizip PRIVATE NOUNCRYPT NOCRYPT $<$<PLATFORM_ID:Windows>:WIN32_LEAN_AND_MEAN UNICODE>)
     target_link_libraries(minizip ZLIB::ZLIB)
 endif()