From 41985ce12e4c150ea40824457bac0dea5ad91a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 26 Oct 2017 14:23:39 +0300
Subject: [PATCH] Cheat and pull windres from the normal binutils packages

LLVM does have llvm-rc, which almost does what is needed.
Currently missing features:
- It doesn't run the C preprocessor (which can be wrapped with
  a shellscript easily if necessary)
- It chokes on C structs/typedefs normally found in included
  C headers
---
 Dockerfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 3a0a799..49ffdac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,14 @@ COPY wrappers/*.sh ./wrappers/
 COPY install-wrappers.sh .
 RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX
 
+# Cheating: Pull windres from the normal binutils package.
+# llvm-rc isn't fully usable as a replacement for windres yet.
+RUN apt-get update -qq && \
+    apt-get install -qqy binutils-mingw-w64-x86-64 && \
+    cp /usr/bin/x86_64-w64-mingw32-windres $TOOLCHAIN_PREFIX/bin && \
+    apt-get remove -qqy binutils-mingw-w64-x86-64 && \
+    cd $TOOLCHAIN_PREFIX/bin
+
 # Build MinGW-w64
 COPY build-mingw-w64.sh .
 RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX