]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.sc
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Try to find comctl32.dll version even if we don't have shlwapi.h available,
[wxWidgets.git] / src / msw / makefile.sc
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 9038c52738e9e5951cdf2a6255258b04d5b67bbd..35402f14531f3fe3f211589b9c2262aa1bfa749c 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,20 +1,22 @@
 
 
 
 
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # 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) ###########################
 
 # called from src\makefile.sc
 
 # configuration section (see src\makefile.sc) ###########################
 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 
 include ..\makesc.env
 
 DEBUG=0
 
 
 include ..\makesc.env
 
 DEBUG=0
 
-LIBTARGET = $(LIBDIR)\wx.lib
+LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
 OPTIONS=
 
 
 OPTIONS=
 
@@ -22,12 +24,15 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
+HTMLDIR=$(WXDIR)\src\html
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
+               $(GENDIR)\dcbuffer.obj \
+               $(GENDIR)\dcpsg.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dragimgg.obj \
                $(GENDIR)\grid.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dragimgg.obj \
                $(GENDIR)\grid.obj \
@@ -38,26 +43,26 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \
                $(GENDIR)\progdlgg.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \
                $(GENDIR)\progdlgg.obj \
-               $(GENDIR)\prop.obj \
-               $(GENDIR)\propform.obj \
-               $(GENDIR)\proplist.obj \
+               $(GENDIR)\renderg.obj \
                $(GENDIR)\sashwin.obj \
                $(GENDIR)\scrlwing.obj \
                $(GENDIR)\sashwin.obj \
                $(GENDIR)\scrlwing.obj \
+               $(GENDIR)\selstore.obj \
                $(GENDIR)\spinctlg.obj \
                $(GENDIR)\splash.obj \
                $(GENDIR)\splitter.obj \
                $(GENDIR)\statusbr.obj \
                $(GENDIR)\spinctlg.obj \
                $(GENDIR)\splash.obj \
                $(GENDIR)\splitter.obj \
                $(GENDIR)\statusbr.obj \
-               $(GENDIR)\tbarsmpl.obj \
                $(GENDIR)\textdlgg.obj \
                $(GENDIR)\tipdlg.obj \
                $(GENDIR)\tipwin.obj \
                $(GENDIR)\treectlg.obj \
                $(GENDIR)\textdlgg.obj \
                $(GENDIR)\tipdlg.obj \
                $(GENDIR)\tipwin.obj \
                $(GENDIR)\treectlg.obj \
-               $(GENDIR)\treelay.obj \
                $(GENDIR)\wizard.obj
 
                $(GENDIR)\wizard.obj
 
-COMMONOBJS = \
-               $(COMMDIR)\y_tab.obj \
+COMMONOBJS = $(COMMDIR)\accesscmn.obj \
+               $(COMMDIR)\appbase.obj \
                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\appcmn.obj \
+               $(COMMDIR)\artprov.obj \
+               $(COMMDIR)\artstd.obj \
+                $(COMMDIR)\bookctrl.obj \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
                $(COMMDIR)\clntdata.obj \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
                $(COMMDIR)\clntdata.obj \
@@ -69,6 +74,7 @@ COMMONOBJS = \
                $(COMMDIR)\cshelp.obj \
                $(COMMDIR)\ctrlcmn.obj \
                $(COMMDIR)\ctrlsub.obj \
                $(COMMDIR)\cshelp.obj \
                $(COMMDIR)\ctrlcmn.obj \
                $(COMMDIR)\ctrlsub.obj \
+               $(COMMDIR)\datacmn.obj \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
@@ -81,9 +87,11 @@ COMMONOBJS = \
                $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \
                $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \
+               $(COMMDIR)\dpycmn.obj \
                $(COMMDIR)\dseldlg.obj \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
                $(COMMDIR)\dseldlg.obj \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
+               $(COMMDIR)\dynload.obj \
                $(COMMDIR)\effects.obj \
                $(COMMDIR)\encconv.obj \
                $(COMMDIR)\event.obj \
                $(COMMDIR)\effects.obj \
                $(COMMDIR)\encconv.obj \
                $(COMMDIR)\event.obj \
@@ -95,6 +103,8 @@ COMMONOBJS = \
                $(COMMDIR)\filefn.obj \
                $(COMMDIR)\filename.obj \
                $(COMMDIR)\filesys.obj \
                $(COMMDIR)\filefn.obj \
                $(COMMDIR)\filename.obj \
                $(COMMDIR)\filesys.obj \
+               $(COMMDIR)\fldlgcmn.obj \
+               $(COMMDIR)\fmapbase.obj \
                $(COMMDIR)\fontcmn.obj \
                $(COMMDIR)\fontmap.obj \
                $(COMMDIR)\framecmn.obj \
                $(COMMDIR)\fontcmn.obj \
                $(COMMDIR)\fontmap.obj \
                $(COMMDIR)\framecmn.obj \
@@ -107,12 +117,16 @@ COMMONOBJS = \
                $(COMMDIR)\geometry.obj \
                $(COMMDIR)\gifdecod.obj \
                $(COMMDIR)\hash.obj \
                $(COMMDIR)\geometry.obj \
                $(COMMDIR)\gifdecod.obj \
                $(COMMDIR)\hash.obj \
+               $(COMMDIR)\hashmap.obj \
                $(COMMDIR)\helpbase.obj \
                $(COMMDIR)\http.obj \
                $(COMMDIR)\helpbase.obj \
                $(COMMDIR)\http.obj \
+               $(COMMDIR)\iconbndl.obj \
                $(COMMDIR)\imagall.obj \
                $(COMMDIR)\imagbmp.obj \
                $(COMMDIR)\image.obj \
                $(COMMDIR)\imagall.obj \
                $(COMMDIR)\imagbmp.obj \
                $(COMMDIR)\image.obj \
+               $(COMMDIR)\imagfill.obj \
                $(COMMDIR)\imaggif.obj \
                $(COMMDIR)\imaggif.obj \
+               $(COMMDIR)\imagiff.obj \
                $(COMMDIR)\imagjpeg.obj \
                $(COMMDIR)\imagpcx.obj \
                $(COMMDIR)\imagpng.obj \
                $(COMMDIR)\imagjpeg.obj \
                $(COMMDIR)\imagpcx.obj \
                $(COMMDIR)\imagpng.obj \
@@ -120,6 +134,7 @@ COMMONOBJS = \
                $(COMMDIR)\imagtiff.obj \
                $(COMMDIR)\imagxpm.obj \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\imagtiff.obj \
                $(COMMDIR)\imagxpm.obj \
                $(COMMDIR)\intl.obj \
+               $(COMMDIR)\init.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
                $(COMMDIR)\lboxcmn.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
                $(COMMDIR)\lboxcmn.obj \
@@ -131,11 +146,10 @@ COMMONOBJS = \
                $(COMMDIR)\menucmn.obj \
                $(COMMDIR)\mimecmn.obj \
                $(COMMDIR)\module.obj \
                $(COMMDIR)\menucmn.obj \
                $(COMMDIR)\mimecmn.obj \
                $(COMMDIR)\module.obj \
+               $(COMMDIR)\msgout.obj \
                $(COMMDIR)\mstream.obj \
                $(COMMDIR)\nbkbase.obj \
                $(COMMDIR)\object.obj \
                $(COMMDIR)\mstream.obj \
                $(COMMDIR)\nbkbase.obj \
                $(COMMDIR)\object.obj \
-               $(COMMDIR)\objstrm.obj \
-               $(COMMDIR)\odbc.obj \
                $(COMMDIR)\paper.obj \
                $(COMMDIR)\popupcmn.obj \
                $(COMMDIR)\prntbase.obj \
                $(COMMDIR)\paper.obj \
                $(COMMDIR)\popupcmn.obj \
                $(COMMDIR)\prntbase.obj \
@@ -144,20 +158,24 @@ COMMONOBJS = \
                $(COMMDIR)\quantize.obj \
                $(COMMDIR)\radiocmn.obj \
                $(COMMDIR)\regex.obj \
                $(COMMDIR)\quantize.obj \
                $(COMMDIR)\radiocmn.obj \
                $(COMMDIR)\regex.obj \
-               $(COMMDIR)\resource.obj \
+               $(COMMDIR)\rendcmn.obj  \
+               $(COMMDIR)\rgncmn.obj \
                $(COMMDIR)\sckaddr.obj \
                $(COMMDIR)\sckfile.obj \
                $(COMMDIR)\sckipc.obj \
                $(COMMDIR)\sckstrm.obj \
                $(COMMDIR)\sckaddr.obj \
                $(COMMDIR)\sckfile.obj \
                $(COMMDIR)\sckipc.obj \
                $(COMMDIR)\sckstrm.obj \
-               $(COMMDIR)\serbase.obj \
+               $(COMMDIR)\settcmn.obj \
                $(COMMDIR)\sizer.obj \
                $(COMMDIR)\socket.obj \
                $(COMMDIR)\statbar.obj \
                $(COMMDIR)\sizer.obj \
                $(COMMDIR)\socket.obj \
                $(COMMDIR)\statbar.obj \
+               $(COMMDIR)\stopwatch.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\sysopt.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\sysopt.obj \
+               $(COMMDIR)\taskbarcmn.obj \
                $(COMMDIR)\tbarbase.obj \
                $(COMMDIR)\tbarbase.obj \
+               $(COMMDIR)\textbuf.obj \
                $(COMMDIR)\textcmn.obj \
                $(COMMDIR)\textfile.obj \
                $(COMMDIR)\timercmn.obj \
                $(COMMDIR)\textcmn.obj \
                $(COMMDIR)\textfile.obj \
                $(COMMDIR)\timercmn.obj \
@@ -175,14 +193,36 @@ COMMONOBJS = \
                $(COMMDIR)\wfstream.obj \
                $(COMMDIR)\wincmn.obj \
                $(COMMDIR)\wxchar.obj \
                $(COMMDIR)\wfstream.obj \
                $(COMMDIR)\wincmn.obj \
                $(COMMDIR)\wxchar.obj \
-               $(COMMDIR)\wxexpr.obj \
                $(COMMDIR)\xpmdecod.obj \
                $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.obj
 
                $(COMMDIR)\xpmdecod.obj \
                $(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 \
 MSWOBJS = $(MSWDIR)\accel.obj \
+               $(MSWDIR)\ole\access.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\ole\automtn.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\ole\automtn.obj \
+               $(MSWDIR)\basemsw.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
@@ -196,7 +236,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\colour.obj \
                $(MSWDIR)\combobox.obj \
                $(MSWDIR)\control.obj \
                $(MSWDIR)\colour.obj \
                $(MSWDIR)\combobox.obj \
                $(MSWDIR)\control.obj \
-               $(MSWDIR)\curico.obj \
                $(MSWDIR)\cursor.obj \
                $(MSWDIR)\data.obj \
                $(MSWDIR)\ole\dataobj.obj \
                $(MSWDIR)\cursor.obj \
                $(MSWDIR)\data.obj \
                $(MSWDIR)\ole\dataobj.obj \
@@ -209,9 +248,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dialog.obj \
                $(MSWDIR)\dialup.obj \
                $(MSWDIR)\dib.obj \
                $(MSWDIR)\dialog.obj \
                $(MSWDIR)\dialup.obj \
                $(MSWDIR)\dib.obj \
-               $(MSWDIR)\dibutils.obj \
                $(MSWDIR)\dir.obj \
                $(MSWDIR)\dirdlg.obj \
                $(MSWDIR)\dir.obj \
                $(MSWDIR)\dirdlg.obj \
+               $(MSWDIR)\display.obj \
                $(MSWDIR)\dragimag.obj \
                $(MSWDIR)\ole\dropsrc.obj \
                $(MSWDIR)\ole\droptgt.obj \
                $(MSWDIR)\dragimag.obj \
                $(MSWDIR)\ole\dropsrc.obj \
                $(MSWDIR)\ole\droptgt.obj \
@@ -225,7 +264,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\fontutil.obj \
                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gauge95.obj \
                $(MSWDIR)\fontutil.obj \
                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gauge95.obj \
-               $(MSWDIR)\gaugemsw.obj \
                $(MSWDIR)\gdiimage.obj \
                $(MSWDIR)\gdiobj.obj \
                $(MSWDIR)\glcanvas.obj \
                $(MSWDIR)\gdiimage.obj \
                $(MSWDIR)\gdiobj.obj \
                $(MSWDIR)\glcanvas.obj \
@@ -235,8 +273,11 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
+               $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\iniconf.obj \
                $(MSWDIR)\iniconf.obj \
+               $(MSWDIR)\joystick.obj \
                $(MSWDIR)\listbox.obj \
                $(MSWDIR)\listbox.obj \
+               $(MSWDIR)\listctrl.obj \
                $(MSWDIR)\main.obj \
                $(MSWDIR)\mdi.obj \
                $(MSWDIR)\menu.obj \
                $(MSWDIR)\main.obj \
                $(MSWDIR)\mdi.obj \
                $(MSWDIR)\menu.obj \
@@ -245,23 +286,26 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\mimetype.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\mimetype.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
+               $(MSWDIR)\mslu.obj \
                $(MSWDIR)\nativdlg.obj \
                $(MSWDIR)\nativdlg.obj \
+               $(MSWDIR)\notebook.obj \
                $(MSWDIR)\ole\oleutils.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \
                $(MSWDIR)\ole\oleutils.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \
+               $(MSWDIR)\popupwin.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
                $(MSWDIR)\radiobut.obj \
                $(MSWDIR)\regconf.obj \
                $(MSWDIR)\region.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
                $(MSWDIR)\radiobut.obj \
                $(MSWDIR)\regconf.obj \
                $(MSWDIR)\region.obj \
+               $(MSWDIR)\renderer.obj \
                $(MSWDIR)\registry.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slider95.obj \
                $(MSWDIR)\registry.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slider95.obj \
-               $(MSWDIR)\slidrmsw.obj \
                $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
                $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
@@ -273,7 +317,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\tabctrl.obj \
                $(MSWDIR)\taskbar.obj \
                $(MSWDIR)\tbar95.obj \
                $(MSWDIR)\tabctrl.obj \
                $(MSWDIR)\taskbar.obj \
                $(MSWDIR)\tbar95.obj \
-               $(MSWDIR)\tbarmsw.obj \
                $(MSWDIR)\textctrl.obj \
                $(MSWDIR)\tglbtn.obj \
                $(MSWDIR)\thread.obj \
                $(MSWDIR)\textctrl.obj \
                $(MSWDIR)\tglbtn.obj \
                $(MSWDIR)\thread.obj \
@@ -283,36 +326,86 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
+               $(MSWDIR)\utilsgui.obj \
                $(MSWDIR)\ole\uuid.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.
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
+
+all: MAKEARCHDIR MAKELIBS PCH $(LIBTARGET) zlib png jpeg tiff regex
 
 
-all: $(LIBTARGET)
+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
+      implib  /s $(LIBDIR)\$(WINMMLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINMMLIB).def
 
 $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
 
 $(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 *.obj
-    -del $(LIBTARGET)
+        -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)
+
+PCH: $(INCDIR)\wx\wxprec.h
+        dmc $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -HF$(WXOUTDIR)\wxprec.SYM -o$(WXOUTDIR)\wxprec.PCO $(INCDIR)\wx\wxprec.h
+
+clean_pch:
+        del $(WXOUTDIR)\*.sym
+        del $(WXOUTDIR)\*.PCO
+
+
+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
 
 
-$(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+regex:  
+        make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) 
 
 
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+clean_regex:
+        make -f $(WXDIR)\src\regex\makefile.sc clean
 
 
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+tiff:  
+        make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) 
 
 
-# $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
-#      *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+clean_tiff:
+        make -f $(WXDIR)\src\tiff\makefile.sc clean
 
 MFTYPE=sc
 
 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
wxWidgets (Impactor)