From 36f386669270f0b9fcc2b8f09f856eef5bc81a79 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Thu, 30 Apr 2020 20:02:56 +0200 Subject: [PATCH] Reword the explanation in the wiengcc cross file --- cross-wine.conf | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cross-wine.conf b/cross-wine.conf index 87b6dc4f..bd5bcf3e 100644 --- a/cross-wine.conf +++ b/cross-wine.conf @@ -5,15 +5,17 @@ ar = 'ar' strip = 'strip' [properties] -# These would be the arguments for 64-bit compilation. We'll set the `-m64` flag -# (or `-m32`) in our meson.build to allow the 32-bit bitbridge to be built in -# the same build directory as the plugin and the regular 64-bit version of the -# host application to ensure that they are always in sync. +# Instead of specifying the target architecture below, we'll do this directly in +# the meson.build file. By setting the `-m64` flags there (or `-m32`), we can +# build both the regular 64-bit version of the host application and the 32-bit +# bit bridge in the same build. This ensures that the plugin and both host +# applications are always in sync. This might not be needed anymore once Meson +# cross compiling to multiple targets at once. # https://github.com/mesonbuild/meson/issues/5125 +cpp_link_args = ['-mwindows'] +needs_exe_wrapper = true +# For instance, this should be in the 64-bit only cross-file # c_args = ['-m64'] # cpp_args = ['-m64'] # cpp_link_args = ['-m64', '-mwindows'] - -cpp_link_args = ['-mwindows'] -needs_exe_wrapper = true