--- build-win32.txt | 8 ++++---- build-win64.txt | 4 ++-- build-wine32.txt | 6 +++--- build-wine64.txt | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build-win32.txt b/build-win32.txt index 97ec8a35..e2e2e3f9 100644 --- a/build-win32.txt +++ b/build-win32.txt @@ -5,10 +5,10 @@ ar = 'i686-w64-mingw32-ar' strip = 'i686-w64-mingw32-strip' [properties] -c_args=['-msse', '-msse2'] -cpp_args=['-msse', '-msse2'] -c_link_args = ['-static', '-static-libgcc'] -cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] +c_args=@CFLAGS@ + ['-msse', '-msse2'] +cpp_args=@CXXFLAGS@ + ['-msse', '-msse2'] +c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc'] +cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++'] needs_exe_wrapper = true [host_machine] diff --git a/build-win64.txt b/build-win64.txt index 2a7fbee3..cb8bdb00 100644 --- a/build-win64.txt +++ b/build-win64.txt @@ -5,8 +5,8 @@ ar = 'x86_64-w64-mingw32-ar' strip = 'x86_64-w64-mingw32-strip' [properties] -c_link_args = ['-static', '-static-libgcc'] -cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] +c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc'] +cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++'] needs_exe_wrapper = true [host_machine] diff --git a/build-wine32.txt b/build-wine32.txt index 9f13dbdf..a56f2fa4 100644 --- a/build-wine32.txt +++ b/build-wine32.txt @@ -7,9 +7,9 @@ strip = 'strip' [properties] needs_exe_wrapper = true -c_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden'] -cpp_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C='] -cpp_link_args=['-m32', '-mwindows'] +c_args= @CFLAGS@ + ['-m32', '-msse', '-msse2', '-fvisibility=hidden'] +cpp_args= @CXXFLAGS@ + ['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C='] +cpp_link_args= @LDFLAGS@ + ['-m32', '-mwindows'] [host_machine] system = 'linux' diff --git a/build-wine64.txt b/build-wine64.txt index fd7be2f8..8228a5bb 100644 --- a/build-wine64.txt +++ b/build-wine64.txt @@ -7,9 +7,9 @@ strip = 'strip' [properties] needs_exe_wrapper = true -c_args=['-m64', '-fvisibility=hidden'] -cpp_args=['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C='] -cpp_link_args=['-m64', '-mwindows'] +c_args= @CFLAGS@ + ['-m64', '-fvisibility=hidden'] +cpp_args= @CXXFLAGS@ + ['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C='] +cpp_link_args= @LDFLAGS@ + ['-m64', '-mwindows'] [host_machine] system = 'linux' -- 2.25.3