diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index 9ac3bf7c9d..8e88b03128 100644
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -26,6 +26,13 @@
         $project{$tag} .= '$(GENDIR)\\' . $file . " "
     }
 
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)\\' . $file . " "
+    }
+
     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\b(16|U)\b/;
 
@@ -35,9 +42,9 @@
 
     foreach $file (sort keys %wxMSW) {
         #! these files don't compile with SC++ 6
-        next if $file =~ /^(joystick|pnghand)\./;
+        #! next if $file =~ /^(joystick|pnghand)\./;
 
-        next if $wxGeneric{$file} =~ /\b16\b/;
+        next if $wxMSW{$file} =~ /\b16\b/;
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
@@ -50,18 +57,20 @@
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
-# Symantec C++ makefile for the msw objects
+# Digital mars makefile 
+# was Symantec C++ makefile for the msw objects
+#
 # called from src\makefile.sc
 
 # configuration section (see src\makefile.sc) ###########################
 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 
 include ..\makesc.env
 
 DEBUG=0
 
-LIBTARGET = $(LIBDIR)\wx.lib
+LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
 OPTIONS=
 
@@ -69,43 +78,90 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
+HTMLDIR=$(WXDIR)\src\html
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
 
-COMMONOBJS = \
-		$(COMMDIR)\y_tab.obj \
-		#$ ExpandList("WXCOMMONOBJS");
+COMMONOBJS = #$ ExpandList("WXCOMMONOBJS");
+
+HTMLOBJS = #$ ExpandList ("WXHTMLOBJS");
 
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
-all: $(LIBTARGET)
+all: MAKEARCHDIR MAKELIBS PCH $(LIBTARGET) zlib png jpeg tiff regex
+
+MAKEARCHDIR:
+    @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
+    @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)
+    @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)\wx
+    @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
+    @if not exist $(WXOUTDIR)\nul mkdir $(WXOUTDIR)
+
+#build our own copies of missing libraries
+MAKELIBS:
+      implib  /s $(LIBDIR)\$(SHELLLIB) $(LIBDIR)\$(SC_SUFFIX)\$(SHELLLIB).def
+      implib  /s $(LIBDIR)\$(WINSOCKLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINSOCKLIB).def
 
 $(LIBTARGET): $(OBJECTS)
 	-del $(LIBTARGET)
 	*lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
-clean:
+clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex clean_pch
+
+clean_msw:
+	-del $(COMMDIR)\*.obj
+	-del $(MSWDIR)\*.obj
+	-del $(GENDIR)\*.obj
+        -del $(HTMLDIR)\*.obj
 	-del *.obj
-    -del $(LIBTARGET)
+        -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)
 
-$(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+PCH: $(INCDIR)\wx\wxprec.h
+        dmc $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -HF$(WXOUTDIR)\wxprec.SYM -o$(WXOUTDIR)\wxprec.PCO $(INCDIR)\wx\wxprec.h
 
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+clean_pch:
+        del $(WXOUTDIR)\*.sym
+        del $(WXOUTDIR)\*.PCO
 
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-# $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
-#	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+png:   
+        make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
+
+clean_png:
+        make -f $(WXDIR)\src\png\makefile.sc clean
+
+zlib:   
+        make -f $(WXDIR)\src\zlib\makefile.sc FINAL=$(FINAL) 
+
+clean_zlib:
+        make -f $(WXDIR)\src\zlib\makefile.sc clean
+
+jpeg:   
+        make -f $(WXDIR)\src\jpeg\makefile.sc FINAL=$(FINAL)
+
+clean_jpeg:
+        make -f $(WXDIR)\src\jpeg\makefile.sc clean
+
+regex:  
+        make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) 
+
+clean_regex:
+        make -f $(WXDIR)\src\regex\makefile.sc clean
+
+tiff:  
+        make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) 
+
+clean_tiff:
+        make -f $(WXDIR)\src\tiff\makefile.sc clean
 
 MFTYPE=sc
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-	cd $(WXWIN)\distrib\msw\tmake
-	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc
+	copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 8231f84035..80a498f4d8 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -156,6 +156,9 @@
     #elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
         // Watcom 11+ supports bool
         #define HAVE_BOOL
+    #elif defined(__DIGITALMARS__)
+        // DigitalMars supports bool
+        #define HAVE_BOOL
     #elif defined(__GNUWIN32__)
         // Cygwin supports bool
         #define HAVE_BOOL
@@ -242,6 +245,8 @@ typedef int wxWindowID;
     #elif defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
         // Metrowerks CW6 or higher has explicit
         #define HAVE_EXPLICIT
+    #elif defined(__DIGITALMARS__)
+        #define HAVE_EXPLICIT
     #endif
 #endif // !HAVE_EXPLICIT
 
diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 02cf858084..af95611674 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -163,7 +163,7 @@ typedef struct tagNMLVDISPINFOW {
 #endif
 #endif
 
-#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__)) && !defined(HDN_GETDISPINFOW)
+#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__) || defined (__MINGW32__) || defined(__DIGITALMARS__) || defined (__BORLANDC__)) && !defined(HDN_GETDISPINFOW)
 #define HDN_GETDISPINFOW (HDN_FIRST-29)
 #if !wxCHECK_W32API_VERSION(2, 2)
 typedef struct {
@@ -178,6 +178,12 @@ typedef struct {
 #endif
 #endif
 
+// ----------------------------------------------------------------------------
+// Toolbar define value missing 
+// ----------------------------------------------------------------------------
+#if defined(__DIGITALMARS__) 
+#define CCS_VERT                0x00000080L
+#endif
 
 // ----------------------------------------------------------------------------
 // MS HTML Help
diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index a628ee50a4..b7d50009df 100644
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -135,7 +135,7 @@ private:
   {                                                                           \
     wxLogRelease(_T(#classname), m_cRef);                                     \
                                                                               \
-    if ( --m_cRef == 0 ) {                                                    \
+    if ( --m_cRef == wxAutoULong(0) ) {                                                    \
       delete this;                                                            \
       return 0;                                                               \
     }                                                                         \
diff --git a/include/wx/platform.h b/include/wx/platform.h
index 5316fbda9f..a44c32fd30 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -276,6 +276,14 @@
     #define __X__
 #endif
 
+#ifdef __SC__
+    #ifdef __DMC__
+         #define __DIGITALMARS__
+    #else
+         #define __SYMANTEC__
+    #endif
+#endif
+
 /*
    This macro can be used to test the gcc version and can be used like this:
 
@@ -294,7 +302,7 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
+#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ ) || defined(__DIGITALMARS__)
     #include "wx/msw/gccpriv.h"
 #else
     #undef wxCHECK_W32API_VERSION
diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index afa67254cf..377f928827 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -20,6 +20,10 @@
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 
+#ifdef __DIGITALMARS__
+#include "typeinfo.h"
+#endif
+
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 #  undef __BSEXCPT__
 #endif
diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 5e2902b424..7a4dc04b56 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,7 +14,7 @@
 
 // check if to use precompiled headers: do it for most Windows compilers unless
 // explicitly disabled by defining NOPCH
-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__)
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__)
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index b1e8b9e3de..dbd169c165 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -33,7 +33,7 @@
 //     This causes a conflict with jmorecfg.h header from libjpeg, so we have
 //     to make sure libjpeg won't try to define boolean itself. This is done by
 //     defining HAVE_BOOLEAN.
-#if defined(__WXMSW__) && (defined(__MWERKS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200))
+#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200))
     #define HAVE_BOOLEAN
     #include <windows.h>
 #endif
diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 26be81401e..e96257c8b6 100644
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -39,7 +39,7 @@
 #endif //WX_PRECOMP
 
 // FreeBSD & Watcom require this, it probably doesn't hurt for others
-#if defined(__UNIX__) || defined(__WATCOMC__)
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
     #include <sys/types.h>
 #endif
 
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 714ea4361f..bba5832b6b 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -746,7 +746,7 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 
     // VS: this is needed because the event handler is called from wxTreeCtrl
     //     ctor when wxTR_HIDE_ROOT was specified
-    if (m_rootId == 0)
+    if (!m_rootId.IsOk())
         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);
diff --git a/src/makesc.env b/src/makesc.env
index 064e1cbf02..dac29a2404 100644
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -1,41 +1,50 @@
 # Common settings for Symantec
+# and digital mars successor (http://www.digitalmars.com)
+SC_SUFFIX=_sc
 
-WXDIR = $(WXWIN)
+####WXDIR = $(WXWIN)
+WXOUTDIR=$(WXDIR)\d_mars
 INCDIR = $(WXDIR)\include
+CONTRIBINCDIR = $(WXDIR)\contrib\include
+MSWINCDIR = $(WXDIR)\include\wx\msw
+ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
-WXLIB = $(LIBDIR)\wx.lib
+WXLIB = wx$(SC_SUFFIX).lib
+WINSOCKLIB = wsock32$(SC_SUFFIX)
+SHELLLIB = shell32$(SC_SUFFIX)
+SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX) $(SHELLLIB) $(WINSOCKLIB)
 
 SRCSUFF = cpp
 OBJSUFF = obj
 
-INCLUDE=$(INCDIR)
+INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(CONTRIBINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
+
+
 
 # default values
 
-CC=sc
-RC=rc
-
-# WIN16 settings
-#CFLAGS = -Jm -ml -W -D__WXMSW__ -D__SC__ -D__WXDEBUG__ -D__WINDOWS__ -D__WIN16__ $(EXTRACPPFLAGS)
-#LINKER = link
-#LDFLAGS = -ml -W -L$(LINKER).exe $(EXTRALDFLAGS)
-#LIBS=$(WXLIB) $(EXTRALIBS) libw.lib commdlg.lib ddeml.lib shell.lib # $(LIB)\ctl3dv2.lib
-#DEFFILE=sc16.def
+CC=dmc
+RC=rcc
 
 # WIN32 settings
-CFLAGS = -o -mn -W -D__NT__ -DWIN32 -D__WIN32__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
-LINKER = link386
-LDFLAGS = -L$(LINKER).exe $(EXTRALDFLAGS)
-LIBS=$(WXLIB) $(EXTRALIBS) ctl3d32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib kernel32.lib winmm.lib
-DEFFILE=sc32.def
+# -H ... fix to use directory
+##CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
+CFLAGS = -mn -D_WINDOWS -6 -a8 -Nc -c -H -HD$(WXOUTDIR) -HO- -DWXMSW -D__WIN32__ -D__WIN95__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
+CPPFLAGS = -cpp -Ae -Ar
+
+LINKER = link
+# possible bug with putting d on any extralibs if we have debug and release versions one day
+LDFLAGS = $(EXTRALDFLAGS)
+LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid 
+
 
 .$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $< -o$@
+	*$(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCLUDE) $(OPTIONS) $< -o$@
 
-# -Jm: relaxed type checking
+# -Jm: relaxed type checking only for .C files
 .c.obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
+	*$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
 
 .rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
+	*$(RC) -D__NT__ -r $(INCLUDE) $<
 
diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index ae9d13cd19..33b12105c6 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -152,7 +152,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it
-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) && !defined(__SYMANTEC__)
       RECT rect;
       rect.left   = 0;
       rect.top    = 0;
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index f9a7abbdbd..90a17d09b3 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -3,18 +3,20 @@
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
-# Symantec C++ makefile for the msw objects
+# Digital mars makefile 
+# was Symantec C++ makefile for the msw objects
+#
 # called from src\makefile.sc
 
 # configuration section (see src\makefile.sc) ###########################
 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 
 include ..\makesc.env
 
 DEBUG=0
 
-LIBTARGET = $(LIBDIR)\wx.lib
+LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
 OPTIONS=
 
@@ -22,6 +24,7 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
+HTMLDIR=$(WXDIR)\src\html
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
@@ -57,9 +60,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\treelay.obj \
 		$(GENDIR)\wizard.obj
 
-COMMONOBJS = \
-		$(COMMDIR)\y_tab.obj \
-		$(COMMDIR)\appcmn.obj \
+COMMONOBJS = $(COMMDIR)\appcmn.obj \
 		$(COMMDIR)\artprov.obj \
 		$(COMMDIR)\artstd.obj \
 		$(COMMDIR)\choiccmn.obj \
@@ -191,6 +192,27 @@ COMMONOBJS = \
 		$(COMMDIR)\zipstrm.obj \
 		$(COMMDIR)\zstream.obj
 
+HTMLOBJS = $(HTMLDIR)\helpctrl.obj \
+		$(HTMLDIR)\helpdata.obj \
+		$(HTMLDIR)\helpfrm.obj \
+		$(HTMLDIR)\htmlcell.obj \
+		$(HTMLDIR)\htmlfilt.obj \
+		$(HTMLDIR)\htmlpars.obj \
+		$(HTMLDIR)\htmltag.obj \
+		$(HTMLDIR)\htmlwin.obj \
+		$(HTMLDIR)\htmprint.obj \
+		$(HTMLDIR)\m_dflist.obj \
+		$(HTMLDIR)\m_fonts.obj \
+		$(HTMLDIR)\m_hline.obj \
+		$(HTMLDIR)\m_image.obj \
+		$(HTMLDIR)\m_layout.obj \
+		$(HTMLDIR)\m_links.obj \
+		$(HTMLDIR)\m_list.obj \
+		$(HTMLDIR)\m_pre.obj \
+		$(HTMLDIR)\m_style.obj \
+		$(HTMLDIR)\m_tables.obj \
+		$(HTMLDIR)\winpars.obj
+
 MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\app.obj \
 		$(MSWDIR)\ole\automtn.obj \
@@ -236,7 +258,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\fontutil.obj \
 		$(MSWDIR)\frame.obj \
 		$(MSWDIR)\gauge95.obj \
-		$(MSWDIR)\gaugemsw.obj \
 		$(MSWDIR)\gdiimage.obj \
 		$(MSWDIR)\gdiobj.obj \
 		$(MSWDIR)\glcanvas.obj \
@@ -246,8 +267,11 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\helpchm.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
+		$(MSWDIR)\imaglist.obj \
 		$(MSWDIR)\iniconf.obj \
+		$(MSWDIR)\joystick.obj \
 		$(MSWDIR)\listbox.obj \
+		$(MSWDIR)\listctrl.obj \
 		$(MSWDIR)\main.obj \
 		$(MSWDIR)\mdi.obj \
 		$(MSWDIR)\menu.obj \
@@ -258,6 +282,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\msgdlg.obj \
 		$(MSWDIR)\mslu.obj \
 		$(MSWDIR)\nativdlg.obj \
+		$(MSWDIR)\notebook.obj \
 		$(MSWDIR)\ole\oleutils.obj \
 		$(MSWDIR)\ownerdrw.obj \
 		$(MSWDIR)\palette.obj \
@@ -274,7 +299,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\scrolbar.obj \
 		$(MSWDIR)\settings.obj \
 		$(MSWDIR)\slider95.obj \
-		$(MSWDIR)\slidrmsw.obj \
 		$(MSWDIR)\snglinst.obj \
 		$(MSWDIR)\spinbutt.obj \
 		$(MSWDIR)\spinctrl.obj \
@@ -286,7 +310,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\tabctrl.obj \
 		$(MSWDIR)\taskbar.obj \
 		$(MSWDIR)\tbar95.obj \
-		$(MSWDIR)\tbarmsw.obj \
 		$(MSWDIR)\textctrl.obj \
 		$(MSWDIR)\tglbtn.obj \
 		$(MSWDIR)\thread.obj \
@@ -297,36 +320,83 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\utils.obj \
 		$(MSWDIR)\utilsexc.obj \
 		$(MSWDIR)\ole\uuid.obj \
+		$(MSWDIR)\uxtheme.obj \
 		$(MSWDIR)\volume.obj \
 		$(MSWDIR)\wave.obj \
 		$(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
-all: $(LIBTARGET)
+all: MAKEARCHDIR MAKELIBS PCH $(LIBTARGET) zlib png jpeg tiff regex
+
+MAKEARCHDIR:
+    @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
+    @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)
+    @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)\wx
+    @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
+    @if not exist $(WXOUTDIR)\nul mkdir $(WXOUTDIR)
+
+#build our own copies of missing libraries
+MAKELIBS:
+      dimplib  /s $(LIBDIR)\$(SHELLLIB) $(LIBDIR)\$(SC_SUFFIX)\$(SHELLLIB).def
+      dimplib  /s $(LIBDIR)\$(WINSOCKLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINSOCKLIB).def
 
 $(LIBTARGET): $(OBJECTS)
 	-del $(LIBTARGET)
 	*lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
-clean:
+clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex clean_pch
+
+clean_msw:
+	-del $(COMMDIR)\*.obj
+	-del $(MSWDIR)\*.obj
+	-del $(GENDIR)\*.obj
+        -del $(HTMLDIR)\*.obj
 	-del *.obj
-    -del $(LIBTARGET)
+        -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)
 
-$(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+PCH: $(INCDIR)\wx\wxprec.h
+        dmc $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -HF$(WXOUTDIR)\wxprec.SYM -o$(WXOUTDIR)\wxprec.PCO $(INCDIR)\wx\wxprec.h
 
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+clean_pch:
+        del $(WXOUTDIR)\*.sym
+        del $(WXOUTDIR)\*.PCO
 
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-# $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
-#	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+png:   
+        make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
+
+clean_png:
+        make -f $(WXDIR)\src\png\makefile.sc clean
+
+zlib:   
+        make -f $(WXDIR)\src\zlib\makefile.sc FINAL=$(FINAL) 
+
+clean_zlib:
+        make -f $(WXDIR)\src\zlib\makefile.sc clean
+
+jpeg:   
+        make -f $(WXDIR)\src\jpeg\makefile.sc FINAL=$(FINAL)
+
+clean_jpeg:
+        make -f $(WXDIR)\src\jpeg\makefile.sc clean
+
+regex:  
+        make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) 
+
+clean_regex:
+        make -f $(WXDIR)\src\regex\makefile.sc clean
+
+tiff:  
+        make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) 
+
+clean_tiff:
+        make -f $(WXDIR)\src\tiff\makefile.sc clean
 
 MFTYPE=sc
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-	cd $(WXWIN)\distrib\msw\tmake
-	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc
+	copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 785b86c9d2..8763fcd9fd 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -47,6 +47,13 @@
     #include "malloc.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// Toolbar define value missing 
+// ----------------------------------------------------------------------------
+#if defined(__DIGITALMARS__) 
+#define CCS_VERT                0x00000080L
+#endif
+
 #include "wx/msw/private.h"
 
 #ifndef __TWIN32__
diff --git a/src/tiff/tif_apple.c b/src/tiff/tif_apple.c
index bbebe27ca6..674ff94002 100644
--- a/src/tiff/tif_apple.c
+++ b/src/tiff/tif_apple.c
@@ -46,7 +46,7 @@
 #include <Files.h>
 #include <Memory.h>
 
-#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__) || defined(applec)
+#if defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__) || defined(applec)
 #define	CtoPstr	c2pstr
 #endif
 
diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h
index bb5fb8c7e3..637e9edbd9 100644
--- a/src/tiff/tiffcomp.h
+++ b/src/tiff/tiffcomp.h
@@ -56,9 +56,13 @@
 #include <math.h>
 #endif
 
+#if defined (__SC__) && !defined (__DMC__)
+    #define __SYMANTEC__
+#endif
+
 #include <stdio.h>
 
-#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#if defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__)
 #include <types.h>
 #elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
 #include <sys/types.h>
@@ -79,7 +83,7 @@
  * additional includes are also done to pull in the
  * appropriate definitions we're looking for.
  */
-#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__)
 #include <stdlib.h>
 #define	BSDTYPES
 #define	HAVE_UNISTD_H	0
@@ -133,7 +137,7 @@ typedef	unsigned long u_long;
  * stack (when coerced by the compiler).
  */
 /* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */
-#if defined(__SC__) || defined(THINK_C)
+#if defined(__SYMANTEC__) || defined(THINK_C)
 typedef extended dblparam_t;
 #else
 typedef double dblparam_t;