aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--win32/resources/Kbuild.src5
-rw-r--r--win32/resources/resources.rc2
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ea40cd14b..b6aa3f158 100644
--- a/Makefile
+++ b/Makefile
@@ -983,6 +983,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
983 include/applets.h \ 983 include/applets.h \
984 include/usage.h \ 984 include/usage.h \
985 applets/usage \ 985 applets/usage \
986 win32/resources/busybox-w32.manifest \
986 .kernelrelease Module.symvers tags TAGS cscope* \ 987 .kernelrelease Module.symvers tags TAGS cscope* \
987 busybox_old 988 busybox_old
988 989
diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src
index 73fbfb7c7..7cc010613 100644
--- a/win32/resources/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -14,7 +14,8 @@ bb_level = $(or $(word 2,$(subst -, ,$1)),0)
14WRFLAGS := -D"KBUILD_STR(s)=\#s" -D"BB_VER=KBUILD_STR($(BB_VER))" \ 14WRFLAGS := -D"KBUILD_STR(s)=\#s" -D"BB_VER=KBUILD_STR($(BB_VER))" \
15 -D"BB_VERSION=$(VERSION)" -D"BB_PATCHLEVEL=$(PATCHLEVEL)" \ 15 -D"BB_VERSION=$(VERSION)" -D"BB_PATCHLEVEL=$(PATCHLEVEL)" \
16 -D"BB_SUBLEVEL=$(SUBLEVEL)" \ 16 -D"BB_SUBLEVEL=$(SUBLEVEL)" \
17 -D"BB_EXTRAVERSION=$(call bb_level,$(EXTRAVERSION))" 17 -D"BB_EXTRAVERSION=$(call bb_level,$(EXTRAVERSION))" \
18 --include-dir=$(objtree)/include --include-dir=$(objtree)/win32/resources
18 19
19quiet_cmd_windres = WINDRES $@ 20quiet_cmd_windres = WINDRES $@
20 cmd_windres = $(WINDRES) $(WRFLAGS) $< $@ 21 cmd_windres = $(WINDRES) $(WRFLAGS) $< $@
@@ -27,4 +28,4 @@ win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico
27win32/resources/resources.o: win32/resources/busybox-w32.manifest 28win32/resources/resources.o: win32/resources/busybox-w32.manifest
28 29
29win32/resources/busybox-w32.manifest: win32/resources/busybox-w32.manifest.src .config 30win32/resources/busybox-w32.manifest: win32/resources/busybox-w32.manifest.src .config
30 @sed -b "s/VERSION/$(BB_VER)/" win32/resources/busybox-w32.manifest.src >win32/resources/busybox-w32.manifest 31 @sed -b "s/VERSION/$(BB_VER)/" $< >$@
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc
index 891f8a485..f77a3bcc9 100644
--- a/win32/resources/resources.rc
+++ b/win32/resources/resources.rc
@@ -1,4 +1,4 @@
1#include "../../include/autoconf.h" 1#include <autoconf.h>
2 2
3#if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL 3#if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL
41 ICON "aterm.ico" 41 ICON "aterm.ico"