1. compilation fixes for TB_REPLACEBITMAP and FONTENUMPROC

[wxWidgets.git] / src / msw / makefile.sc

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 2fa756651271fadf73afe46b2ef2050348e078fe..63d62e73a4a44ea7825fb2b98e482a487c0c0a69 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 16:37, 1999/10/22
+# This file was automatically generated by tmake at 00:30, 2000/01/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -27,6 +27,7 @@ OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
+               $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
                $(GENDIR)\grid.obj \
                $(GENDIR)\laywin.obj \
@@ -41,7 +42,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\scrolwin.obj \
                $(GENDIR)\splitter.obj \
                $(GENDIR)\statusbr.obj \
-               $(GENDIR)\tabg.obj \
+               $(GENDIR)\tbarsmpl.obj \
                $(GENDIR)\textdlgg.obj \
                $(GENDIR)\tipdlg.obj \
                $(GENDIR)\wizard.obj
@@ -54,7 +55,8 @@ COMMONOBJS = \
                $(COMMDIR)\cmndata.obj \
                $(COMMDIR)\config.obj \
                $(COMMDIR)\ctrlcmn.obj \
-               $(COMMDIR)\date.obj \
+               $(COMMDIR)\ctrlsub.obj \
+               $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\dbtable.obj \
@@ -65,6 +67,7 @@ COMMONOBJS = \
                $(COMMDIR)\docview.obj \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
+               $(COMMDIR)\encconv.obj \
                $(COMMDIR)\event.obj \
                $(COMMDIR)\extended.obj \
                $(COMMDIR)\ffile.obj \
@@ -73,6 +76,7 @@ COMMONOBJS = \
                $(COMMDIR)\filefn.obj \
                $(COMMDIR)\filesys.obj \
                $(COMMDIR)\fontcmn.obj \
+               $(COMMDIR)\fontmap.obj \
                $(COMMDIR)\framecmn.obj \
                $(COMMDIR)\fs_inet.obj \
                $(COMMDIR)\fs_zip.obj \
@@ -90,13 +94,16 @@ COMMONOBJS = \
                $(COMMDIR)\imagpcx.obj \
                $(COMMDIR)\imagpng.obj \
                $(COMMDIR)\imagpnm.obj \
+               $(COMMDIR)\imagtiff.obj \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
                $(COMMDIR)\lboxcmn.obj \
                $(COMMDIR)\list.obj \
                $(COMMDIR)\log.obj \
+               $(COMMDIR)\longlong.obj \
                $(COMMDIR)\memory.obj \
+               $(COMMDIR)\menucmn.obj \
                $(COMMDIR)\mimetype.obj \
                $(COMMDIR)\module.obj \
                $(COMMDIR)\mstream.obj \
@@ -119,10 +126,8 @@ COMMONOBJS = \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\tbarbase.obj \
-               $(COMMDIR)\tbarsmpl.obj \
                $(COMMDIR)\textcmn.obj \
                $(COMMDIR)\textfile.obj \
-               $(COMMDIR)\time.obj \
                $(COMMDIR)\timercmn.obj \
                $(COMMDIR)\tokenzr.obj \
                $(COMMDIR)\txtstrm.obj \
@@ -142,7 +147,7 @@ COMMONOBJS = \
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
-               $(MSWDIR)\automtn.obj \
+               $(MSWDIR)\ole\automtn.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
@@ -159,7 +164,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\curico.obj \
                $(MSWDIR)\cursor.obj \
                $(MSWDIR)\data.obj \
-               $(MSWDIR)\dataobj.obj \
+               $(MSWDIR)\ole\dataobj.obj \
                $(MSWDIR)\dc.obj \
                $(MSWDIR)\dcclient.obj \
                $(MSWDIR)\dcmemory.obj \
@@ -167,18 +172,23 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dcscreen.obj \
                $(MSWDIR)\dde.obj \
                $(MSWDIR)\dialog.obj \
+               $(MSWDIR)\dialup.obj \
                $(MSWDIR)\dib.obj \
                $(MSWDIR)\dibutils.obj \
+               $(MSWDIR)\dir.obj \
                $(MSWDIR)\dirdlg.obj \
                $(MSWDIR)\dragimag.obj \
-               $(MSWDIR)\dropsrc.obj \
-               $(MSWDIR)\droptgt.obj \
+               $(MSWDIR)\ole\dropsrc.obj \
+               $(MSWDIR)\ole\droptgt.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
+               $(MSWDIR)\fontenum.obj \
+               $(MSWDIR)\fontutil.obj \
                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gauge95.obj \
                $(MSWDIR)\gaugemsw.obj \
+               $(MSWDIR)\gdiimage.obj \
                $(MSWDIR)\gdiobj.obj \
                $(MSWDIR)\gsocket.obj \
                $(MSWDIR)\helpwin.obj \
@@ -193,7 +203,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \
-               $(MSWDIR)\oleutils.obj \
+               $(MSWDIR)\ole\oleutils.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
@@ -226,7 +236,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\tooltip.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
-               $(MSWDIR)\uuid.obj \
+               $(MSWDIR)\ole\uuid.obj \
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\window.obj \
                $(MSWDIR)\xpmhand.obj