Skip to content

Commit e249be8

Browse files
author
Marco Crespi
committed
Merge branch 'develop'
2 parents 3f32da0 + 29cf2a2 commit e249be8

File tree

125 files changed

+52169
-79840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+52169
-79840
lines changed

binding.gyp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@
1717
'conditions': [
1818
['OS=="win"', {
1919
'dependencies': [
20-
'native/win/foundation/binding.gyp:win-foundation',
21-
'native/win/storage.streams/binding.gyp:win-storage.streams',
22-
'native/win/dev.ble/binding.gyp:win-dev.ble',
23-
'native/win/dev.ble.adv/binding.gyp:win-dev.ble.adv',
24-
'native/win/dev.ble.gap/binding.gyp:win-dev.ble.gap',
25-
'native/win/dev.enum/binding.gyp:win-dev.enum',
26-
'native/win/dev.radios/binding.gyp:win-dev.radios',
20+
'native/win/binding.gyp:win-ble',
2721
],
2822
}],
2923
],

lib/bindings/win/bindings.d.ts.map

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change

lib/bindings/win/bindings.js

Lines changed: 19 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/bindings/win/bindings.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/bindings/win/rt-utils.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/bindings/win/rt-utils.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

native/win/dev.ble/binding.gyp renamed to native/win/binding.gyp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"includes": ["common.gypi"],
77
"targets": [{
8-
"target_name": "win-dev.ble",
8+
"target_name": "win-ble",
99
"sources": [],
1010
"include_dirs": [
1111
"<!(node -e \"require('nan')\")"
@@ -15,7 +15,7 @@
1515
["OS=='win'", {
1616
"libraries": ["-lruntimeobject.lib"],
1717
"sources": [
18-
"_nodert_generated.cpp",
18+
"win-ble.cpp",
1919
"NodeRtUtils.cpp",
2020
"OpaqueWrapper.cpp",
2121
"CollectionsConverterUtils.cpp"
File renamed without changes.

0 commit comments

Comments
 (0)