win32: make version info and manifest resources configurable

5 files changed, 38 insertions, 6 deletions

diff --git a/Config.in b/Config.in
index 10d8382a5..ed5427cb8 100644
--- a/Config.in
+++ b/Config.in
@@ -401,10 +401,32 @@ config FEATURE_PRNG_ISAAC
 
 endchoice
 
+config FEATURE_RESOURCES
+        bool "Include resources in binary"
+        default y
+        depends on PLATFORM_MINGW32
+        help
+        Microsoft Windows applications can contain non-executable resources
+        of various sorts.
+
+config FEATURE_VERSIONINFO
+        bool "Include version information in binary (1.0 kb)"
+        default y
+        depends on FEATURE_RESOURCES
+        help
+        Include version information in the application.
+
+config FEATURE_MANIFEST
+        bool "Include manifest in binary (1.5 kb)"
+        default y
+        depends on FEATURE_RESOURCES
+        help
+        Include a manifest which declares privleges required by the application.
+
 config FEATURE_ICON
         bool "Include application icon in binary"
         default y
-        depends on PLATFORM_MINGW32
+        depends on FEATURE_RESOURCES
         help
         Microsoft Windows applications can contain icons which are used in
         various places in the user interface.  Each icon adds 15 Kbytes to
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 249ae2072..7587f71da 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.29.0.git
-# Sun May 13 08:24:17 2018
+# Tue Jul 24 16:29:13 2018
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -40,6 +40,9 @@ CONFIG_BUSYBOX_EXEC_PATH=""
 # CONFIG_GLOBBING is not set
 CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
+CONFIG_FEATURE_RESOURCES=y
+CONFIG_FEATURE_VERSIONINFO=y
+CONFIG_FEATURE_MANIFEST=y
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
 # CONFIG_FEATURE_ICON_STERM is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 147e1e266..ab36a9ff2 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.29.0.git
-# Sun May 13 08:24:17 2018
+# Tue Jul 24 16:29:13 2018
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -40,6 +40,9 @@ CONFIG_BUSYBOX_EXEC_PATH=""
 # CONFIG_GLOBBING is not set
 CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
+CONFIG_FEATURE_RESOURCES=y
+CONFIG_FEATURE_VERSIONINFO=y
+CONFIG_FEATURE_MANIFEST=y
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
 # CONFIG_FEATURE_ICON_STERM is not set
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