From 680d75af34f9c6a0b478977e9b3dbc4d25f26402 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Wed, 18 Jan 2012 18:37:02 +0900 Subject: [PATCH] build: make default_configuration consistent with BUILDTYPE --- common.gypi | 1 - configure | 1 + tools/gyp_addon | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 00fad43..7c462e7 100644 --- a/common.gypi +++ b/common.gypi @@ -10,7 +10,6 @@ }, 'target_defaults': { - 'default_configuration': 'Debug', 'configurations': { 'Debug': { 'defines': [ 'DEBUG', '_DEBUG' ], diff --git a/configure b/configure index e72f9ea..7734a17 100755 --- a/configure +++ b/configure @@ -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': diff --git a/tools/gyp_addon b/tools/gyp_addon index 2dac0e0..c47c37f 100755 --- a/tools/gyp_addon +++ b/tools/gyp_addon @@ -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]) -- 2.7.4