Fix pathing and ia32 detection for openssl dependency on win32

implausible · implausible · commit 9bf69c9f9b4a · 2018-10-02T15:24:04.000-07:00
diff --git a/utils/acquireOpenSSL.js b/utils/acquireOpenSSL.js
@@ -12,7 +12,7 @@ const extractPath = path.join(vendorPath, "openssl");
 
 const getOSName = () => {
   if (process.platform === "win32") {
-    if (process.arch === "x64" || process.env.hasOwnProperty("PROCESSOR_ARCHITEW6432")) {
+    if (process.arch === "x64") {
       return "win64";
     } else {
       return "win32";
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -549,8 +549,8 @@
                 "openssl/include"
               ],
               "libraries": [
-                "openssl/libssl.lib",
-                "openssl/libcrypto.lib"
+                "<(module_root_dir)/vendor/openssl/lib/libssl.lib",
+                "<(module_root_dir)/vendor/openssl/lib/libcrypto.lib"
               ]
             }, {
               "defines": [
