diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-10-25 14:33:26 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-10-25 14:33:26 -0400 |
commit | 3f84c43e148b075f00c59fb8278bea52cd29e1e7 (patch) | |
tree | 19d5c9bd1a3d95c68b5015d96d9b5627019561ce /indra | |
parent | 9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff) |
MAINT-7911: Set build_data.json's Platform to win for both W32, W64.
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 71e348db3f..9778ceb8fa 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -292,6 +292,10 @@ class ViewerManifest(LLManifest): class WindowsManifest(ViewerManifest): + # We want the platform, per se, for every Windows build to be 'win'. The + # VMP will concatenate that with the address_size. + build_data_json_platform = 'win' + def final_exe(self): return self.app_name_oneword()+".exe" @@ -743,11 +747,9 @@ class Windows_i686_Manifest(WindowsManifest): # Although we aren't literally passed ADDRESS_SIZE, we can infer it from # the passed 'arch', which is used to select the specific subclass. address_size = 32 - build_data_json_platform = 'win32' class Windows_x86_64_Manifest(WindowsManifest): address_size = 64 - build_data_json_platform = 'win' class DarwinManifest(ViewerManifest): |