diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-30 18:23:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 18:23:38 +0200 |
| commit | a7f00f3bacbb41f35b7120db6a911eda7c6feac9 (patch) | |
| tree | 2d786b3d7fddbbb869ffdc33fa29279e179ae07f /platform/uwp/detect.py | |
| parent | a5c619dc8dc8a488599c3b08314ddb69e0ed445e (diff) | |
| parent | d52b70fb5e8e842ddcc9a57bad8e34366c0ee6d8 (diff) | |
Merge pull request #28530 from akien-mga/scons-prepend-cpppath
SCons: Always use env.Prepend for CPPPATH
Diffstat (limited to 'platform/uwp/detect.py')
| -rw-r--r-- | platform/uwp/detect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 17f8242466..00f419f4f0 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -77,7 +77,7 @@ def configure(env): # ANGLE angle_root = os.getenv("ANGLE_SRC_PATH") - env.Append(CPPPATH=[angle_root + '/include']) + env.Prepend(CPPPATH=[angle_root + '/include']) jobs = str(env.GetOption("num_jobs")) angle_build_cmd = "msbuild.exe " + angle_root + "/winrt/10/src/angle.sln /nologo /v:m /m:" + jobs + " /p:Configuration=Release /p:Platform=" @@ -137,7 +137,7 @@ def configure(env): ## Compile flags - env.Append(CPPPATH=['#platform/uwp', '#drivers/windows']) + env.Prepend(CPPPATH=['#platform/uwp', '#drivers/windows']) env.Append(CPPFLAGS=['/DUWP_ENABLED', '/DWINDOWS_ENABLED', '/DTYPED_METHOD_BIND']) env.Append(CPPFLAGS=['/DGLES_ENABLED', '/DGL_GLEXT_PROTOTYPES', '/DEGL_EGLEXT_PROTOTYPES', '/DANGLE_ENABLED']) winver = "0x0602" # Windows 8 is the minimum target for UWP build |