Fixed to recognise the FINAL=hybrid make flag and to then use the

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

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index ff44ddb011506e49c645afa7dcdb6ea0fd5d5756..37e24f27933a1654cffe1a5402c1e6b1e09d1c88 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 01:14, 2001/02/06
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -22,7 +22,6 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
-XPMDIR=$(WXDIR)\src\xpm
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
@@ -32,6 +31,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dragimgg.obj \
                $(GENDIR)\grid.obj \
+               $(GENDIR)\gridctrl.obj \
                $(GENDIR)\gridsel.obj \
                $(GENDIR)\laywin.obj \
                $(GENDIR)\logg.obj \
@@ -70,6 +70,7 @@ COMMONOBJS = \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\dbtable.obj \
                $(COMMDIR)\dcbase.obj \
+               $(COMMDIR)\dircmn.obj \
                $(COMMDIR)\dlgcmn.obj \
                $(COMMDIR)\dndcmn.obj \
                $(COMMDIR)\dobjcmn.obj \
@@ -109,6 +110,7 @@ COMMONOBJS = \
                $(COMMDIR)\imagpng.obj \
                $(COMMDIR)\imagpnm.obj \
                $(COMMDIR)\imagtiff.obj \
+               $(COMMDIR)\imagxpm.obj \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
@@ -159,6 +161,7 @@ COMMONOBJS = \
                $(COMMDIR)\wincmn.obj \
                $(COMMDIR)\wxchar.obj \
                $(COMMDIR)\wxexpr.obj \
+               $(COMMDIR)\xpmdecod.obj \
                $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.obj
 
@@ -253,6 +256,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\tbar95.obj \
                $(MSWDIR)\tbarmsw.obj \
                $(MSWDIR)\textctrl.obj \
+               $(MSWDIR)\tglbtn.obj \
                $(MSWDIR)\thread.obj \
                $(MSWDIR)\timer.obj \
                $(MSWDIR)\tooltip.obj \
@@ -261,23 +265,10 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\utilsexc.obj \
                $(MSWDIR)\ole\uuid.obj \
                $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj \
-               $(MSWDIR)\xpmhand.obj
-
-XPMOBJECTS =   $(XPMDIR)\crbuffri.obj\
-               $(XPMDIR)\crdatfri.obj\
-               $(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
-               $(XPMDIR)\crifrdat.obj\
-               $(XPMDIR)\data.obj\
-               $(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
-               $(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
-               $(XPMDIR)\rdftoi.obj\
-               $(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
-               $(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
-               $(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
+               $(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 all: $(LIBTARGET)