From 02897823acb177639bf850ef73416111b2ddb298 Mon Sep 17 00:00:00 2001 From: Joey Payne Date: Wed, 11 Nov 2015 17:17:29 -0700 Subject: [PATCH] Updated the command line and env vars bat to be correct. --- command_line.py | 4 ++-- files/env_vars.bat | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/command_line.py b/command_line.py index b83d35c..73c53a8 100644 --- a/command_line.py +++ b/command_line.py @@ -933,8 +933,8 @@ class CommandBase(object): ex_dir_vars = '' export_dict = {'mac-x64_dir': '', 'mac-x32_dir': '', - 'win-x64_dir': '', - 'win-x32_dir': '', + 'windows-x64_dir': '', + 'windows-x32_dir': '', 'linux-x64_dir': '', 'linux-x32_dir': ''} diff --git a/files/env_vars.bat b/files/env_vars.bat index 00a8690..2c7bb95 100644 --- a/files/env_vars.bat +++ b/files/env_vars.bat @@ -1,10 +1,11 @@ +@echo off set "PROJECT_DIR={proj_dir}" set "PROJECT_NAME={proj_name}" set "EXPORT_DIR={export_dir}" set "MAC64_EXPORT_DIR={mac-x64_dir}" set "MAC32_EXPORT_DIR={mac-x32_dir}" -set "WIN64_EXPORT_DIR={win-x64_dir}" -set "WIN32_EXPORT_DIR={win-x32_dir}" +set "WIN64_EXPORT_DIR={windows-x64_dir}" +set "WIN32_EXPORT_DIR={windows-x32_dir}" set "LINUX64_EXPORT_DIR={linux-x64_dir}" set "LINUX32_EXPORT_DIR={linux-x32_dir}" set "NUM_DIRS={num_dirs}"