diff --git a/gradle/.idea/misc.xml b/gradle/.idea/misc.xml
index 7bfef59d..fdae1d0d 100644
--- a/gradle/.idea/misc.xml
+++ b/gradle/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/lib/bin/build_lib b/lib/bin/build_lib
index e9c4027c..f9a03cc5 100755
--- a/lib/bin/build_lib
+++ b/lib/bin/build_lib
@@ -222,7 +222,7 @@ _finalize_merge() {
         'windows')
             for arch; do
                 install -d "$prefix/out/lib/$arch"
-                install -p "$prefix/Win32/"*.lib "$prefix/out/lib/"
+                install -p "$prefix/$arch/"*.lib "$prefix/out/lib/$arch/"
             done
         ;;
         'macos'|'ios')
diff --git a/platform-independent/c/core/build.gradle b/platform-independent/c/core/build.gradle
index 66d01a3f..4de67c83 100644
--- a/platform-independent/c/core/build.gradle
+++ b/platform-independent/c/core/build.gradle
@@ -51,12 +51,23 @@ library {
         // Resolve a standard name for the platform.
         def platform = standardOperatingSystem( targetPlatform )
 
+        if (project.tasks.findByName('buildLibSodium') == null)
+            archive.dependsOn task( type: Exec, 'buildLibSodium', {
+                workingDir file( "$rootDir/../lib/bin" )
+                commandLine 'bash', "./build_libsodium-${platform}"
+            } )
+//        if (project.tasks.findByName('buildLibJson-c') == null)
+//            archive.dependsOn task( type: Exec, 'buildLibJson-c', {
+//                workingDir file( "$rootDir/../lib/bin" )
+//                commandLine 'bash', "./build_libjson-c-${platform}"
+//            } )
+
         project.dependencies {
             // Depend on JDK for JNI support.
             add( includePathConfiguration.name,
                  files( new File( Jvm.current().javaHome, "include" ) ) { first().eachDir { from it } } )
 
-            // Depend on libsodium from `lib`; run `lib/bin/build_libsodium-${platform}` first.
+            // Depend on libsodium from `lib`.
             add( includePathConfiguration.name,
                  files( "../../../lib/libsodium/src/libsodium/include" ) )
             add( linkLibraries.name,
@@ -65,6 +76,7 @@ library {
     }
 }
 
+
 static String standardOperatingSystem(NativePlatform platform) {
     OperatingSystem os = platform.getOperatingSystem()
     if (os.isWindows()) {