The value of library_dirs is now common for all platforms

This commit is contained in:
Lovell Fuller 2023-10-20 11:15:23 +01:00
parent f43829a16a
commit 069d1786f5

View File

@ -130,6 +130,9 @@
'<(sharp_libvips_include_dir)/glib-2.0', '<(sharp_libvips_include_dir)/glib-2.0',
'<(sharp_libvips_lib_dir)/glib-2.0/include' '<(sharp_libvips_lib_dir)/glib-2.0/include'
], ],
'library_dirs': [
'<(sharp_libvips_lib_dir)'
],
'conditions': [ 'conditions': [
['OS == "win"', { ['OS == "win"', {
'defines': [ 'defines': [
@ -137,7 +140,6 @@
'_FILE_OFFSET_BITS=64' '_FILE_OFFSET_BITS=64'
], ],
'link_settings': { 'link_settings': {
'library_dirs': ['<(sharp_libvips_lib_dir)'],
'libraries': [ 'libraries': [
'libvips.lib', 'libvips.lib',
'libglib-2.0.lib', 'libglib-2.0.lib',
@ -147,9 +149,6 @@
}], }],
['OS == "mac"', { ['OS == "mac"', {
'link_settings': { 'link_settings': {
'library_dirs': [
'<(sharp_libvips_lib_dir)'
],
'libraries': [ 'libraries': [
'libvips-cpp.42.dylib' 'libvips-cpp.42.dylib'
] ]
@ -169,9 +168,6 @@
'_GLIBCXX_USE_CXX11_ABI=1' '_GLIBCXX_USE_CXX11_ABI=1'
], ],
'link_settings': { 'link_settings': {
'library_dirs': [
'<(sharp_libvips_lib_dir)'
],
'libraries': [ 'libraries': [
'-l:libvips-cpp.so.42' '-l:libvips-cpp.so.42'
], ],