diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-06-02 16:01:18 +0200 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-06-07 17:54:22 -0700 |
| commit | bd33fea732fa74d23fc31855631eba14a03a0c49 (patch) | |
| tree | ed332bb796f871997ed957c70df0afad477206c6 | |
| parent | 1fb9cfcdb197c108c1bd80f031c488242d761a1b (diff) | |
| download | node-bd33fea732fa74d23fc31855631eba14a03a0c49.tar.gz | |
Unbreak the Windows build
The v8 team apparently decided that all build products should go
into ./build/«type», and updated their common.gypi file to do so.
Unfortunately v8's common.gypi is only used for some targets. All
the other targets would still look in the old place to find their
their dependencies, which effectively broke the build.
In the long run it would be good for node to send all build
output to ./build too, on all platforms.
Conflicts:
deps/v8/build/common.gypi
| -rw-r--r-- | deps/v8/build/common.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/deps/v8/build/common.gypi b/deps/v8/build/common.gypi index 32209c1c2..d5f679fdd 100644 --- a/deps/v8/build/common.gypi +++ b/deps/v8/build/common.gypi @@ -272,6 +272,10 @@ 'defines': [ 'WIN32', ], + 'msvs_configuration_attributes': { + 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', + 'CharacterSet': '1', + }, }], ['OS=="win" and v8_enable_prof==1', { 'msvs_settings': { |