X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e6d9f9e7b9f4b5096e726c218c5fccf9854eaea..09e48f0b1917db7e455f28c2c9ed661d39e9ab65:/src/msw/makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index dc1890ba3d..bb562e2ed5 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 20:23, 2001/07/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -25,7 +25,7 @@ WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
 WXDEF = wx$(WXVERSION).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-	              $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
+	             $(WXDIR)/lib/libtiff.a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
@@ -43,7 +43,6 @@ HTMLDIR = $(WXDIR)/src/html
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
-XPMDIR  = $(WXDIR)/src/xpm
 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
@@ -51,7 +50,6 @@ MSWDIR  = $(WXDIR)/src/msw
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
-XPMLIB  = $(WXDIR)/lib/libxpm.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 DOCDIR = $(WXDIR)/docs
@@ -75,6 +73,7 @@ GENERICOBJS = \
 		$(GENDIR)/dirctrlg.$(OBJSUFF) \
 		$(GENDIR)/dragimgg.$(OBJSUFF) \
 		$(GENDIR)/grid.$(OBJSUFF) \
+		$(GENDIR)/gridctrl.$(OBJSUFF) \
 		$(GENDIR)/gridsel.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
 		$(GENDIR)/logg.$(OBJSUFF) \
@@ -103,6 +102,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/choiccmn.$(OBJSUFF) \
 		$(COMMDIR)/clipcmn.$(OBJSUFF) \
 		$(COMMDIR)/cmdline.$(OBJSUFF) \
+		$(COMMDIR)/cmdproc.$(OBJSUFF) \
 		$(COMMDIR)/cmndata.$(OBJSUFF) \
 		$(COMMDIR)/config.$(OBJSUFF) \
 		$(COMMDIR)/cshelp.$(OBJSUFF) \
@@ -111,8 +111,10 @@ COMMONOBJS  = \
 		$(COMMDIR)/datetime.$(OBJSUFF) \
 		$(COMMDIR)/datstrm.$(OBJSUFF) \
 		$(COMMDIR)/db.$(OBJSUFF) \
+		$(COMMDIR)/dbgrid.$(OBJSUFF) \
 		$(COMMDIR)/dbtable.$(OBJSUFF) \
 		$(COMMDIR)/dcbase.$(OBJSUFF) \
+		$(COMMDIR)/dircmn.$(OBJSUFF) \
 		$(COMMDIR)/dlgcmn.$(OBJSUFF) \
 		$(COMMDIR)/dndcmn.$(OBJSUFF) \
 		$(COMMDIR)/dobjcmn.$(OBJSUFF) \
@@ -152,6 +154,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/imagpng.$(OBJSUFF) \
 		$(COMMDIR)/imagpnm.$(OBJSUFF) \
 		$(COMMDIR)/imagtiff.$(OBJSUFF) \
+		$(COMMDIR)/imagxpm.$(OBJSUFF) \
 		$(COMMDIR)/intl.$(OBJSUFF) \
 		$(COMMDIR)/ipcbase.$(OBJSUFF) \
 		$(COMMDIR)/layout.$(OBJSUFF) \
@@ -165,13 +168,16 @@ COMMONOBJS  = \
 		$(COMMDIR)/mimecmn.$(OBJSUFF) \
 		$(COMMDIR)/module.$(OBJSUFF) \
 		$(COMMDIR)/mstream.$(OBJSUFF) \
+		$(COMMDIR)/nbkbase.$(OBJSUFF) \
 		$(COMMDIR)/object.$(OBJSUFF) \
 		$(COMMDIR)/objstrm.$(OBJSUFF) \
 		$(COMMDIR)/paper.$(OBJSUFF) \
+		$(COMMDIR)/popupcmn.$(OBJSUFF) \
 		$(COMMDIR)/prntbase.$(OBJSUFF) \
 		$(COMMDIR)/process.$(OBJSUFF) \
 		$(COMMDIR)/protocol.$(OBJSUFF) \
 		$(COMMDIR)/quantize.$(OBJSUFF) \
+		$(COMMDIR)/radiocmn.$(OBJSUFF) \
 		$(COMMDIR)/resource.$(OBJSUFF) \
 		$(COMMDIR)/sckaddr.$(OBJSUFF) \
 		$(COMMDIR)/sckfile.$(OBJSUFF) \
@@ -201,6 +207,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/wincmn.$(OBJSUFF) \
 		$(COMMDIR)/wxchar.$(OBJSUFF) \
 		$(COMMDIR)/wxexpr.$(OBJSUFF) \
+		$(COMMDIR)/xpmdecod.$(OBJSUFF) \
 		$(COMMDIR)/zipstrm.$(OBJSUFF) \
 		$(COMMDIR)/zstream.$(OBJSUFF)
 
@@ -301,6 +308,7 @@ MSWOBJS     = \
 		$(MSWDIR)/scrolbar.$(OBJSUFF) \
 		$(MSWDIR)/settings.$(OBJSUFF) \
 		$(MSWDIR)/slider95.$(OBJSUFF) \
+		$(MSWDIR)/snglinst.$(OBJSUFF) \
 		$(MSWDIR)/spinbutt.$(OBJSUFF) \
 		$(MSWDIR)/spinctrl.$(OBJSUFF) \
 		$(MSWDIR)/statbmp.$(OBJSUFF) \
@@ -320,8 +328,7 @@ MSWOBJS     = \
 		$(MSWDIR)/utils.$(OBJSUFF) \
 		$(MSWDIR)/utilsexc.$(OBJSUFF) \
 		$(MSWDIR)/wave.$(OBJSUFF) \
-		$(MSWDIR)/window.$(OBJSUFF) \
-		$(MSWDIR)/xpmhand.$(OBJSUFF)
+		$(MSWDIR)/window.$(OBJSUFF)
 
 ADVANCEDOBJS     = \
 		$(COMMDIR)/odbc.$(OBJSUFF) \
@@ -414,27 +421,6 @@ JPEGOBJS    = \
 		$(JPEGDIR)/jquant2.$(OBJSUFF) \
 		$(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-# 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)/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 \
 		$(TIFFDIR)/tif_codec.o \
@@ -480,9 +466,9 @@ else
 endif
 
 ifndef WXMAKINGDLL
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
 else
-all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
 endif
 
 ifndef WXMAKINGDLL
@@ -548,10 +534,6 @@ $(JPEGLIB): $(JPEGOBJS)
 	$(AR) $(AROPTIONS) $@ $(JPEGOBJS)
 	$(RANLIB) $@
 
-$(XPMLIB): $(XPMOBJS)
-	$(AR) $(AROPTIONS) $@ $(XPMOBJS)
-	$(RANLIB) $@
-
 $(TIFFLIB): $(TIFFOBJS)
 	$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
 	$(RANLIB) $@
@@ -616,8 +598,6 @@ clean:
 	-$(RM) ../png/*.bak
 	-$(RM) ../jpeg/*.o
 	-$(RM) ../jpeg/*.bak
-	-$(RM) ../xpm/*.o
-	-$(RM) ../xpm/*.bak
 	-$(RM) ../tiff/*.o
 	-$(RM) ../tiff/*.bak
 
@@ -626,7 +606,6 @@ cleanall: clean
 	-$(RM) $(ZLIBLIB)
 	-$(RM) $(PNGLIB)
 	-$(RM) $(JPEGLIB)
-	-$(RM) $(XPMLIB)
 	-$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
@@ -637,3 +616,4 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 	-$(RM) wx.exp
 endif
 endif
+