Browse Source

build: make default_configuration consistent with BUILDTYPE

v0.9.1-release
Shigeki Ohtsu 13 years ago
committed by Ben Noordhuis
parent
commit
680d75af34
  1. 1
      common.gypi
  2. 1
      configure
  3. 2
      tools/gyp_addon

1
common.gypi

@ -10,7 +10,6 @@
}, },
'target_defaults': { 'target_defaults': {
'default_configuration': 'Debug',
'configurations': { 'configurations': {
'Debug': { 'Debug': {
'defines': [ 'DEBUG', '_DEBUG' ], 'defines': [ 'DEBUG', '_DEBUG' ],

1
configure

@ -189,6 +189,7 @@ def configure_node(o):
o['variables']['node_install_waf'] = b(not options.without_waf) o['variables']['node_install_waf'] = b(not options.without_waf)
o['variables']['host_arch'] = host_arch() o['variables']['host_arch'] = host_arch()
o['variables']['target_arch'] = options.dest_cpu or target_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 # TODO move to node.gyp
if sys.platform == 'sunos5': if sys.platform == 'sunos5':

2
tools/gyp_addon

@ -12,8 +12,10 @@ if __name__ == '__main__':
args = sys.argv[1:] args = sys.argv[1:]
addon_gypi = os.path.join(node_root, 'tools', 'addon.gypi') addon_gypi = os.path.join(node_root, 'tools', 'addon.gypi')
common_gypi = os.path.join(node_root, 'common.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', addon_gypi])
args.extend(['-I', common_gypi]) args.extend(['-I', common_gypi])
args.extend(['-I', config_gypi])
args.extend(['-Dlibrary=shared_library']) args.extend(['-Dlibrary=shared_library'])
args.extend(['-Dvisibility=default']) args.extend(['-Dvisibility=default'])
args.extend(['-Dnode_root_dir=%s' % node_root]) args.extend(['-Dnode_root_dir=%s' % node_root])

Loading…
Cancel
Save