diff --git a/demos/makefile.b32 b/demos/makefile.b32
new file mode 100644
index 0000000000..74a83ee628
--- /dev/null
+++ b/demos/makefile.b32
@@ -0,0 +1,63 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds samples for Win95, BC++ WIN32
+# Use FINAL=1 argument to make to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+THISDIR=$(WXDIR)\demos
+
+#
+# Indicates kind of pb with demos
+#
+# No makefile.b32 file
+NOMAKE=1
+# No 16 bit version
+#ONLY32=1
+# Misc. compilation errors
+COMPIL=1
+# Need PNG
+PNGSETUP=
+
+!include $(WXDIR)\src\makemsc.env
+
+#
+# Please keep demos list up-to-date, in alphabetical order
+#
+all:
+        cd $(WXDIR)\demos\bombs
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\demos\dbbrowse
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\demos\forty
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\demos\fractal
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\demos\life
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\demos\poem
+        make -f makefile.b32 FINAL=$(FINAL)
+
+clean:
+        cd $(WXDIR)\demos\bombs
+        make -f makefile.b32 clean
+        cd $(WXDIR)\demos\dbbrowse
+        make -f makefile.b32 clean
+        cd $(WXDIR)\demos\forty
+        make -f makefile.b32 clean
+        cd $(WXDIR)\demos\fractal
+        make -f makefile.b32 clean
+        cd $(WXDIR)\demos\life
+        make -f makefile.b32 clean
+        cd $(WXDIR)\demos\poem
+        make -f makefile.b32 clean
+
diff --git a/samples/html/makefile.b32 b/samples/html/makefile.b32
new file mode 100644
index 0000000000..f4ce300786
--- /dev/null
+++ b/samples/html/makefile.b32
@@ -0,0 +1,54 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxHTML samples for Win95, BC++ WIN32
+# Use FINAL=1 argument to make to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+THISDIR=$(WXDIR)\samples
+
+all:
+        cd $(WXDIR)\samples\html\about
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\html\help
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\html\helpview
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\html\printing
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\html\test
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\html\virtual
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\html\widget
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\html\zip
+        make -f makefile.b32 FINAL=$(FINAL)
+
+clean:
+        cd $(WXDIR)\samples\html\about
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html\help
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html\helpview
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html\printing
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html\test
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html\virtual
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html\widget
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html\zip
+        make -f makefile.b32 clean
+
diff --git a/samples/makefile.b32 b/samples/makefile.b32
index 8c6ff6a223..3c65c8e7b5 100644
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -16,148 +16,260 @@ WXDIR = $(WXWIN)
 
 THISDIR=$(WXDIR)\samples
 
+#
+# Indicates kind of pb with samples
+#
+# No makefile.vc file
+NOMAKE=1
+# No 16 bit version
+#ONLY32=1
+# Misc. compilation errors
+COMPIL=1
+# Need PNG
+PNGSETUP=
+
+#
+# Please keep samples list up-to-date, in alphabetical order
+#
 all:
-        cd $(WXDIR)\samples\splitter
+        cd $(WXDIR)\samples\calendar
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\resource
+        cd $(WXDIR)\samples\caret
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\checklst
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\config
         make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\controls
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\listctrl
+        cd $(WXDIR)\samples\db
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\treectrl
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\validate
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\mdi
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\minimal
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\layout
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\printing
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\toolbar
+        cd $(WXDIR)\samples\ipc
         make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\dialogs
         make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\dnd
+        make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\docview
         make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\docvwmdi
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\controls
+        cd $(WXDIR)\samples\drawing
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\nativdlg
+        cd $(WXDIR)\samples\dynamic
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\font
         make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\grid
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\internat
+        cd $(WXDIR)\samples\newgrid
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dnd
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\help
+        make -f makefile.b32 FINAL=$(FINAL)
+!endif
+!if "$(PNGSETUP)"==""
+        cd $(WXDIR)\samples\html
+        make -f makefile.b32 FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\image
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\internat
         make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\joytest
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\taskbar
+        cd $(WXDIR)\samples\layout
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\sashtest
+        cd $(WXDIR)\samples\listctrl
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\mdi
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\menu
         make -f makefile.b32 FINAL=$(FINAL)
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
+        make -f makefile.b32 FINAL=$(FINAL)
 !endif
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\mfc
+        make -f makefile.b32 FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\minifram
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\minimal
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\nativdlg
+        make -f makefile.b32 FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\dialup
+        make -f makefile.b32 FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\notebook
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\oleauto
         make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\ownerdrw
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\checklst
+        cd $(WXDIR)\samples\png
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\minifram
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\bombs
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\fractal
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\wxpoem
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\typetest
+        cd $(WXDIR)\samples\printing
         make -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\proplist
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\image
+        cd $(WXDIR)\samples\regtest
         make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\resource
+        make -f makefile.b32 FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\richedit
+        make -f makefile.b32 FINAL=$(FINAL)
+!endif
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dde
+        cd $(WXDIR)\samples\sashtest
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\scroll
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\scrollsub
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\splitter
+        make -f makefile.b32 FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\tab
+        make -f makefile.b32 FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\taskbar
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\text
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\thread
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\toolbar
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\treectrl
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\typetest
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\validate
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\wizard
+        make -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\sockets
         make -f makefile.b32 FINAL=$(FINAL)
-#        cd $(WXDIR)\samples\regtest
-#        make -f makefile.b32 FINAL=$(FINAL)
 
 clean:
-        cd $(WXDIR)\samples\splitter
+        cd $(WXDIR)\samples\calendar
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\mdi
+        cd $(WXDIR)\samples\caret
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\minimal
+        cd $(WXDIR)\samples\checklst
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\layout
+        cd $(WXDIR)\samples\config
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\printing
+        cd $(WXDIR)\samples\controls
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\toolbar
+        cd $(WXDIR)\samples\db
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\ipc
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\dialogs
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\resource
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\listctrl
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\treectrl
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\validate
+        cd $(WXDIR)\samples\dnd
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\docview
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\docvwmdi
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\controls
+        cd $(WXDIR)\samples\drawing
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\nativdlg
+        cd $(WXDIR)\samples\dynamic
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\font
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\grid
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\internat
+        cd $(WXDIR)\samples\newgrid
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\checklst
+        cd $(WXDIR)\samples\help
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\ownerdrw
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\dnd
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\joytest
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\regtest
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\taskbar
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\sashtest
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\memcheck
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\minifram
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\bombs
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\fractal
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\wxpoem
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\typetest
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\proplist
+        cd $(WXDIR)\samples\html
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\image
         make -f makefile.b32 clean
+        cd $(WXDIR)\samples\internat
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\joytest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\layout
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\listctrl
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\mdi
+        make -f makefile.b32 clean
+!if "$(FINAL)" == "0"
+        cd $(WXDIR)\samples\memcheck
+        make -f makefile.b32 clean
+!endif
+        cd $(WXDIR)\samples\mfc
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\menu
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\minifram
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\minimal
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\nativdlg
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\dialup
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\notebook
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\oleauto
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\ownerdrw
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\png
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\printing
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\proplist
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\regtest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\resource
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\richedit
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\dde
+        cd $(WXDIR)\samples\sashtest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\scroll
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\scrollsub
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\splitter
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\tab
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\taskbar
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\text
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\thread
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\toolbar
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\treectrl
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\typetest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\validate
+        make -f makefile.b32 clean
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\wizard
+        make -f makefile.b32 clean
+!endif
+        cd $(WXDIR)\samples\sockets
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples
 
diff --git a/samples/richedit/makefile.b32 b/samples/richedit/makefile.b32
new file mode 100644
index 0000000000..5fa7ada399
--- /dev/null
+++ b/samples/richedit/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=wxlayout
+OBJECTS = wxLayout.obj kbList.obj wxllist.obj wxlparser.obj wxlwindow.obj
+
+!include $(WXDIR)\src\makeprog.b32
+