diff --git a/build-win32.txt b/build-win32.txt index 0865fc5e..b93a280f 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=['-msse', '-msse2', @CARGS@] +cpp_args=['-msse', '-msse2', @CARGS@] +c_link_args = ['-static', '-static-libgcc', @LDARGS@] +cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', @LDARGS@] needs_exe_wrapper = true [host_machine] diff --git a/build-win64.txt b/build-win64.txt index 2a7fbee3..9e3bfc2e 100644 --- a/build-win64.txt +++ b/build-win64.txt @@ -5,8 +5,10 @@ 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_args=[@CARGS@] +cpp_args=[@CARGS@] +c_link_args = ['-static', '-static-libgcc', @LDARGS@] +cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', @LDARGS@] needs_exe_wrapper = true [host_machine] diff --git a/build-wine32.txt b/build-wine32.txt index ba8d34a8..ecec2eb4 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=['-m32', '-msse', '-msse2', '-fvisibility=hidden', @CARGS@] +cpp_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=', @CARGS@] +cpp_link_args=['-m32', '-mwindows', @LDARGS@] [host_machine] system = 'linux' diff --git a/build-wine64.txt b/build-wine64.txt index b3e028bb..fb9d98fd 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=['-m64', '-fvisibility=hidden', @CARGS@] +cpp_args=['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=', @CARGS@] +cpp_link_args=['-m64', '-mwindows', @LDARGS@] [host_machine] system = 'linux'