diff options
| author | Jon Turney <[email protected]> | 2017-11-20 22:05:47 +0000 |
|---|---|---|
| committer | Jon Turney <[email protected]> | 2017-11-30 15:09:21 +0000 |
| commit | 5ef75cb02b2b4db5506b8bf5962ac165f9314b9c (patch) | |
| tree | 29a8145f64d53269fcda18a7354b6892e3cb8454 /src/glx/meson.build | |
| parent | 3ae998a7432a3b8db8f43cf7013ce7f36cb71bfe (diff) | |
meson: build src/glx/windows
Signed-off-by: Jon Turney <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/glx/meson.build')
| -rw-r--r-- | src/glx/meson.build | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/glx/meson.build b/src/glx/meson.build index deef3ed2235..a7eb48a0069 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -18,8 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# TODO: -#subdir('windows') +subdir('windows') files_libglx = files( 'clientattrib.c', @@ -63,6 +62,8 @@ files_libglx = files( ) extra_libs_libglx = [] +extra_deps_libgl = [] +extra_ld_args_libgl = [] if with_dri files_libglx += files( @@ -99,11 +100,15 @@ if with_dri_platform == 'apple' files_libglx += files('applegl_glx.c') elif with_dri_platform == 'windows' files_libglx += files('driwindows_glx.c') - # TODO - #extra_libs_libglx += [ - #libwindowsdri, - #libwindowsglx, - #] + extra_libs_libglx += [ + libwindowsdri, + libwindowsglx, + ] + extra_deps_libgl = [ + meson.get_compiler('c').find_library('gdi32'), + meson.get_compiler('c').find_library('opengl32') + ] + extra_ld_args_libgl = '-Wl,--disable-stdcall-fixup' endif dri_driver_dir = join_paths(get_option('prefix'), dri_drivers_path) @@ -139,7 +144,7 @@ libglx = static_library( ], c_args : [c_vis_args, gl_lib_cargs, '-DGL_LIB_NAME="lib@[email protected].@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0])], - link_with : [libloader, libloader_dri3_helper, libmesa_util, libxmlconfig], + link_with : [libloader, libloader_dri3_helper, libmesa_util, libxmlconfig, extra_libs_libglx], dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd], build_by_default : false, ) @@ -161,9 +166,9 @@ if with_glx == 'dri' ], link_with : [libglapi_static, libglapi], link_whole : libglx, - link_args : [ld_args_bsymbolic, ld_args_gc_sections], + link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl], dependencies : [dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, - dep_xcb_dri2, dep_xcb_dri3], + dep_xcb_dri2, dep_xcb_dri3, extra_deps_libgl], version : gl_lib_version, install : true, ) |