Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix shared library test runs on Windows #957

Merged
merged 1 commit into from
Jun 16, 2021
Merged
Changes from all commits
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
16 changes: 16 additions & 0 deletions packager/common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,30 @@
# musl is a lightweight C standard library used in Alpine Linux.
'musl%': 0,
},

'shaka_code%': '<(shaka_code)',
'musl%': '<(musl)',
'libpackager_type%': 'static_library',

'conditions': [
['shaka_code==1', {
# This enable warnings and warnings-as-errors.
'chromium_code': 1,
}],
# These are some Chromium build settings that are normally keyed off of
# component=="shared_library". We don't use component=="shared_library"
# because it would result in a shared lib for every single component, but
# we still need these settings for a shared library build of libpackager
# on Windows.
['libpackager_type=="shared_library"', {
# Make sure we use a dynamic CRT to avoid issues with std::string in
# the library API on Windows.
'win_release_RuntimeLibrary': '2', # 2 = /MD (nondebug DLL)
'win_debug_RuntimeLibrary': '3', # 3 = /MDd (debug DLL)
# Skip the Windows allocator shim on Windows. Using this with a shared
# library results in build errors.
'win_use_allocator_shim': 0,
}],
],
},
'target_defaults': {
Expand Down