diff --git a/buildscript/modules/dist.cmd b/buildscript/modules/dist.cmd index 688461b8..c5663d87 100644 --- a/buildscript/modules/dist.cmd +++ b/buildscript/modules/dist.cmd @@ -3,10 +3,11 @@ @if NOT EXIST "%devroot%\mesa\build\%toolchain%-%abi%\" GOTO exit @rem Keep both clover standalone and ICD intact -@IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL-1.dll" IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL.dll" del "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL.dll" +@IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\*penCL-1.dll" IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\*penCL.dll" del /Q "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\*penCL.dll" @IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL-1.dll" REN "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL-1.dll" MesaOpenCL.dll -@IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\OpenCL-1.dll" IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\OpenCL.dll" del "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\OpenCL.dll" @IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\OpenCL-1.dll" REN "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\OpenCL-1.dll" OpenCL.dll +@IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\libMesaOpenCL-1.dll" REN "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\libMesaOpenCL-1.dll" MesaOpenCL.dll +@IF EXIST "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\libOpenCL-1.dll" REN "%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\libOpenCL-1.dll" OpenCL.dll @set dist=n @set /p dist=Create or update Mesa3D distribution package (y/n): diff --git a/releasenotes.md b/releasenotes.md index 9ed0ff4a..2b2c75de 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,3 +1,5 @@ +### Distribution +- clover: Support MinGW built binaries. ### Build script - Building GLonD3D12 with MinGW requires Mesa 22.2.0-rc2 and up. # 22.1.6