diff options
| author | Max Kellermann <max@musicpd.org> | 2018-10-14 23:41:20 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-10-14 23:41:38 +0200 |
| commit | 13ce142df137f346526de2a31a7ccbd59a903cdd (patch) | |
| tree | bf4f8bf7497124d48845565d1ba7e128f1f251fa | |
| parent | 89bf4c5fad6543ccf863c1e7cf14ef3e8ebeccdb (diff) | |
python/build/meson.py: generate `windres` line
| -rw-r--r-- | python/build/meson.py | 4 | ||||
| -rwxr-xr-x | win32/build.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/python/build/meson.py b/python/build/meson.py index 09dffe471..a31b3471a 100644 --- a/python/build/meson.py +++ b/python/build/meson.py @@ -5,8 +5,10 @@ from build.project import Project def make_cross_file(toolchain): if toolchain.is_windows: system = 'windows' + windres = "windres = '%s'" % toolchain.windres else: system = 'linux' + windres = '' if toolchain.is_arm: cpu_family = 'arm' @@ -38,6 +40,7 @@ c = '%s' cpp = '%s' ar = '%s' strip = '%s' +%s [properties] root = '%s' @@ -57,6 +60,7 @@ cpu_family = '%s' cpu = '%s' endian = '%s' """ % (toolchain.cc, toolchain.cxx, toolchain.ar, toolchain.strip, + windres, toolchain.install_prefix, repr((toolchain.cppflags + ' ' + toolchain.cflags).split()), repr(toolchain.ldflags.split()), diff --git a/win32/build.py b/win32/build.py index 061bae8c6..88d50b3a7 100755 --- a/win32/build.py +++ b/win32/build.py @@ -49,6 +49,7 @@ class CrossGccToolchain: self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib') self.nm = os.path.join(toolchain_bin, arch + '-nm') self.strip = os.path.join(toolchain_bin, arch + '-strip') + self.windres = os.path.join(toolchain_bin, arch + '-windres') common_flags = '-O2 -g' |