diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2015-12-02 22:58:05 +0100 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2015-12-02 22:58:05 +0100 |
| commit | 6c5f261887d560b03b5fa0cc097b79d6d79c1839 (patch) | |
| tree | 53490116749656a20530dbc7cbf6b1091afa6796 | |
| parent | b2e0340b87afa96d9a5f3290a69bd5d644c84606 (diff) | |
| download | luarocks-6c5f261887d560b03b5fa0cc097b79d6d79c1839.tar.gz luarocks-6c5f261887d560b03b5fa0cc097b79d6d79c1839.tar.bz2 luarocks-6c5f261887d560b03b5fa0cc097b79d6d79c1839.zip | |
removed /debug /release switches for setting up the enviornment. it does NOT determine linking against a debug runtime or release runtime.
| -rw-r--r-- | install.bat | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/install.bat b/install.bat index 4cf785d4..f5692c6e 100644 --- a/install.bat +++ b/install.bat | |||
| @@ -502,7 +502,6 @@ local function get_msvc_env_setup_cmd() | |||
| 502 | 502 | ||
| 503 | assert(type(vars.UNAME_M) == "string", "requires vars.UNAME_M to be set before calling this function.") | 503 | assert(type(vars.UNAME_M) == "string", "requires vars.UNAME_M to be set before calling this function.") |
| 504 | local x64 = vars.UNAME_M=="x86_64" | 504 | local x64 = vars.UNAME_M=="x86_64" |
| 505 | local debug = vars.LUA_RUNTIME:find("D$") -- runtime ending with "D" is a debug runtime | ||
| 506 | 505 | ||
| 507 | -- 1. try visual studio command line tools | 506 | -- 1. try visual studio command line tools |
| 508 | local vcdir = get_visual_studio_directory() | 507 | local vcdir = get_visual_studio_directory() |
| @@ -526,7 +525,7 @@ local function get_msvc_env_setup_cmd() | |||
| 526 | if wsdkdir then | 525 | if wsdkdir then |
| 527 | local setenv = wsdkdir.."Bin\\SetEnv.cmd" | 526 | local setenv = wsdkdir.."Bin\\SetEnv.cmd" |
| 528 | if exists(setenv) then | 527 | if exists(setenv) then |
| 529 | return ('call "%s" /%s /%s'):format(setenv, debug and "Debug" or "Release" ,x64 and "x64" or "x86") | 528 | return ('call "%s" /%s'):format(setenv, x64 and "x64" or "x86") |
| 530 | end | 529 | end |
| 531 | end | 530 | end |
| 532 | 531 | ||
