Merge pull request #1991 from ianhattendorf/fix/win32-electron-build-…

…openssl Ensure OpenSSL root included in win32 Electron builds
nodegit · Feb 20, 2024 · 445efc0 · 445efc0
2 parents ebe1864 + b853b3d
commit 445efc0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -283,6 +283,13 @@
             "GIT_WINHTTP",
             "GIT_IO_WSAPOLL"
           ],
+          "conditions": [
+            ["<(is_electron) == 1", {
+              "include_dirs": [
+                "<(electron_openssl_root)/include"
+              ]
+            }]
+          ],
           "msvs_settings": {
             "VCLinkerTool": {
               "AdditionalDependencies": [
@@ -304,9 +311,6 @@
                     "/MACHINE:x86",
                   ],
                 },
-              }],
-              ["<(is_electron) == 1", {
-                "include_dirs": ["<(electron_openssl_root)/include"]
               }]
             ],
           },