diff --git a/samples/combo/makefile.dmc b/samples/combo/makefile.dmc
index fa96ad5f63..6eb9355e4b 100644
--- a/samples/combo/makefile.dmc
+++ b/samples/combo/makefile.dmc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,20 +12,20 @@ include ../../build/msw/config.dmc
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 27
-OBJS = dmc_msw$(CFG)
+WX_RELEASE_NODOT = 28
+OBJS = dmc_mswd$(CFG)
 LIBTYPE_SUFFIX = lib
 LIBDIRNAME = .\..\..\lib\dmc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = $(LIBDIRNAME)\msw
-COMBO_CXXFLAGS = -o -D_WIN32_WINNT=0x0400 -D__WXMSW__ -I$(SETUPHDIR) \
-	-I.\..\..\include -w- -I. -WA -I.\..\..\samples -DNOPCH -Ar -Ae $(CPPFLAGS) \
-	$(CXXFLAGS)
+SETUPHDIR = $(LIBDIRNAME)\mswd
+COMBO_CXXFLAGS = -g -o+none -D_WIN32_WINNT=0x0400 -D__WXMSW__ -D__WXDEBUG__ \
+	-I$(SETUPHDIR) -I.\..\..\include -w- -I. -WA -I.\..\..\samples -DNOPCH -Ar -Ae \
+	$(CPPFLAGS) $(CXXFLAGS)
 COMBO_OBJECTS =  \
 	$(OBJS)\combo_combo.obj
 
 ### Targets: ###
 
-all : $(OBJS)\combo.exe
+all : $(OBJS)\combo.exe data
 
 clean : 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -35,10 +35,14 @@ clean :
 	-if exist $(OBJS)\combo.map del $(OBJS)\combo.map
 
 $(OBJS)\combo.exe : $(COMBO_OBJECTS)  $(OBJS)\combo_sample.res
-	link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS)   /su:windows:4.0 $(COMBO_OBJECTS),$@,$(OBJS)\combo.map, $(LIBDIRNAME)\ wxmsw$(WX_RELEASE_NODOT)$(WX_LIB_FLAVOUR)_core.lib  wxbase$(WX_RELEASE_NODOT)$(WX_LIB_FLAVOUR).lib  wxmsw$(WX_RELEASE_NODOT)$(WX_LIB_FLAVOUR)_adv.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib  wxregex.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib,, $(OBJS)\combo_sample.res
+	link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS) /DEBUG /CODEVIEW  /su:windows:4.0 $(COMBO_OBJECTS),$@,$(OBJS)\combo.map, $(LIBDIRNAME)\ wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_adv.lib  wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_core.lib  wxbase$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR).lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib  wxregexd.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib,, $(OBJS)\combo_sample.res
+
+data : 
+	if not exist $(OBJS) mkdir $(OBJS)
+	for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\combo_sample.res : .\..\..\samples\sample.rc
-	rcc .\..\..\samples\sample.rc -o$@  -D_WIN32_WINNT=0x0400 -D__WXMSW__        -I$(SETUPHDIR) -I.\..\..\include -I.  -I.\..\..\samples -32 -v-
+	rcc .\..\..\samples\sample.rc -o$@   -D_WIN32_WINNT=0x0400 -D__WXMSW__  -D__WXDEBUG__       -I$(SETUPHDIR) -I.\..\..\include -I.  -I.\..\..\samples -DNOPCH -32 -v-
 
 $(OBJS)\combo_combo.obj : .\combo.cpp
 	$(CXX) -mn -c -cpp -o$@ $(COMBO_CXXFLAGS) .\combo.cpp