Fossil SCM
Fix issue in 'buildmsvc.bat' batch tool when the USE_V110SDK71A option is used on x64.
Commit
a87528f3709bd05c6982828c3937dc7199c34c071daa2c45d9be8d4e200f068d
Parent
ba0f0b7c9cddd3c…
1 file changed
+6
-5
+6
-5
| --- win/buildmsvc.bat | ||
| +++ win/buildmsvc.bat | ||
| @@ -270,15 +270,16 @@ | ||
| 270 | 270 | :set_v110Sdk71A_x86 |
| 271 | 271 | SET PFILES_SDK71A=%ProgramFiles% |
| 272 | 272 | :set_v110Sdk71A_done |
| 273 | 273 | SET PATH=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Bin;%PATH% |
| 274 | 274 | SET INCLUDE=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Include;%INCLUDE% |
| 275 | - IF "%PLATFORM%" == "x64" ( | |
| 276 | - SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib\x64;%LIB% | |
| 277 | - ) ELSE ( | |
| 278 | - SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib;%LIB% | |
| 279 | - ) | |
| 275 | + IF "%PLATFORM%" == "x64" GOTO set_v110Sdk71A_lib_x64 | |
| 276 | + SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib;%LIB% | |
| 277 | + GOTO set_v110Sdk71A_lib_done | |
| 278 | + :set_v110Sdk71A_lib_x64 | |
| 279 | + SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib\x64;%LIB% | |
| 280 | + :set_v110Sdk71A_lib_done | |
| 280 | 281 | CALL :fn_UnsetVariable PFILES_SDK71A |
| 281 | 282 | SET NMAKE_ARGS=%NMAKE_ARGS% FOSSIL_ENABLE_WINXP=1 |
| 282 | 283 | GOTO :EOF |
| 283 | 284 | |
| 284 | 285 | :fn_UnsetVariable |
| 285 | 286 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -270,15 +270,16 @@ | |
| 270 | :set_v110Sdk71A_x86 |
| 271 | SET PFILES_SDK71A=%ProgramFiles% |
| 272 | :set_v110Sdk71A_done |
| 273 | SET PATH=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Bin;%PATH% |
| 274 | SET INCLUDE=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Include;%INCLUDE% |
| 275 | IF "%PLATFORM%" == "x64" ( |
| 276 | SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib\x64;%LIB% |
| 277 | ) ELSE ( |
| 278 | SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib;%LIB% |
| 279 | ) |
| 280 | CALL :fn_UnsetVariable PFILES_SDK71A |
| 281 | SET NMAKE_ARGS=%NMAKE_ARGS% FOSSIL_ENABLE_WINXP=1 |
| 282 | GOTO :EOF |
| 283 | |
| 284 | :fn_UnsetVariable |
| 285 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -270,15 +270,16 @@ | |
| 270 | :set_v110Sdk71A_x86 |
| 271 | SET PFILES_SDK71A=%ProgramFiles% |
| 272 | :set_v110Sdk71A_done |
| 273 | SET PATH=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Bin;%PATH% |
| 274 | SET INCLUDE=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Include;%INCLUDE% |
| 275 | IF "%PLATFORM%" == "x64" GOTO set_v110Sdk71A_lib_x64 |
| 276 | SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib;%LIB% |
| 277 | GOTO set_v110Sdk71A_lib_done |
| 278 | :set_v110Sdk71A_lib_x64 |
| 279 | SET LIB=%PFILES_SDK71A%\Microsoft SDKs\Windows\7.1A\Lib\x64;%LIB% |
| 280 | :set_v110Sdk71A_lib_done |
| 281 | CALL :fn_UnsetVariable PFILES_SDK71A |
| 282 | SET NMAKE_ARGS=%NMAKE_ARGS% FOSSIL_ENABLE_WINXP=1 |
| 283 | GOTO :EOF |
| 284 | |
| 285 | :fn_UnsetVariable |
| 286 |