Added a SetFont method that behaves like SetLabel does with respect to

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 7bb5fb33d6cfc15ff9a07c7923a72b3bc19372e0..82702e3442c7186b611c9a9b0834ab8853102981 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:09, 2000/01/14
+# This file was automatically generated by tmake at 19:20, 2001/02/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -28,7 +28,7 @@ DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                      $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
-             -luuid -lrpcrt4 -lodbc32 -lwinmm \
+             -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
              -lwsock32 $(DLL_EXTRA_LIBS) \
                  -lstdc++
 endif
@@ -72,7 +72,10 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/dirctrlg.$(OBJSUFF) \
+               $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
+               $(GENDIR)/gridsel.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
@@ -83,11 +86,15 @@ GENERICOBJS = \
                $(GENDIR)/proplist.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/tipwin.$(OBJSUFF) \
+               $(GENDIR)/treectlg.$(OBJSUFF) \
+               $(GENDIR)/treelay.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
 
 COMMONOBJS  = \
@@ -98,6 +105,7 @@ COMMONOBJS  = \
                $(COMMDIR)/cmdline.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
+               $(COMMDIR)/cshelp.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \
                $(COMMDIR)/datetime.$(OBJSUFF) \
@@ -106,11 +114,13 @@ COMMONOBJS  = \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
+               $(COMMDIR)/dndcmn.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
+               $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/encconv.$(OBJSUFF) \
                $(COMMDIR)/event.$(OBJSUFF) \
                $(COMMDIR)/extended.$(OBJSUFF) \
@@ -118,14 +128,17 @@ COMMONOBJS  = \
                $(COMMDIR)/file.$(OBJSUFF) \
                $(COMMDIR)/fileconf.$(OBJSUFF) \
                $(COMMDIR)/filefn.$(OBJSUFF) \
+               $(COMMDIR)/filename.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \
                $(COMMDIR)/fontcmn.$(OBJSUFF) \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \
+               $(COMMDIR)/fs_mem.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
+               $(COMMDIR)/geometry.$(OBJSUFF) \
                $(COMMDIR)/gifdecod.$(OBJSUFF) \
                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
@@ -146,9 +159,10 @@ COMMONOBJS  = \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
                $(COMMDIR)/longlong.$(OBJSUFF) \
+               $(COMMDIR)/matrix.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
-               $(COMMDIR)/mimetype.$(OBJSUFF) \
+               $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
@@ -157,6 +171,7 @@ COMMONOBJS  = \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/protocol.$(OBJSUFF) \
+               $(COMMDIR)/quantize.$(OBJSUFF) \
                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
@@ -173,6 +188,7 @@ COMMONOBJS  = \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
+               $(COMMDIR)/treebase.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/unzip.$(OBJSUFF) \
                $(COMMDIR)/url.$(OBJSUFF) \
@@ -205,6 +221,7 @@ HTMLOBJS = \
                $(HTMLDIR)/m_layout.$(OBJSUFF) \
                $(HTMLDIR)/m_links.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
+               $(HTMLDIR)/m_meta.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/winpars.$(OBJSUFF)
@@ -250,7 +267,10 @@ MSWOBJS     = \
                $(MSWDIR)/gauge95.$(OBJSUFF) \
                $(MSWDIR)/gdiimage.$(OBJSUFF) \
                $(MSWDIR)/gdiobj.$(OBJSUFF) \
+               $(MSWDIR)/glcanvas.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
+               $(MSWDIR)/gsockmsw.$(OBJSUFF) \
+               $(MSWDIR)/helpchm.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/icon.$(OBJSUFF) \
                $(MSWDIR)/imaglist.$(OBJSUFF) \
@@ -262,6 +282,7 @@ MSWOBJS     = \
                $(MSWDIR)/menu.$(OBJSUFF) \
                $(MSWDIR)/menuitem.$(OBJSUFF) \
                $(MSWDIR)/metafile.$(OBJSUFF) \
+               $(MSWDIR)/mimetype.$(OBJSUFF) \
                $(MSWDIR)/minifram.$(OBJSUFF) \
                $(MSWDIR)/msgdlg.$(OBJSUFF) \
                $(MSWDIR)/nativdlg.$(OBJSUFF) \
@@ -291,6 +312,7 @@ MSWOBJS     = \
                $(MSWDIR)/taskbar.$(OBJSUFF) \
                $(MSWDIR)/tbar95.$(OBJSUFF) \
                $(MSWDIR)/textctrl.$(OBJSUFF) \
+               $(MSWDIR)/tglbtn.$(OBJSUFF) \
                $(MSWDIR)/thread.$(OBJSUFF) \
                $(MSWDIR)/timer.$(OBJSUFF) \
                $(MSWDIR)/tooltip.$(OBJSUFF) \
@@ -392,17 +414,26 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/crbuffri.o\
-               $(XPMDIR)/crdatfri.o\
-               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
-               $(XPMDIR)/crifrdat.o\
+# NOTE: these filenames are case sensitive!
+XPMOBJS =    $(XPMDIR)/Attrib.o\
+               $(XPMDIR)/CrBufFrI.o\
+               $(XPMDIR)/CrDatFrI.o\
+               $(XPMDIR)/create.o\
+               $(XPMDIR)/CrIFrBuf.o\
+               $(XPMDIR)/CrIFrDat.o\
                $(XPMDIR)/data.o\
-               $(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
-               $(XPMDIR)/rdftoi.o\
-               $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
-               $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+               $(XPMDIR)/Image.o\
+               $(XPMDIR)/Info.o\
+               $(XPMDIR)/hashtab.o\
+               $(XPMDIR)/misc.o\
+               $(XPMDIR)/parse.o\
+               $(XPMDIR)/RdFToDat.o\
+               $(XPMDIR)/RdFToI.o\
+               $(XPMDIR)/rgb.o\
+               $(XPMDIR)/scan.o\
+               $(XPMDIR)/simx.o\
+               $(XPMDIR)/WrFFrDat.o\
+               $(XPMDIR)/WrFFrI.o
 
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
@@ -448,7 +479,11 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
+ifndef WXMAKINGDLL
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+endif
 
 ifndef WXMAKINGDLL
 
@@ -502,23 +537,23 @@ endif
 
 
 $(ZLIBLIB): $(ZLIBOBJS)
-       ar $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(AR) $(AROPTIONS) $@ $(ZLIBOBJS)
        $(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)
-       ar $(AROPTIONS) $@ $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)
        $(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)
-       ar $(AROPTIONS) $@ $(JPEGOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)
-       ar $(AROPTIONS) $@ $(XPMOBJS)
+       $(AR) $(AROPTIONS) $@ $(XPMOBJS)
        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
-       ar $(AROPTIONS) $@ $(TIFFOBJS)
+       $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
 
 
@@ -586,6 +621,11 @@ clean:
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) $(WXLIB)
+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(XPMLIB)
+       -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)