win32: revise creation of resources

As reported in https://github.com/skeeto/w64devkit/issues/35
there's a problem creating Windows resources using the native
version of `windres`.

Avoid passing arguments to `windres` that it can't handle by
stringizing the version string locally in resource.rc.

(GitHub issue #239)

2 files changed, 5 insertions, 3 deletions

diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src
index 550eddaa0..9e5fe4e10 100644
--- a/win32/resources/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -12,7 +12,7 @@ obj-$(CONFIG_FEATURE_RESOURCES) += dummy.o
 # return commit level if available or 0
 bb_level = $(or $(word 2,$(subst -, ,$1)),0)
 
-WRFLAGS := -D"KBUILD_STR(s)=\#s" -D"BB_VER=KBUILD_STR($(BB_VER))" \
+WRFLAGS := -D"BB_VER=$(BB_VER)" \
         -D"BB_VERSION=$(VERSION)" -D"BB_PATCHLEVEL=$(PATCHLEVEL)" \
         -D"BB_SUBLEVEL=$(SUBLEVEL)" \
         -D"BB_EXTRAVERSION=$(call bb_level,$(EXTRAVERSION))" \
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc
index 2b9619cef..f459ebb73 100644
--- a/win32/resources/resources.rc
+++ b/win32/resources/resources.rc
@@ -1,4 +1,6 @@
 #include <autoconf.h>
+#define xstr(s) str(s)
+#define str(s) #s
 
 #if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL
 1 ICON "aterm.ico"
@@ -18,12 +20,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "frippery.org"
       VALUE "FileDescription", "BusyBox multi-call binary"
-      VALUE "FileVersion", BB_VER
+      VALUE "FileVersion", xstr(BB_VER)
       VALUE "InternalName", "busybox"
       VALUE "LegalCopyright", "(C) 1998-2022 Many authors"
       VALUE "OriginalFilename", "busybox.exe"
       VALUE "ProductName", "busybox-w32"
-      VALUE "ProductVersion", BB_VER
+      VALUE "ProductVersion", xstr(BB_VER)
     END
   END
   BLOCK "VarFileInfo"