Permalink
Browse files

build: make default_configuration consistent with BUILDTYPE

  • Loading branch information...
1 parent b92a919 commit 680d75af34f9c6a0b478977e9b3dbc4d25f26402 @shigeki shigeki committed with bnoordhuis Jan 18, 2012
Showing with 3 additions and 1 deletion.
  1. +0 −1 common.gypi
  2. +1 −0 configure
  3. +2 −0 tools/gyp_addon
View
@@ -10,7 +10,6 @@
},
'target_defaults': {
- 'default_configuration': 'Debug',
'configurations': {
'Debug': {
'defines': [ 'DEBUG', '_DEBUG' ],
View
@@ -189,6 +189,7 @@ def configure_node(o):
o['variables']['node_install_waf'] = b(not options.without_waf)
o['variables']['host_arch'] = host_arch()
o['variables']['target_arch'] = options.dest_cpu or target_arch()
+ o['default_configuration'] = 'Debug' if options.debug else 'Release'
# TODO move to node.gyp
if sys.platform == 'sunos5':
View
@@ -12,8 +12,10 @@ if __name__ == '__main__':
args = sys.argv[1:]
addon_gypi = os.path.join(node_root, 'tools', 'addon.gypi')
common_gypi = os.path.join(node_root, 'common.gypi')
+ config_gypi = os.path.join(node_root, 'config.gypi')
args.extend(['-I', addon_gypi])
args.extend(['-I', common_gypi])
+ args.extend(['-I', config_gypi])
args.extend(['-Dlibrary=shared_library'])
args.extend(['-Dvisibility=default'])
args.extend(['-Dnode_root_dir=%s' % node_root])

0 comments on commit 680d75a

Please sign in to comment.