2 files changed, 14 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index b487f0457..a64b0c926 100644
--- a/Makefile
+++ b/Makefile
@@ -312,6 +312,7 @@ AFLAGS_MODULE   = $(MODFLAGS)
 LDFLAGS_MODULE  = -r
 CFLAGS_KERNEL   =
 AFLAGS_KERNEL   =
+EXEEXT          =
 
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
@@ -491,6 +492,7 @@ libs-y		:= \
                 sysklogd/ \
                 util-linux/ \
                 util-linux/volume_id/ \
+                win32/ \
 
 endif # KBUILD_EXTMOD
 
@@ -529,7 +531,7 @@ endif
 # command line.
 # This allow a user to issue only 'make' to build a kernel including modules
 # Defaults busybox but it is usually overridden in the arch makefile
-all: busybox doc
+all: busybox$(EXEEXT) doc
 
 -include $(srctree)/arch/$(ARCH)/Makefile
 
@@ -712,16 +714,16 @@ debug_kallsyms: .tmp_map$(last_kallsyms)
 endif # ifdef CONFIG_KALLSYMS
 
 # busybox image - including updated kernel symbols
-busybox_unstripped: $(busybox-all) FORCE
+busybox_unstripped$(EXEEXT): $(busybox-all) FORCE
         $(call if_changed_rule,busybox__)
         $(Q)rm -f .old_version
 
-busybox: busybox_unstripped
+busybox$(EXEEXT): busybox_unstripped$(EXEEXT)
 ifeq ($(SKIP_STRIP),y)
         $(Q)cp $< $@
 else
         $(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
-                busybox_unstripped -o $@
+                busybox_unstripped$(EXEEXT) -o $@
 # strip is confused by PIE executable and does not set exec bits
         $(Q)chmod a+x $@
 endif
@@ -957,7 +959,7 @@ endif # CONFIG_MODULES
 
 # Directories & files removed with 'make clean'
 CLEAN_DIRS  += $(MODVERDIR) _install 0_lib
-CLEAN_FILES +=  busybox busybox_unstripped* busybox.links \
+CLEAN_FILES +=  busybox$(EXEEXT) busybox_unstripped* busybox.links \
                 System.map .kernelrelease \
                 .tmp_kallsyms* .tmp_version .tmp_busybox* .tmp_System.map
 
diff --git a/Makefile.flags b/Makefile.flags
index 307afa7f5..d9122ce94 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -115,6 +115,13 @@ CFLAGS += --sysroot=$(CONFIG_SYSROOT)
 export SYSROOT=$(CONFIG_SYSROOT)
 endif
 
+ifeq ($(CONFIG_PLATFORM_MINGW32),y)
+# These defintions are not strictly needed, but they help shut up fnmatch.c warnings
+CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy
+EXEEXT = .exe
+LDLIBS += userenv ws2_32
+endif
+
 # Android has no separate crypt library
 # gcc-4.2.1 fails if we try to feed C source on stdin:
 #  echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc -