3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: local build should do its own .gitignore

Browse Source 
Solution: add .gitignore in builds/gyp
This commit is contained in:
Pieter Hintjens 2016-02-12 17:29:36 +01:00
parent 8559770cf3
commit 9bebd4dce9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -22,7 +22,6 @@ autom4te.cache
*.html *.html
*.pdf *.pdf
*.ps *.ps
.*
*~ *~
.*~ .*~
curve_keygen curve_keygen
@ -170,6 +169,3 @@ zeromq-*.zip
core core
build build
test-suite.log test-suite.log
project.Makefile
libzmq.target.mk
out/

5
builds/gyp/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
project.Makefile
*.mk
out/
Makefile

7
builds/gyp/project.gyp
View File

@ -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 @@
'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 @@
}], }],
[ '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'