diff options
Diffstat (limited to 'remoting')
| -rwxr-xr-x | remoting/candle_and_light.py | 4 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/remoting/candle_and_light.py b/remoting/candle_and_light.py index 4416a83..1fad3e0 100755 --- a/remoting/candle_and_light.py +++ b/remoting/candle_and_light.py @@ -25,7 +25,7 @@ def main(): parser.add_option('--version', dest='version') parser.add_option('--product_dir', dest='product_dir') parser.add_option('--intermediate_dir', dest='intermediate_dir') - parser.add_option('--platformsdk_path', dest='platformsdk_path') + parser.add_option('--sas_dll_path', dest='sas_dll_path') parser.add_option('-d', dest='define_list', action='append') parser.add_option('--input', dest='input') parser.add_option('--output', dest='output') @@ -45,7 +45,7 @@ def main(): '-dVersion=%(version)s ' '-dFileSource=%(product_dir)s ' '-dIconPath=resources/chromoting.ico ' - '-dSasDllPath=%(platformsdk_path)s/redist/x86/sas.dll ' + '-dSasDllPath=%(sas_dll_path)s/sas.dll ' '%(defines)s ' ) diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 6a60068..5415a29 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -679,7 +679,7 @@ # include all DLLs imported by the installed binaries, so supporting # the component build becomes a burden. ['OS == "win" and component != "shared_library" and wix_exists == "True" \ - and platformsdk_exists == "True"', { + and sas_dll_exists == "True"', { 'targets': [ { 'target_name': 'remoting_host_installation', @@ -713,7 +713,7 @@ '<(PRODUCT_DIR)/remoting_host_controller.exe', '<(PRODUCT_DIR)/remoting_me2me_host.exe', '<(PRODUCT_DIR)/remoting_service.exe', - '<(platformsdk_path)/redist/x86/sas.dll', + '<(sas_dll_path)/sas.dll', 'resources/chromoting.ico', 'candle_and_light.py', ], @@ -727,7 +727,7 @@ '--version', '<(version_full)', '--product_dir', '<(PRODUCT_DIR).', '--intermediate_dir', '<(INTERMEDIATE_DIR).', - '--platformsdk_path', '<(platformsdk_path)', + '--sas_dll_path', '<(sas_dll_path)', '--input', '<(RULE_INPUT_PATH)', '--output', '<@(_outputs)', '<@(_wix_defines)', |