vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-06-16 08:23:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use consistent architecture naming for Wine deps

Browse Source
This commit is contained in:
Robbert van der Helm
2020-12-02 18:05:17 +01:00
parent 9291ae7e42
commit a25aea1a76
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+32 -32
View File
@@ -195,33 +195,33 @@ if with_vst3
'-DNOMCX', '-DNOMCX',
'-DWIN32_LEAN_AND_MEAN', '-DWIN32_LEAN_AND_MEAN',
] ]
vst3_base_wine = static_library( vst3_base_wine_64bit = static_library(
'base_wine', 'vst3_base_wine_64bit',
vst3.get_variable('base_sources'), vst3.get_variable('base_sources'),
cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m64', '-Wno-cpp'], cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m64', '-Wno-cpp'],
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
override_options : ['warning_level=0'], override_options : ['warning_level=0'],
native : false, native : false,
) )
vst3_pluginterfaces_wine = static_library( vst3_pluginterfaces_wine_64bit = static_library(
'pluginterfaces_wine', 'vst3_pluginterfaces_wine_64bit',
vst3.get_variable('pluginterfaces_sources'), vst3.get_variable('pluginterfaces_sources'),
cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m64'], cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m64'],
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
override_options : ['warning_level=0'], override_options : ['warning_level=0'],
native : false, native : false,
) )
vst3_sdk_hosting_wine = static_library( vst3_sdk_hosting_wine_64bit = static_library(
'sdk_hosting_wine', 'vst3_sdk_hosting_wine_64bit',
vst3.get_variable('sdk_common_sources') + vst3.get_variable('sdk_hosting_sources'), vst3.get_variable('sdk_common_sources') + vst3.get_variable('sdk_hosting_sources'),
link_with : [vst3_base_wine, vst3_pluginterfaces_wine], link_with : [vst3_base_wine_64bit, vst3_pluginterfaces_wine_64bit],
cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m64', '-Wno-multichar'], cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m64', '-Wno-multichar'],
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
override_options : ['warning_level=0'], override_options : ['warning_level=0'],
native : false, native : false,
) )
vst3_sdk_hosting_wine_dep = declare_dependency( vst3_sdk_hosting_wine_64bit_dep = declare_dependency(
link_with : vst3_sdk_hosting_wine, link_with : vst3_sdk_hosting_wine_64bit,
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
# This does mean that we now have a lot of defines in our code, but the # This does mean that we now have a lot of defines in our code, but the
# alternative would be patching every location in the SDK where they include # alternative would be patching every location in the SDK where they include
@@ -231,33 +231,33 @@ if with_vst3
# And another time for the 32-bit version # And another time for the 32-bit version
if with_bitbridge if with_bitbridge
vst3_base_wine_32 = static_library( vst3_base_wine_32bit = static_library(
'base_wine_32', 'vst3_base_wine_32bit',
vst3.get_variable('base_sources'), vst3.get_variable('base_sources'),
cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m32', '-Wno-cpp'], cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m32', '-Wno-cpp'],
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
override_options : ['warning_level=0'], override_options : ['warning_level=0'],
native : false, native : false,
) )
vst3_pluginterfaces_wine_32 = static_library( vst3_pluginterfaces_wine_32bit = static_library(
'pluginterfaces_wine_32', 'vst3_pluginterfaces_wine_32bit',
vst3.get_variable('pluginterfaces_sources'), vst3.get_variable('pluginterfaces_sources'),
cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m32'], cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m32'],
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
override_options : ['warning_level=0'], override_options : ['warning_level=0'],
native : false, native : false,
) )
vst3_sdk_hosting_wine_32 = static_library( vst3_sdk_hosting_wine_32bit = static_library(
'sdk_hosting_wine_32', 'vst3_sdk_hosting_wine_32bit',
vst3.get_variable('sdk_common_sources') + vst3.get_variable('sdk_hosting_sources'), vst3.get_variable('sdk_common_sources') + vst3.get_variable('sdk_hosting_sources'),
link_with : [vst3_base_wine_32, vst3_pluginterfaces_wine_32], link_with : [vst3_base_wine_32bit, vst3_pluginterfaces_wine_32bit],
cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m32', '-Wno-multichar'], cpp_args : vst3_compiler_options + vst3_wine_compiler_options + ['-m32', '-Wno-multichar'],
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
override_options : ['warning_level=0'], override_options : ['warning_level=0'],
native : false, native : false,
) )
vst3_sdk_hosting_wine_32_dep = declare_dependency( vst3_sdk_hosting_wine_32bit_dep = declare_dependency(
link_with : vst3_sdk_hosting_wine_32, link_with : vst3_sdk_hosting_wine_32bit,
include_directories : vst3_include_dir, include_directories : vst3_include_dir,
# This does mean that we now have a lot of defines in our code, but the # This does mean that we now have a lot of defines in our code, but the
# alternative would be patching every location in the SDK where they include # alternative would be patching every location in the SDK where they include
@@ -309,7 +309,7 @@ if with_vst3
) )
endif endif
host_deps = [ host_64bit_deps = [
boost_dep, boost_dep,
boost_filesystem_dep, boost_filesystem_dep,
bitsery_dep, bitsery_dep,
@@ -319,9 +319,9 @@ host_deps = [
xcb_dep, xcb_dep,
] ]
if with_vst3 if with_vst3
host_deps += [ host_64bit_deps += [
native_filesystem_dep, native_filesystem_dep,
vst3_sdk_hosting_wine_dep, vst3_sdk_hosting_wine_64bit_dep,
wine_ole32_dep, wine_ole32_dep,
wine_uuid_dep, wine_uuid_dep,
] ]
@@ -336,7 +336,7 @@ if with_bitbridge
# search path set by the system in `find_library()`. If anyone does know how # search path set by the system in `find_library()`. If anyone does know how
# to properly do this, please let me know! # to properly do this, please let me know!
winegcc = meson.get_compiler('cpp', native : false) winegcc = meson.get_compiler('cpp', native : false)
boost_filesystem_32_dep = winegcc.find_library( boost_filesystem_32bit_dep = winegcc.find_library(
'boost_filesystem', 'boost_filesystem',
static : with_static_boost, static : with_static_boost,
dirs : [ dirs : [
@@ -353,21 +353,21 @@ if with_bitbridge
'/usr/lib', '/usr/lib',
] ]
) )
xcb_32_dep = winegcc.find_library('xcb') xcb_32bit_dep = winegcc.find_library('xcb')
host_32_deps = [ host_32bit_deps = [
boost_dep, boost_dep,
boost_filesystem_32_dep, boost_filesystem_32bit_dep,
bitsery_dep, bitsery_dep,
function2_dep, function2_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
xcb_32_dep, xcb_32bit_dep,
] ]
if with_vst3 if with_vst3
host_32_deps += [ host_32bit_deps += [
native_filesystem_dep, native_filesystem_dep,
vst3_sdk_hosting_wine_32_dep, vst3_sdk_hosting_wine_32bit_dep,
wine_ole32_dep, wine_ole32_dep,
wine_uuid_dep, wine_uuid_dep,
] ]
@@ -379,7 +379,7 @@ executable(
individual_host_sources, individual_host_sources,
native : false, native : false,
include_directories : include_dir, include_directories : include_dir,
dependencies : host_deps, dependencies : host_64bit_deps,
cpp_args : compiler_options + ['-m64'], cpp_args : compiler_options + ['-m64'],
link_args : ['-m64'], link_args : ['-m64'],
) )
@@ -389,7 +389,7 @@ executable(
group_host_sources, group_host_sources,
native : false, native : false,
include_directories : include_dir, include_directories : include_dir,
dependencies : host_deps, dependencies : host_64bit_deps,
cpp_args : compiler_options + ['-m64'], cpp_args : compiler_options + ['-m64'],
link_args : ['-m64'], link_args : ['-m64'],
) )
@@ -400,7 +400,7 @@ if with_bitbridge
individual_host_sources, individual_host_sources,
native : false, native : false,
include_directories : include_dir, include_directories : include_dir,
dependencies : host_32_deps, dependencies : host_32bit_deps,
cpp_args : compiler_options + ['-m32'], cpp_args : compiler_options + ['-m32'],
link_args : ['-m32'], link_args : ['-m32'],
) )
@@ -410,7 +410,7 @@ if with_bitbridge
group_host_sources, group_host_sources,
native : false, native : false,
include_directories : include_dir, include_directories : include_dir,
dependencies : host_32_deps, dependencies : host_32bit_deps,
cpp_args : compiler_options + ['-m32'], cpp_args : compiler_options + ['-m32'],
link_args : ['-m32'], link_args : ['-m32'],
) )