fixes for icon-inherits-from-bitmap mode

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

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index e6a5ae8fd7461ad2a2f3aa5b08a5a78f9546a44a..9f6b1f2c86a37ddce914fae26e9bc433f3c05d75 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:00, 1999/10/01
+# This file was automatically generated by tmake at 13:22, 1999/11/24
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -28,7 +28,7 @@ MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\choicdgg.obj \
-               $(GENDIR)\gridg.obj \
+               $(GENDIR)\grid.obj \
                $(GENDIR)\laywin.obj \
                $(GENDIR)\logg.obj \
                $(GENDIR)\numdlgg.obj \
@@ -48,16 +48,20 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 
 COMMONOBJS = \
                $(COMMDIR)\y_tab.obj \
+               $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\choiccmn.obj \
+               $(COMMDIR)\clipcmn.obj \
                $(COMMDIR)\cmndata.obj \
                $(COMMDIR)\config.obj \
                $(COMMDIR)\ctrlcmn.obj \
+               $(COMMDIR)\ctrlsub.obj \
                $(COMMDIR)\date.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\dbtable.obj \
                $(COMMDIR)\dcbase.obj \
                $(COMMDIR)\dlgcmn.obj \
+               $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \
                $(COMMDIR)\dynarray.obj \
@@ -70,6 +74,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,9 +95,11 @@ COMMONOBJS = \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
+               $(COMMDIR)\lboxcmn.obj \
                $(COMMDIR)\list.obj \
                $(COMMDIR)\log.obj \
                $(COMMDIR)\memory.obj \
+               $(COMMDIR)\menucmn.obj \
                $(COMMDIR)\mimetype.obj \
                $(COMMDIR)\module.obj \
                $(COMMDIR)\mstream.obj \
@@ -138,7 +145,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 \
@@ -155,7 +162,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,14 +174,17 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dibutils.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 \
@@ -189,7 +199,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 \
@@ -206,6 +216,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\slider95.obj \
                $(MSWDIR)\slidrmsw.obj \
                $(MSWDIR)\spinbutt.obj \
+               $(MSWDIR)\spinctrl.obj \
                $(MSWDIR)\statbmp.obj \
                $(MSWDIR)\statbox.obj \
                $(MSWDIR)\statbr95.obj \
@@ -221,7 +232,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