[Mesa-dev] [PATCH v2 00/49] meson for windows

Dylan Baker dylan at pnwbakers.com
Tue Jul 10 23:17:28 UTC 2018


This is the second spin of my meson for windows series. It fixes a few issues
from the first version, and is rebased on current master. The biggest changes
are changing shader-cache to a trillian (auto, true, false), changing the lib
names to match the scons names, and fixing process.h interfering with the build.

This also includes a patch from Eric Engstrom to do a better job of finding
python2 on windows.

Dylan Baker (49):
  util: move process.[ch] to u_process.[ch]
  meson: always define libglapi
  add a git ignore for subprojects
  meson: add a zlib subproject
  meson: add a expat subproject
  gallium: fix ddebug on windows
  glapi: export glapi_destroy_multithread when building shared-glapi on
    windows
  glsl: fix general_ir_test with mingw
  meson: fix dl detection on non cygwin windows
  meson: build getopt when using msvc
  meson: Add a platform for windows
  meson: don't build glx or dri by default on windows
  meson: don't allow glvnd on windows
  meson: add windows compiler checks and libraries
  meson: Make shader-cache a trillean instead of boolean
  meson: Add windows defines to glapi
  meson: Add necessary defines for mesa_gallium on windows
  meson: build gallium gdi winsys
  meson: build wgl state tracker
  meson: build libgl-gdi target
  meson: build graw-gdi target
  meson: fix gallium-osmesa to build for windows
  meson: Don't check for posix_memalign on windows
  meson: Add support for wrapping llvm
  docs/meson.html: fix numerous issues spotted by xmllint
  util/xmlconfig: include strndup.h for windows
  meson: fix pipe-loader compilation for windows
  meson: don't look for rt on windows
  meson: Add support for using win_flex and win_bison on windows
  meson: make nm binary optional
  meson: for incluse of inttypes.h for glcpp with msvc
  meson: disable sse4.1 optimizations with msvc
  meson: add switches for SWR with MSVC
  meson: don't define GLX_USE_TLS for windows
  meson: Add idep_getopt for tests
  util/tests: Use define instead of VLA
  meson: Don't build glsl cache_test for windows
  glsl/tests: define ssize_t on windows
  nir/meson: fix c vs cpp args for nir test
  meson: Set visibility and compat args for graw
  meosn: don't build gallium trivial tests on windows
  meson: Fix gtest linkage on msvc
  meson: disable graw tests on mingw
  meson: don't build or run mesa-sha1 test on windows
  meson: Use python module to find python2 on windows
  appveyor: Add support for meson as well as scons
  appveyor: use chocolatey (cinst) to install winflexbison
  tests/vma: fix build with MSVC
  meson: maintain names of shared API libraries

 appveyor.yml                                  |  34 +-
 docs/meson.html                               |  71 ++-
 meson.build                                   | 405 ++++++++++++------
 meson_options.txt                             |  12 +-
 src/compiler/glsl/glcpp/meson.build           |  16 +-
 src/compiler/glsl/meson.build                 |   6 +-
 src/compiler/glsl/tests/blob_test.c           |   4 +
 src/compiler/glsl/tests/general_ir_test.cpp   |  14 +-
 src/compiler/glsl/tests/meson.build           |  21 +-
 src/compiler/nir/meson.build                  |   2 +-
 src/egl/meson.build                           |   2 +-
 src/gallium/auxiliary/driver_ddebug/dd_util.h |   6 +-
 src/gallium/auxiliary/meson.build             |   6 +
 src/gallium/auxiliary/os/os_process.c         |   2 +-
 src/gallium/auxiliary/pipe-loader/meson.build |   9 +-
 src/gallium/drivers/swr/meson.build           |   3 +-
 .../drivers/swr/rasterizer/jitter/meson.build |  13 +-
 src/gallium/meson.build                       |  14 +-
 src/gallium/state_trackers/osmesa/meson.build |  12 +-
 .../{osmesa => wgl}/meson.build               |  32 +-
 .../{graw-xlib => graw-gdi}/meson.build       |  21 +-
 src/gallium/targets/graw-null/meson.build     |   2 +
 src/gallium/targets/graw-xlib/meson.build     |   1 +
 .../{graw-xlib => libgl-gdi}/meson.build      |  30 +-
 src/gallium/targets/osmesa/meson.build        |  11 +-
 src/gallium/tests/meson.build                 |  11 +-
 .../{tests => winsys/sw/gdi}/meson.build      |  12 +-
 src/gbm/meson.build                           |   2 +-
 src/{gallium/tests => getopt}/meson.build     |  14 +-
 src/gtest/meson.build                         |   7 +
 src/mapi/es1api/meson.build                   |  14 +-
 src/mapi/es2api/meson.build                   |  14 +-
 src/mapi/glapi/glapi.h                        |   2 +-
 src/mapi/glapi/meson.build                    |  13 +-
 src/mapi/meson.build                          |   2 +
 src/mapi/shared-glapi/meson.build             |  11 +-
 src/mesa/meson.build                          |  12 +-
 src/meson.build                               |   5 +
 src/util/Makefile.sources                     |   4 +-
 src/util/meson.build                          |  25 +-
 src/util/tests/hash_table/clear.c             |  13 +-
 src/util/tests/hash_table/delete_management.c |  13 +-
 src/util/tests/hash_table/insert_many.c       |  11 +-
 src/util/tests/hash_table/meson.build         |   1 +
 src/util/tests/hash_table/random_entry.c      |   7 +-
 src/util/tests/string_buffer/meson.build      |   1 +
 src/util/tests/vma/vma_random_test.cpp        |   8 +
 src/util/{process.c => u_process.c}           |   2 +-
 src/util/{process.h => u_process.h}           |   0
 src/util/u_queue.c                            |   2 +-
 src/util/xmlconfig.c                          |   3 +-
 subprojects/.gitignore                        |   3 +
 subprojects/expat.wrap                        |  10 +
 subprojects/zlib.wrap                         |  10 +
 54 files changed, 709 insertions(+), 272 deletions(-)
 copy src/gallium/state_trackers/{osmesa => wgl}/meson.build (64%)
 copy src/gallium/targets/{graw-xlib => graw-gdi}/meson.build (75%)
 copy src/gallium/targets/{graw-xlib => libgl-gdi}/meson.build (62%)
 copy src/gallium/{tests => winsys/sw/gdi}/meson.build (86%)
 copy src/{gallium/tests => getopt}/meson.build (84%)
 rename src/util/{process.c => u_process.c} (99%)
 rename src/util/{process.h => u_process.h} (100%)
 create mode 100644 subprojects/.gitignore
 create mode 100644 subprojects/expat.wrap
 create mode 100644 subprojects/zlib.wrap

-- 
2.18.0



More information about the mesa-dev mailing list