Skip to content

Commit 65b948e

Browse files
authored
Merge pull request #8 from ghostoy/issue-96-win
move conditions using 'component' to 'target_defaults'
2 parents 92f2bdc + 621c3a4 commit 65b948e

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

common.gypi

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333

3434

3535
'conditions': [
36-
['OS=="win" and component=="shared_library"', {
37-
# See http://msdn.microsoft.com/en-us/library/aa652367.aspx
38-
'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL)
39-
'win_debug_RuntimeLibrary%': '3', # 3 = /MDd (debug DLL)
40-
}, {
41-
# See http://msdn.microsoft.com/en-us/library/aa652367.aspx
42-
'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static)
43-
'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static)
44-
}],
4536
['OS == "win"', {
4637
'os_posix': 0,
4738
'v8_postmortem_support%': 'false',
@@ -71,6 +62,19 @@
7162

7263
'target_defaults': {
7364
'default_configuration': 'Release',
65+
'variables': {
66+
'conditions': [
67+
['OS=="win" and component=="shared_library"', {
68+
# See http://msdn.microsoft.com/en-us/library/aa652367.aspx
69+
'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL)
70+
'win_debug_RuntimeLibrary%': '3', # 3 = /MDd (debug DLL)
71+
}, {
72+
# See http://msdn.microsoft.com/en-us/library/aa652367.aspx
73+
'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static)
74+
'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static)
75+
}],
76+
],
77+
},
7478
'configurations': {
7579
'Debug': {
7680
'variables': {

0 commit comments

Comments
 (0)