Trying to get openssh building

John Haley · tbranyen · commit f4ab43cb63a7 · 2014-10-23T10:47:35.000-04:00
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -14,7 +14,8 @@
       "dependencies": [
         "zlib",
         "http_parser",
-        "libssh2"
+        "libssh2",
+        "openssl.gyp:openssl"
       ],
       "sources": [
         "libgit2/src/array.h",
@@ -335,9 +336,7 @@
       "include_dirs": [
         "libgit2/include",
         "libgit2/src",
-        "libgit2/deps/regex",
-        "libssh2/include",
-        "libssh2/src"
+        "libgit2/deps/regex"
       ],
       "direct_dependent_settings": {
         "include_dirs": [
@@ -451,8 +450,15 @@
           "include_dirs": [
             "libssh2/src",
             "libssh2/win32",
-            "libssh2/include",
+            "libssh2/include"
           ],
+          "direct_dependent_settings": {
+            "include_dirs": [
+                "libssh2/src",
+                "libssh2/win32",
+                "libssh2/include"
+            ]
+          }
         }],
       ]
     },
diff --git a/vendor/openssl.gyp b/vendor/openssl.gyp
@@ -2,9 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  "includes": [
-    "common.gypi",
-  ],
+  "variables": {
+    "target_arch%": "x86",
+    "library%": "static_library",
+    "openssl_enable_asm%": 0, # only supported with the Visual Studio 2012 (VC11) toolchain.
+    "gcc_version%": 0,
+    "is_clang%": 0,
+  },
   "targets": [
     {
       "target_name": "openssl",
