diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-03-08 17:21:46 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-05-26 17:06:15 +0530 |
| commit | 5afbdf521561487f0322f29476cc1868e5449f78 (patch) | |
| tree | 4d495ab2f800f801ed611536868925e1ac77c69b | |
| parent | dc5c1adaeba49870045424ce265934d9def73647 (diff) | |
cerbero: Allow fetching UWP Visual Studio env vars
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/480>
| -rw-r--r-- | cerbero/ide/vs/env.py | 4 | ||||
| -rw-r--r-- | cerbero/ide/vs/genlib.py | 4 | ||||
| -rw-r--r-- | config/windows.config | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cerbero/ide/vs/env.py b/cerbero/ide/vs/env.py index 857a9762..c73d7aa9 100644 --- a/cerbero/ide/vs/env.py +++ b/cerbero/ide/vs/env.py @@ -205,12 +205,14 @@ def get_envvar_msvc_values(msvc, nomsvc, sep=';'): return msvc[0:index] @lru_cache() -def get_msvc_env(arch, target_arch, version=None, vs_install_path=None): +def get_msvc_env(arch, target_arch, uwp, version=None, vs_install_path=None): ret_env = {} vcvarsall, vsver = get_vcvarsall(version, vs_install_path) without_msvc = run_and_get_env('set') arg = get_vcvarsall_arg(arch, target_arch) + if uwp: + arg += ' uwp' vcvars_env_cmd = '"{0}" {1} & {2}'.format(vcvarsall, arg, 'set') with_msvc = run_and_get_env(vcvars_env_cmd) diff --git a/cerbero/ide/vs/genlib.py b/cerbero/ide/vs/genlib.py index 285cfb73..84e8b453 100644 --- a/cerbero/ide/vs/genlib.py +++ b/cerbero/ide/vs/genlib.py @@ -118,8 +118,8 @@ class GenLib(object): return None, None try: from cerbero.ide.vs.env import get_msvc_env - msvc_env = get_msvc_env('x86', target_arch, self.config.vs_install_version, - self.config.vs_install_path)[0] + msvc_env = get_msvc_env('x86', target_arch, False, self.config.vs_install_version, + self.config.vs_install_path)[0] except FatalError: return None, None paths = msvc_env['PATH'] diff --git a/config/windows.config b/config/windows.config index 87196279..d383edd4 100644 --- a/config/windows.config +++ b/config/windows.config @@ -129,7 +129,8 @@ if platform == Platform.WINDOWS and 'visualstudio' in variants: # that were appended/prepended and have new values # FIXME: Use EnvVarOp class from cerbero/build/build.py msvc_toolchain_env = {} - env, msvc_version = get_msvc_env(arch, target_arch, vs_install_version, vs_install_path) + env, msvc_version = get_msvc_env(arch, target_arch, False, + vs_install_version, vs_install_path) for key, value in env.items(): if key in ('PATH', 'PATHEXT', 'INCLUDE', 'LIB'): sep = separator |