diff options
| author | Scott Blomquist <sblom@microsoft.com> | 2012-12-21 00:06:21 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-12-21 11:05:55 -0800 |
| commit | 841b7f534b80b86d4f815ed3d66f7ac9c1944841 (patch) | |
| tree | f79d3e76af728aca6cd915d8a5539726cfc35992 /node.gyp | |
| parent | 244924823ec0db092a39044408a1adb6e48cf3c3 (diff) | |
| download | node-new-841b7f534b80b86d4f815ed3d66f7ac9c1944841.tar.gz | |
Ease building with VS Express by checking in generated files.
Diffstat (limited to 'node.gyp')
| -rw-r--r-- | node.gyp | 28 |
1 files changed, 16 insertions, 12 deletions
@@ -7,6 +7,7 @@ 'node_use_dtrace%': 'false', 'node_use_etw%': 'false', 'node_use_perfctr%': 'false', + 'node_has_winsdk%': 'false', 'node_shared_v8%': 'false', 'node_shared_zlib%': 'false', 'node_shared_http_parser%': 'false', @@ -72,6 +73,7 @@ 'include_dirs': [ 'src', + 'src/gen', 'deps/uv/src/ares', '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h ], @@ -191,8 +193,8 @@ 'src/node_win32_etw_provider-inl.h', 'src/node_win32_etw_provider.cc', 'src/node_dtrace.cc', - '<(SHARED_INTERMEDIATE_DIR)/node_etw_provider.h', - '<(SHARED_INTERMEDIATE_DIR)/node_etw_provider.rc', + 'src/gen/node_etw_provider.h', + 'src/gen/node_etw_provider.rc', ] } ], [ 'node_use_perfctr=="true"', { @@ -203,7 +205,7 @@ 'src/node_win32_perfctr_provider.cc', 'src/node_counters.cc', 'src/node_counters.h', - '<(SHARED_INTERMEDIATE_DIR)/node_perfctr_provider.rc', + 'src/gen/node_perfctr_provider.rc', ] } ], [ 'node_shared_v8=="false"', { @@ -286,16 +288,17 @@ 'target_name': 'node_etw', 'type': 'none', 'conditions': [ - [ 'node_use_etw=="true"', { + [ 'node_use_etw=="true" and node_has_winsdk=="true"', { 'actions': [ { 'action_name': 'node_etw', 'inputs': [ 'src/res/node_etw_provider.man' ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_etw_provider.rc', - '<(SHARED_INTERMEDIATE_DIR)/node_etw_provider.h', + 'src/gen/node_etw_provider.rc', + 'src/gen/node_etw_provider.h', + 'src/gen/node_etw_providerTEMP.BIN', ], - 'action': [ 'mc <@(_inputs) -h <(SHARED_INTERMEDIATE_DIR) -r <(SHARED_INTERMEDIATE_DIR)' ] + 'action': [ 'mc <@(_inputs) -h src/gen -r src/gen' ] } ] } ] @@ -306,18 +309,19 @@ 'target_name': 'node_perfctr', 'type': 'none', 'conditions': [ - [ 'node_use_perfctr=="true"', { + [ 'node_use_perfctr=="true" and node_has_winsdk=="true"', { 'actions': [ { 'action_name': 'node_perfctr_man', 'inputs': [ 'src/res/node_perfctr_provider.man' ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_perfctr_provider.h', - '<(SHARED_INTERMEDIATE_DIR)/node_perfctr_provider.rc', + 'src/gen/node_perfctr_provider.h', + 'src/gen/node_perfctr_provider.rc', + 'src/gen/MSG00001.BIN', ], 'action': [ 'ctrpp <@(_inputs) ' - '-o <(SHARED_INTERMEDIATE_DIR)/node_perfctr_provider.h ' - '-rc <(SHARED_INTERMEDIATE_DIR)/node_perfctr_provider.rc' + '-o src/gen/node_perfctr_provider.h ' + '-rc src/gen/node_perfctr_provider.rc' ] }, ], |