Commit 9bebd4dc authored by Pieter Hintjens's avatar Pieter Hintjens

Problem: local build should do its own .gitignore

Solution: add .gitignore in builds/gyp
parent 8559770c
...@@ -22,7 +22,6 @@ autom4te.cache ...@@ -22,7 +22,6 @@ autom4te.cache
*.html *.html
*.pdf *.pdf
*.ps *.ps
.*
*~ *~
.*~ .*~
curve_keygen curve_keygen
...@@ -170,6 +169,3 @@ zeromq-*.zip ...@@ -170,6 +169,3 @@ zeromq-*.zip
core core
build build
test-suite.log test-suite.log
project.Makefile
libzmq.target.mk
out/
project.Makefile
*.mk
out/
Makefile
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
# #
# gyp --depth=. --format=make # gyp --depth=. --format=make
# make # make
#
{ {
'includes': [ 'includes': [
'project-tests.gypi', 'project-tests.gypi',
...@@ -21,7 +20,7 @@ ...@@ -21,7 +20,7 @@
'conditions': [ 'conditions': [
[ 'OS=="win"', { [ 'OS=="win"', {
'defines': [ 'defines': [
'ZMQ_HAVE_WINDOWS=1', 'ZMQ_HAVE_WINDOWS',
'ZMQ_STATIC', 'ZMQ_STATIC',
'FD_SETSIZE=16384', 'FD_SETSIZE=16384',
'_CRT_SECURE_NO_WARNINGS' '_CRT_SECURE_NO_WARNINGS'
...@@ -34,12 +33,12 @@ ...@@ -34,12 +33,12 @@
}], }],
[ 'OS=="mac"', { [ 'OS=="mac"', {
'defines': [ 'defines': [
'ZMQ_HAVE_OSX=1' 'ZMQ_HAVE_OSX'
] ]
}], }],
[ 'OS=="linux"', { [ 'OS=="linux"', {
'defines': [ 'defines': [
'ZMQ_HAVE_LINUX=1' 'ZMQ_HAVE_LINUX'
], ],
'libraries': [ 'libraries': [
'-lpthread' '-lpthread'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment