From 7c5aececdad2a04b642ca8419cf2fe4889c7e524 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Tue, 9 Oct 2018 16:46:21 +0100 Subject: [PATCH] scons: Allow building with custom MSVC_USE_SCRIPT script. SCons MSVC support relies on vcvarsall.bat to extract the PATH, CPP includes, library paths, etc. And SCons also has an build env var named MSVC_USE_SCRIPT which one can use to point to alternative vcvarsall.bat script. This change exposes this MSVC_USE_SCRIPT build env variable as a SCons command line variable. This will enable using MSVC outside Program Files (e.g, network shares, etc.) This change also links advapi32 library, necessary for the Windows Registry API used by WGL state tracker, avoiding missing symbols. Reviewed-by: Brian Paul Reviewed-by: Roland Scheidegger --- common.py | 1 + src/gallium/targets/libgl-gdi/SConscript | 1 + 2 files changed, 2 insertions(+) diff --git a/common.py b/common.py index 24a7e8a611d..113fc7f5c12 100644 --- a/common.py +++ b/common.py @@ -113,3 +113,4 @@ def AddOptions(opts): opts.Add(BoolOption('swr', 'Build OpenSWR', 'no')) if host_platform == 'windows': opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version') + opts.Add('MSVC_USE_SCRIPT', 'Microsoft Visual C/C++ vcvarsall script', True) diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index a8bdc3e5869..132cb73358d 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -16,6 +16,7 @@ env.Append(LIBS = [ 'user32', 'kernel32', 'ws2_32', + 'advapi32', ]) env.Prepend(LIBS = [ -- 2.30.2