david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MSVC build fixes

Browse Source
This commit is contained in:
Chris Cannam
2022-01-04 17:39:10 +00:00
parent 0701dfe079
commit aa355ce1d2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@@ -409,12 +409,9 @@ if cpp.get_id() == 'msvc'
# #
# Our "solution" is to leave alone if default_library=shared (when # Our "solution" is to leave alone if default_library=shared (when
# the Meson and MSVC ways are the same), but emit an additional # the Meson and MSVC ways are the same), but emit an additional
# static .lib otherwise, called either rubberband-static.lib if # static .lib called rubberband-static.lib otherwise.
# default_library=both or rubberband.lib if default_library=static.
# #
if get_option('default_library') == 'static' if get_option('default_library') != 'shared'
rubberband_additional_static_lib = 'rubberband'
elif get_option('default_library') == 'both'
rubberband_additional_static_lib = 'rubberband-static' rubberband_additional_static_lib = 'rubberband-static'
endif endif
rubberband_library_name = 'rubberband' rubberband_library_name = 'rubberband'
@@ -473,7 +470,10 @@ endif
rubberband_library = library( rubberband_library = library(
rubberband_library_name, rubberband_library_name,
link_with: rubberband_objlib, # We would like to write "link_with: rubberband_objlib",
# but that didn't work with MSVC when I tried it: no
# DLL entry point found
objects: rubberband_objlib.extract_all_objects(recursive: true),
link_args: [ link_args: [
arch_flags, arch_flags,
feature_libraries, feature_libraries,