From a925dbb413e67a0f817c37c836d42da02db51df2 Mon Sep 17 00:00:00 2001 From: galaxyhaxz Date: Sat, 23 Jun 2018 09:12:25 -0500 Subject: [PATCH] Update Makefile --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c51fd7f77..2485b07ad 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,11 @@ ifdef MINGW32 CXX=mingw32-g++ DLLTOOL=dlltool + WINDRES=windres else CXX=i686-w64-mingw32-g++ DLLTOOL=i686-w64-mingw32-dlltool + WINDRES=i686-w64-mingw32-windres endif # Clang doesn't understand permissive compilation, we need to "fix" invalid @@ -29,7 +31,7 @@ devilution.exe: $(OBJS) $(PKWARE_OBJS) diabres.o diabloui.lib storm.lib $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) diabres.o: Diablo.rc - windres $< $@ + $(WINDRES) $< $@ diabloui.lib: diabloui.dll DiabloUI/diabloui_gcc.def $(DLLTOOL) -d DiabloUI/diabloui_gcc.def -D $< -l $@