From 43dd125914c7cc4656cf06b23230031e3444c5ff Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Tue, 24 Jul 2018 16:34:52 +0100
Subject: win32: make version info and manifest resources configurable

---
 win32/icon/Kbuild.src | 2 +-
 win32/icon/icon.rc    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'win32')

diff --git a/win32/icon/Kbuild.src b/win32/icon/Kbuild.src
index b9c322529..15e59e474 100644
--- a/win32/icon/Kbuild.src
+++ b/win32/icon/Kbuild.src
@@ -6,7 +6,7 @@
 
 obj-y :=
 
-obj-$(CONFIG_FEATURE_ICON) += icon.o
+obj-$(CONFIG_FEATURE_RESOURCES) += icon.o
 
 # return commit level if available or 0
 bb_level = $(or $(word 2,$(subst -, ,$1)),0)
diff --git a/win32/icon/icon.rc b/win32/icon/icon.rc
index 77332428b..891f8a485 100644
--- a/win32/icon/icon.rc
+++ b/win32/icon/icon.rc
@@ -1,12 +1,13 @@
 #include "../../include/autoconf.h"
 
-#if CONFIG_FEATURE_ICON_ATERM || CONFIG_FEATURE_ICON_ALL
+#if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL
 1 ICON "aterm.ico"
 #endif
-#if CONFIG_FEATURE_ICON_STERM || CONFIG_FEATURE_ICON_ALL
+#if ENABLE_FEATURE_ICON_STERM || ENABLE_FEATURE_ICON_ALL
 2 ICON "sterm.ico"
 #endif
 
+#if ENABLE_FEATURE_VERSIONINFO
 1 VERSIONINFO
 FILEVERSION     BB_VERSION,BB_PATCHLEVEL,BB_SUBLEVEL,BB_EXTRAVERSION
 PRODUCTVERSION  BB_VERSION,BB_PATCHLEVEL,BB_SUBLEVEL,BB_EXTRAVERSION
@@ -30,5 +31,8 @@ BEGIN
     VALUE "Translation", 0x809, 1252
   END
 END
+#endif
 
+#if ENABLE_FEATURE_MANIFEST
 1 RT_MANIFEST "busybox-w32.manifest"
+#endif
-- 
cgit v1.2.3-55-g6feb