X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4817645de8ac9590977e429925a790aafb3b2e5b..940718f06e8903c9ccc9e54b51b67653b27a97a1:/distrib/msw/tmake/g95.t?ds=sidebyside

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 3ea3b709cc..252457b0e4 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -95,7 +95,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 \
@@ -113,7 +113,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
@@ -121,7 +120,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
@@ -236,27 +234,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 \
@@ -302,9 +279,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
@@ -370,10 +347,6 @@ $(JPEGLIB): $(JPEGOBJS)
 	$(AR) $(AROPTIONS) $@ $(JPEGOBJS)
 	$(RANLIB) $@
 
-$(XPMLIB): $(XPMOBJS)
-	$(AR) $(AROPTIONS) $@ $(XPMOBJS)
-	$(RANLIB) $@
-
 $(TIFFLIB): $(TIFFOBJS)
 	$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
 	$(RANLIB) $@
@@ -438,8 +411,6 @@ clean:
 	-$(RM) ../png/*.bak
 	-$(RM) ../jpeg/*.o
 	-$(RM) ../jpeg/*.bak
-	-$(RM) ../xpm/*.o
-	-$(RM) ../xpm/*.bak
 	-$(RM) ../tiff/*.o
 	-$(RM) ../tiff/*.bak
 
@@ -448,7 +419,6 @@ cleanall: clean
 	-$(RM) $(ZLIBLIB)
 	-$(RM) $(PNGLIB)
 	-$(RM) $(JPEGLIB)
-	-$(RM) $(XPMLIB)
 	-$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL