On 10/29/2018 12:57 PM, Dylan Baker wrote: > CC: [email protected] > CC: Roland Scheidegger <[email protected]> > Bugzilla: > https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.freedesktop.org%2Fshow_bug.cgi%3Fid%3D107870&data=02%7C01%7Cbrianp%40vmware.com%7Cc877b18570db4c38c0dc08d63dd09044%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C1%7C0%7C636764363328904415&sdata=ZHwiXmydLEpHfNFcQ2O5%2BbatXTk5zZAHLoGGolwiijw%3D&reserved=0 > Fixes: 80825abb5d1a7491035880253ffd531c55acae6b > ("move u_math to src/util") > --- > > Roland, you noticed that the previous attempt to fix this issue broke windows. > I've run scons with mingw cross compilation on Linux, but if you could test > that > this doesn't break the build on windows I'd appreciate it.
I just applied the series to my tree and it seems to build and run fine (with softpipe). Tested-by: Brian Paul <[email protected]> -Brian > > src/gallium/auxiliary/Makefile.sources | 2 -- > src/gallium/auxiliary/meson.build | 2 -- > src/util/Makefile.sources | 2 ++ > src/util/meson.build | 2 ++ > src/{gallium/auxiliary => }/util/u_cpu_detect.c | 0 > src/{gallium/auxiliary => }/util/u_cpu_detect.h | 0 > 6 files changed, 4 insertions(+), 4 deletions(-) > rename src/{gallium/auxiliary => }/util/u_cpu_detect.c (100%) > rename src/{gallium/auxiliary => }/util/u_cpu_detect.h (100%) > > diff --git a/src/gallium/auxiliary/Makefile.sources > b/src/gallium/auxiliary/Makefile.sources > index 72cf2ec6443..b60b25a0e4c 100644 > --- a/src/gallium/auxiliary/Makefile.sources > +++ b/src/gallium/auxiliary/Makefile.sources > @@ -222,8 +222,6 @@ C_SOURCES := \ > util/u_box.h \ > util/u_cache.c \ > util/u_cache.h \ > - util/u_cpu_detect.c \ > - util/u_cpu_detect.h \ > util/u_debug_gallium.h \ > util/u_debug_gallium.c \ > util/u_debug_describe.c \ > diff --git a/src/gallium/auxiliary/meson.build > b/src/gallium/auxiliary/meson.build > index 1b5eb4d155d..e1497992b17 100644 > --- a/src/gallium/auxiliary/meson.build > +++ b/src/gallium/auxiliary/meson.build > @@ -242,8 +242,6 @@ files_libgallium = files( > 'util/u_box.h', > 'util/u_cache.c', > 'util/u_cache.h', > - 'util/u_cpu_detect.c', > - 'util/u_cpu_detect.h', > 'util/u_debug_gallium.h', > 'util/u_debug_gallium.c', > 'util/u_debug_describe.c', > diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources > index af2ad85da19..b4d23947ab7 100644 > --- a/src/util/Makefile.sources > +++ b/src/util/Makefile.sources > @@ -70,6 +70,8 @@ MESA_UTIL_FILES := \ > u_vector.h \ > u_debug.c \ > u_debug.h \ > + u_cpu_detect.c \ > + u_cpu_detect.h \ > vma.c \ > vma.h > > diff --git a/src/util/meson.build b/src/util/meson.build > index 3b84f411112..7caea27d660 100644 > --- a/src/util/meson.build > +++ b/src/util/meson.build > @@ -94,6 +94,8 @@ files_mesa_util = files( > 'u_math.h', > 'u_debug.c', > 'u_debug.h', > + 'u_cpu_detect.c', > + 'u_cpu_detect.h', > 'vma.c', > 'vma.h', > ) > diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c > b/src/util/u_cpu_detect.c > similarity index 100% > rename from src/gallium/auxiliary/util/u_cpu_detect.c > rename to src/util/u_cpu_detect.c > diff --git a/src/gallium/auxiliary/util/u_cpu_detect.h > b/src/util/u_cpu_detect.h > similarity index 100% > rename from src/gallium/auxiliary/util/u_cpu_detect.h > rename to src/util/u_cpu_detect.h > _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
