fixed incorrect GetTextExtent for wxTELETYPE font

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 7f90f238658bd5ffe4b22caf9d87930e92e5af3c..416097f0bf8fdd0aa6075973e164cd3dfa0c413d 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:32, 2000/02/17
+# This file was automatically generated by tmake at 18:13, 2000/09/12
 # 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,6 +72,7 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/gridsel.$(OBJSUFF) \
@@ -86,11 +87,14 @@ 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)
 
@@ -102,6 +106,7 @@ COMMONOBJS  = \
                $(COMMDIR)/cmdline.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
+               $(COMMDIR)/cshelp.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \
                $(COMMDIR)/datetime.$(OBJSUFF) \
@@ -116,6 +121,7 @@ COMMONOBJS  = \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
+               $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/encconv.$(OBJSUFF) \
                $(COMMDIR)/event.$(OBJSUFF) \
                $(COMMDIR)/extended.$(OBJSUFF) \
@@ -164,6 +170,7 @@ COMMONOBJS  = \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/protocol.$(OBJSUFF) \
+               $(COMMDIR)/quantize.$(OBJSUFF) \
                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
@@ -180,6 +187,7 @@ COMMONOBJS  = \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
+               $(COMMDIR)/treebase.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/unzip.$(OBJSUFF) \
                $(COMMDIR)/url.$(OBJSUFF) \
@@ -261,6 +269,7 @@ MSWOBJS     = \
                $(MSWDIR)/glcanvas.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
                $(MSWDIR)/gsockmsw.$(OBJSUFF) \
+               $(MSWDIR)/helpchm.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/icon.$(OBJSUFF) \
                $(MSWDIR)/imaglist.$(OBJSUFF) \
@@ -403,25 +412,26 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/attrib.o\
-               $(XPMDIR)/crbuffri.o\
-               $(XPMDIR)/crdatfri.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)/CrIFrBuf.o\
+               $(XPMDIR)/CrIFrDat.o\
                $(XPMDIR)/data.o\
-               $(XPMDIR)/image.o\
-               $(XPMDIR)/info.o\
+               $(XPMDIR)/Image.o\
+               $(XPMDIR)/Info.o\
                $(XPMDIR)/hashtab.o\
                $(XPMDIR)/misc.o\
                $(XPMDIR)/parse.o\
-               $(XPMDIR)/rdftodat.o\
-               $(XPMDIR)/rdftoi.o\
+               $(XPMDIR)/RdFToDat.o\
+               $(XPMDIR)/RdFToI.o\
                $(XPMDIR)/rgb.o\
                $(XPMDIR)/scan.o\
                $(XPMDIR)/simx.o\
-               $(XPMDIR)/wrffrdat.o\
-               $(XPMDIR)/wrffri.o
+               $(XPMDIR)/WrFFrDat.o\
+               $(XPMDIR)/WrFFrI.o
 
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
@@ -550,9 +560,9 @@ $(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
        $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
-$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c           
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
        $(COPY) ../common/dosyacc.c ../common/y_tab.c
-       
+
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
        $(COPY) ../common/doslex.c ../common/lex_yy.c