X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmeson.build;h=c0e85cd70a8d366c06e0fa68abd80d7585416b10;hb=37e7a5e746dbb57bc44ff9da308b7bfc529e40d6;hp=5c2ca120333761f84d586b52671e1cbf5b1a805b;hpb=e5339fe4a47c242693962c9f90bbab8b74935cba;p=mesa.git diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 5c2ca120333..c0e85cd70a8 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -167,6 +167,7 @@ files_libmesa_common = files( 'main/glthread.c', 'main/glthread.h', 'main/glthread_bufferobj.c', + 'main/glthread_draw.c', 'main/glthread_marshal.h', 'main/glthread_shaderobj.c', 'main/glthread_varray.c', @@ -179,6 +180,7 @@ files_libmesa_common = files( 'main/histogram.h', 'main/image.c', 'main/image.h', + 'main/mesa_private.h', 'main/light.c', 'main/light.h', 'main/lines.c', @@ -704,8 +706,9 @@ if with_sse41 libmesa_sse41 = static_library( 'mesa_sse41', files('main/streaming-load-memcpy.c', 'main/sse_minmax.c'), - c_args : [c_vis_args, c_msvc_compat_args, sse41_args], - include_directories : inc_common, + c_args : [c_msvc_compat_args, sse41_args], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + gnu_symbol_visibility : 'hidden', ) else libmesa_sse41 = [] @@ -726,9 +729,10 @@ endif libmesa_common = static_library( 'mesa_common', files_libmesa_common, - c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args], - cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args], - include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], + c_args : [c_msvc_compat_args, _mesa_windows_args], + cpp_args : [cpp_msvc_compat_args, _mesa_windows_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')], dependencies : idep_nir_headers, build_by_default : false, ) @@ -736,9 +740,10 @@ libmesa_common = static_library( libmesa_classic = static_library( 'mesa_classic', files_libmesa_classic, - c_args : [c_vis_args, c_msvc_compat_args], - cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], + c_args : [c_msvc_compat_args], + cpp_args : [cpp_msvc_compat_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')], link_with : [libmesa_common, libglsl, libmesa_sse41], dependencies : idep_nir_headers, build_by_default : false, @@ -747,9 +752,10 @@ libmesa_classic = static_library( libmesa_gallium = static_library( 'mesa_gallium', files_libmesa_gallium, - c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args], - cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args], - include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], + c_args : [c_msvc_compat_args, _mesa_windows_args], + cpp_args : [cpp_msvc_compat_args, _mesa_windows_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')], link_with : [libmesa_common, libglsl, libmesa_sse41], dependencies : [idep_nir_headers, dep_vdpau], build_by_default : false,