From f39a37ff2f895c649becbdc7134a0eb78273ff56 Mon Sep 17 00:00:00 2001
From: Michael Martin <mcmartin@gmail.com>
Date: Mon, 8 Jun 2020 16:09:05 -0700
Subject: [PATCH] Fix icon on Windows with MinGW/MSYS2 builds, from Ala-lala

---
 sc2/Makefile.build      | 2 +-
 sc2/build/unix/build.sh | 2 +-
 sc2/src/res/Makeinfo    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sc2/Makefile.build b/sc2/Makefile.build
index cf55fde2b..b8fae45ea 100644
--- a/sc2/Makefile.build
+++ b/sc2/Makefile.build
@@ -56,7 +56,7 @@ $(OBJDIR)%.m.d: $(BUILD_ROOT)%.m
 	fi
 	$(call act,act_mkdep_m,MKDEP  ,$@)
 
-%.rc.o: %.rc
+$(OBJDIR)%.rc.o: $(BUILD_ROOT)%.rc
 	@DIR=$(dir $@); \
 	if [ ! -d $$DIR ]; then \
 		mkdir -p "$$DIR"; \
diff --git a/sc2/build/unix/build.sh b/sc2/build/unix/build.sh
index d384e926e..002ce6a48 100644
--- a/sc2/build/unix/build.sh
+++ b/sc2/build/unix/build.sh
@@ -99,7 +99,7 @@ if [ -z "$TARGET" ]; then
 fi
 BUILD_PROJECT="$TARGET"
 export TARGET BUILD_PROJECT ECHON
-export PREPROC_C MKDEP_C COMPILE_C PREPROC_CXX MKDEP_CXX COMPILE_CXX PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC LINK
+export PREPROC_C MKDEP_C COMPILE_C PREPROC_CXX MKDEP_CXX COMPILE_CXX PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC WINDRES LINK
 export "${BUILD_PROJECT}_CFLAGS" "${BUILD_PROJECT}_CXXFLAGS" "${BUILD_PROJECT}_LDFLAGS"
 
 # Add trailing / from objs dir
diff --git a/sc2/src/res/Makeinfo b/sc2/src/res/Makeinfo
index 2864305f7..61215fc25 100644
--- a/sc2/src/res/Makeinfo
+++ b/sc2/src/res/Makeinfo
@@ -1,6 +1,6 @@
 case "$HOST_SYSTEM" in
 	MINGW32*)
-		uqm_EXTRA_OFILES="UrQuanMasters.rc.o"
+		uqm_RCFILES="UrQuanMasters.rc"
 		;;
 esac