diff options
| author | pal1000 <liviuprodea@yahoo.com> | 2019-03-01 12:30:15 +0200 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2019-10-02 09:41:27 -0400 |
| commit | 2739dd9621afc8d256a747c1c72b5b20780bea54 (patch) | |
| tree | 1d8c0c9edfe8d3253596da02c0c94be1bcd85e1e /src | |
| parent | e53ca66c4a252ef4adcfdfda7e645bf622ec14b2 (diff) | |
scons: Fix MSYS2 Mingw-w64 build.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This patch is based on https://github.com/msys2/MINGW-packages/blob/28e3f85e09b6947ea80036c49f6c38f1394f93ca/mingw-w64-mesa/link-ole32.patch but with tweaks to avoid MSVC build break when applied.
v2: Create Mingw platform alias pointing to windows host platform define to avoid spurious crosscompilation;
v3: Fix obviously wrong compiler flags for swr driver;
v4: Update original patch URL because it has been relocated;
v5: Don't bother patching autools stuff as it's not used by MSYS2 Mingw-w64 build and it's days are numbered anyway;
v6: After Mingw posix flag fix in 295851eb things are far simpler as we don't need more linking of uuid, ole32, version and shell32 than what is already in place.
(cherry picked from commit ffb0d3a25c60dd7fc5cb1f2c33c2977b245b5fee)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/swr/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index b0bead242f7..60d97018315 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -204,7 +204,7 @@ env.Prepend(CPPPATH = [ envavx = env.Clone() envavx.Append(CPPDEFINES = ['KNOB_ARCH=KNOB_ARCH_AVX']) -if env['platform'] == 'windows': +if env['msvc']: envavx.Append(CCFLAGS = ['/arch:AVX']) else: envavx.Append(CCFLAGS = ['-mavx']) @@ -220,7 +220,7 @@ env.Alias('swrAVX', swrAVX) envavx2 = env.Clone() envavx2.Append(CPPDEFINES = ['KNOB_ARCH=KNOB_ARCH_AVX2']) -if env['platform'] == 'windows': +if env['msvc']: envavx2.Append(CCFLAGS = ['/arch:AVX2']) else: envavx2.Append(CCFLAGS = ['-mavx2', '-mfma', '-mbmi2', '-mf16c']) |