Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ project('amazon-s3-gst-plugin', 'c', 'cpp',
'buildtype=debugoptimized' ])

gst_req = '>= 1.20.2'
aws_cpp_sdk_req = '>= 1.10.30'
aws_cpp_sdk_req = '>= 1.9.210'

gst_s3_version = meson.project_version()

c_args = ['-std=c17']
cpp_args = ['-std=c++17']
c_args = ['/std:c17', '/USE_IMPORT_EXPORT:ON']
cpp_args = ['/std:c++17', '/USE_IMPORT_EXPORT:ON']

apiversion = '1.0'

Expand All @@ -22,6 +22,7 @@ gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep'])
aws_cpp_sdk_s3_dep = dependency('aws-cpp-sdk-s3', version : aws_cpp_sdk_req)
aws_cpp_sdk_sts_dep = dependency('aws-cpp-sdk-sts', version : aws_cpp_sdk_req)
aws_cpp_sdk_core_dep = dependency('aws-cpp-sdk-core', version : aws_cpp_sdk_req)

configinc = include_directories('.')

Expand Down
3 changes: 3 additions & 0 deletions src/gstawscredentials.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/


#include "gstawscredentials.hpp"

#include "gstawsutils.hpp"

#define USE_IMPORT_EXPORT
#include <aws/core/auth/AWSCredentialsProviderChain.h>
#include <aws/sts/model/AssumeRoleRequest.h>
#include <aws/sts/STSClient.h>
Expand Down
2 changes: 2 additions & 0 deletions src/gsts3downloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "gstawsutils.hpp"
#include "gstawsapihandle.hpp"
#include "gstawscredentials.hpp"

#define USE_IMPORT_EXPORT
#include <aws/s3/model/GetObjectRequest.h>
#include <aws/s3/model/GetObjectResult.h>
#include <aws/s3/S3Client.h>
Expand Down
1 change: 1 addition & 0 deletions src/gsts3multipartuploader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "gstawsapihandle.hpp"
#include "gsts3uploaderpartcache.hpp"

#define USE_IMPORT_EXPORT
#include <aws/core/Aws.h>
#include <aws/core/auth/AWSCredentials.h>
#include <aws/core/auth/AWSCredentialsProviderChain.h>
Expand Down
2 changes: 1 addition & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ aws_utils = static_library('awsutils', [
credentials = library('gstawscredentials-@0@'.format(apiversion),
['gstawscredentials.cpp'],
link_with: aws_utils,
dependencies : [aws_cpp_sdk_sts_dep, gst_dep],
dependencies : [aws_cpp_sdk_sts_dep, gst_dep, aws_cpp_sdk_core_dep],
cpp_args: symbol_export_define + cpp_args,
install : true
)
Expand Down