Patch 3463020: Add windres environment variable for makefiles (icebreaker)

CHANGES.txt

@@ -50,6 +50,7 @@
 * Patch 3428348: Add .gitignore file (Konstantin Tokarev)
 * Patch 3430158: Reorder LINKCMD for Gmake (rjmyst3)
 * Patch 3451212: Fix Visual Studio MFC with StaticRuntime
+* Patch 3463020: Add windres environment variable for makefiles (icebreaker)
 
 
 -------

src/actions/make/make_cpp.lua

@@ -118,7 +118,7 @@
 			elseif (path.getextension(file) == ".rc") then
 				_p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))
 				_p('\t@echo $(notdir $<)')
-				_p('\t$(SILENT) windres $< -O coff -o "$@" $(RESFLAGS)')
+				_p('\t$(SILENT) $(RESCOMP) $< -O coff -o "$@" $(RESFLAGS)')
 			end
 		end
 		_p('')
@@ -161,9 +161,17 @@
 		_p('  AR = %s', cc.ar)
 		_p('endif')
 		_p('')
+		
+		_p('ifndef RESCOMP')
+		_p('  ifdef WINDRES')
+		_p('    RESCOMP = $(WINDRES)')
+		_p('  else')
+		_p('    RESCOMP = windres')
+		_p('  endif')
+		_p('endif')
+		_p('')	
 	end
 
-
 --
 -- Write a block of configuration settings.
 --

tests/test_gmake_cpp.lua

@@ -58,6 +58,14 @@ endif
 ifndef AR
   AR = ar
 endif
+
+ifndef RESCOMP
+  ifdef WINDRES
+    RESCOMP = $(WINDRES)
+  else
+    RESCOMP = windres
+  endif
+endif
 		]]
 	end