Skip to content

Commit 94834cb

Browse files
committed
Merge pull request nodegit#922 from viatsko/fix-libgit2-crash
Fix compilation for systems != windows and crash in diff function
2 parents d5d7dec + f250a36 commit 94834cb

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

vendor/libgit2.gyp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@
333333
# 'InterlockedDecrement' undefined; assuming extern returning int.
334334
4013,
335335
],
336+
"include_dirs": [
337+
"libgit2/deps/regex"
338+
],
336339
"sources": [
337340
"libgit2/src/win32/w32_buffer.c",
338341
"libgit2/src/win32/w32_buffer.h",
@@ -390,8 +393,7 @@
390393
],
391394
"include_dirs": [
392395
"libgit2/include",
393-
"libgit2/src",
394-
"libgit2/deps/regex"
396+
"libgit2/src"
395397
],
396398
"direct_dependent_settings": {
397399
"include_dirs": [
@@ -427,9 +429,15 @@
427429
"STDC",
428430
"NO_GZIP",
429431
],
432+
"conditions": [
433+
["OS=='win'", {
434+
"include_dirs": [
435+
"libgit2/deps/regex"
436+
]
437+
}]
438+
],
430439
"include_dirs": [
431-
"libgit2/include",
432-
"libgit2/deps/regex",
440+
"libgit2/include"
433441
],
434442
"direct_dependent_settings": {
435443
"include_dirs": [

0 commit comments

Comments
 (0)