Skip to content

Commit

Permalink
Merge pull request #39 from amzn/issue38
Browse files Browse the repository at this point in the history
Ammending meson.build files to fix linking issue - issue38
  • Loading branch information
russnic authored Oct 4, 2023
2 parents e9a3609 + eb739c9 commit 9515e85
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ gst_base_dep = dependency('gstreamer-base-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_base_dep'])
gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep'])
cpp = meson.get_compiler('cpp')
aws_c_common_dep = cpp.find_library('aws-c-common', required: true)
aws_crt_cpp_dep=cpp.find_library('aws-crt-cpp', required:true)
# use static linker args on macos as the dylibs don't include the crt symbols
aws_cpp_sdk_s3_dep = dependency('aws-cpp-sdk-s3', version : aws_cpp_sdk_req, static : is_macos)
aws_cpp_sdk_sts_dep = dependency('aws-cpp-sdk-sts', version : aws_cpp_sdk_req, static : is_macos)
Expand Down
6 changes: 3 additions & 3 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ symbol_export_define = ['-DGST_EXPORTS']

credentials = library('gstawscredentials-@0@'.format(apiversion),
['gstawscredentials.cpp'],
dependencies : [aws_cpp_sdk_sts_dep, gst_dep],
dependencies : [aws_cpp_sdk_sts_dep, gst_dep, aws_c_common_dep, aws_crt_cpp_dep],
cpp_args: symbol_export_define,
install : true
)
Expand All @@ -37,15 +37,15 @@ gst_s3_elements = library('gsts3elements',
gst_s3_elements_sources,
cpp_args: symbol_export_define,
c_args: symbol_export_define,
dependencies : [gst_dep, gst_base_dep, multipart_uploader_dep, credentials_dep],
dependencies : [gst_dep, gst_base_dep, multipart_uploader_dep, credentials_dep, aws_c_common_dep, aws_crt_cpp_dep],
include_directories : [configinc],
install : true,
install_dir : plugins_install_dir,
override_options : ['cpp_std=c++98', 'c_std=c99'])

s3elements_dep = declare_dependency(link_with : gst_s3_elements,
include_directories : [include_directories('.')],
dependencies : [gst_dep, gst_base_dep, aws_cpp_sdk_s3_dep, aws_cpp_sdk_sts_dep]
dependencies : [gst_dep, gst_base_dep, aws_cpp_sdk_s3_dep, aws_cpp_sdk_sts_dep, aws_c_common_dep, aws_crt_cpp_dep]
)

install_headers(gst_s3_public_headers, subdir : 'gstreamer-1.0/gst/aws')

0 comments on commit 9515e85

Please sign in to comment.