diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-12 19:12:26 +0400 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-12 19:12:26 +0400 |
| commit | 8a6576f764f73e4f74c277aa5f9bb4490ea07cf1 (patch) | |
| tree | 3e372835ec5b25b56b1bccd27ae74932dd0854cd /vcbuild.bat | |
| parent | a27320e00f12d26dad1b464bf89484faf429a688 (diff) | |
| parent | 2f759a7090a15824a261e168221caa5109c86d44 (diff) | |
Merge remote-tracking branch 'origin/v0.6'
Conflicts:
common.gypi
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 72e5d354230..aa0b83664d2 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -14,6 +14,7 @@ if /i "%1"=="/?" goto help @rem Process arguments. set config=Debug set target=Build +set target_arch=ia32 set noprojgen= set nobuild= set nosign= @@ -28,6 +29,9 @@ if "%1"=="" goto args-done if /i "%1"=="debug" set config=Debug&goto arg-ok if /i "%1"=="release" set config=Release&goto arg-ok if /i "%1"=="clean" set target=Clean&goto arg-ok +if /i "%1"=="ia32" set target_arch=ia32&goto arg-ok +if /i "%1"=="x86" set target_arch=ia32&goto arg-ok +if /i "%1"=="x64" set target_arch=x64&goto arg-ok if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok if /i "%1"=="nobuild" set nobuild=1&goto arg-ok if /i "%1"=="nosign" set nosign=1&goto arg-ok @@ -56,14 +60,14 @@ if defined noprojgen goto msbuild @rem Generate the VS project. if defined nosnapshot goto nosnapshotgen -python tools\gyp_node -f msvs -G msvs_version=2010 +python tools\gyp_node -f msvs -G msvs_version=2010 -Dtarget_arch=%target_arch% if errorlevel 1 goto create-msvs-files-failed if not exist node.sln goto create-msvs-files-failed echo Project files generated. goto msbuild :nosnapshotgen -python tools\gyp_node -f msvs -G msvs_version=2010 -D v8_use_snapshot='false' +python tools\gyp_node -f msvs -G msvs_version=2010 -D v8_use_snapshot='false' -Dtarget_arch=%target_arch% if errorlevel 1 goto create-msvs-files-failed if not exist node.sln goto create-msvs-files-failed echo Project files generated. |