Skip to content

Instantly share code, notes, and snippets.

Created September 24, 2012 21:07
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anonymous/a0817621671657de81fb to your computer and use it in GitHub Desktop.
Save anonymous/a0817621671657de81fb to your computer and use it in GitHub Desktop.
From e2c2376638354b94892d5971390e870cb3cb112f Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Mon, 24 Sep 2012 23:07:33 +0200
Subject: [PATCH 1/1] Make it build on Windows
This assumes that the openssl symbols are exported by node.exe.
---
binding.gyp | 11 +++++++++++
src/tlsnappy.cc | 9 +++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/binding.gyp b/binding.gyp
index 24f7de4..15c6539 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -12,6 +12,17 @@
["node_shared_openssl=='false'", {
"include_dirs": [
"<(node_root_dir)/deps/openssl/openssl/include"
+ ],
+ "conditions" : [
+ ["target_arch=='ia32'", {
+ "include_dirs": [ "<(node_root_dir)/deps/openssl/config/piii" ]
+ }],
+ ["target_arch=='x64'", {
+ "include_dirs": [ "<(node_root_dir)/deps/openssl/config/k8" ]
+ }],
+ ["target_arch=='arm'", {
+ "include_dirs": [ "<(node_root_dir)/deps/openssl/config/arm" ]
+ }]
]
}]
]
diff --git a/src/tlsnappy.cc b/src/tlsnappy.cc
index 8d818ef..7a4caa6 100644
--- a/src/tlsnappy.cc
+++ b/src/tlsnappy.cc
@@ -1,14 +1,15 @@
-#include "tlsnappy.h"
-
-#include "openssl/ssl.h"
-#include "openssl/err.h"
#include "node.h"
#include "node_buffer.h"
#include "node_object_wrap.h"
#include "ngx-queue.h"
+
+#include "tlsnappy.h"
#include "ring.h"
#include "common.h"
+#include "openssl/ssl.h"
+#include "openssl/err.h"
+
namespace tlsnappy {
using namespace v8;
--
1.7.11.msysgit.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment