Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

WIP

  • Loading branch information...
commit 518430db3a8e2e5374136a0ec9754b6d5a7e8ee6 1 parent 81a999c
@ry ry authored
Showing with 8 additions and 2 deletions.
  1. +3 −1 .gitignore
  2. +3 −0  deps/http_parser/http_parser.gyp
  3. +2 −1  gyp/all.gyp
View
4 .gitignore
@@ -1,9 +1,9 @@
+
.waf*
tags
.lock-wscript
*.pyc
doc/api.xml
-tools/nodejs.pc
tmp/
node
node_g
@@ -16,4 +16,6 @@ gyp-mac-tool
gyp/all.Makefile
gyp/js2c.host.mk
gyp/node.target.mk
+gyp/node_js2c.host.mk
out/
+Makefile
View
3  deps/http_parser/http_parser.gyp
@@ -26,6 +26,7 @@
},
'defines': [ 'HTTP_PARSER_STRICT=0' ],
'sources': [ './http_parser.c', ],
+<<<<<<< HEAD
'conditions': [
['OS=="win"', {
'msvs_settings': {
@@ -37,6 +38,8 @@
},
}]
],
+=======
+>>>>>>> WIP
},
{
View
3  gyp/all.gyp
@@ -4,8 +4,9 @@
'target_name': 'node',
'type': 'executable',
'dependencies': [
-# '../deps/http_parser/http_parser.gyp:http_parser',
+ '../deps/http_parser/http_parser.gyp:http_parser',
'../deps/v8/tools/gyp/v8.gyp:v8_snapshot',
+ '../deps/uv/build/all.gyp:uv',
'node_js2c#host'
],
'include_dirs': [ 'src' ],
Please sign in to comment.
Something went wrong with that request. Please try again.