meson: replace with_*dri with with_dri_platform
This fixes the windows and macos stubs to be consistent with the *nix path. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
@@ -52,10 +52,6 @@ if get_option('texture-float')
|
||||
message('WARNING: Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.')
|
||||
endif
|
||||
|
||||
# XXX: yeah, do these
|
||||
with_appledri = false
|
||||
with_windowsdri = false
|
||||
|
||||
dri_drivers_path = get_option('dri-drivers-path')
|
||||
if dri_drivers_path == ''
|
||||
dri_drivers_path = join_paths(get_option('libdir'), 'dri')
|
||||
|
@@ -95,9 +95,9 @@ if with_dri3
|
||||
files_libglx += files('dri3_glx.c', 'dri3_priv.h')
|
||||
endif
|
||||
|
||||
if with_appledri
|
||||
if with_dri_platform == 'apple'
|
||||
files_libglx += files('applegl_glx.c')
|
||||
elif with_windowsdri
|
||||
elif with_dri_platform == 'windows'
|
||||
files_libglx += files('driwindows_glx.c')
|
||||
# TODO
|
||||
#extra_libs_libglx += [
|
||||
|
@@ -23,7 +23,7 @@ inc_glapi = include_directories('.')
|
||||
static_glapi_files = []
|
||||
static_glapi_args = []
|
||||
|
||||
if with_appledri or with_windowsdri
|
||||
if ['apple', 'windows'].contains(with_dri_platform)
|
||||
static_glapi_files += files('glapi_gentable.c')
|
||||
endif
|
||||
|
||||
|
Reference in New Issue
Block a user