aboutsummaryrefslogtreecommitdiff
path: root/Makefile.ide
diff options
context:
space:
mode:
authorEnrico Tassi2020-07-05 20:13:44 +0200
committerEnrico Tassi2020-07-05 20:13:44 +0200
commitcea10e4e16c05b06693184425dd70ce6e5eba8a8 (patch)
tree167f4dfadd2685b39bfa0d8fc4f550f1cd2efc6a /Makefile.ide
parent0545c9402310efe0656793197c996d04d554ecb8 (diff)
parent6eecb3c9fc12317e3d753db54794244530991173 (diff)
Merge PR #12641: Windows build: use architecture dependent version of windres
Reviewed-by: gares
Diffstat (limited to 'Makefile.ide')
-rw-r--r--Makefile.ide6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.ide b/Makefile.ide
index 640ee7b188..789acee5ec 100644
--- a/Makefile.ide
+++ b/Makefile.ide
@@ -296,10 +296,12 @@ $(COQIDEAPP):$(COQIDEAPP)/Contents/Resources
# CoqIde for Windows special targets
###########################################################################
+# This is either x86_64-w64-mingw32 or i686-w64-mingw32
+TARGET_ARCH=$(shell $CC -dumpmachine)
+
%.o: %.rc
$(SHOW)'WINDRES $<'
- $(HIDE)i686-w64-mingw32-windres -i $< -o $@
-
+ $(HIDE)$(TARGET_ARCH)-windres -i $< -o $@
# For emacs:
# Local Variables: