From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 8 Jan 2000 15:38:51 +0000 (+0000)
Subject: regenerated from template
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fd4fe42c5253fb99a90d4fa23673a899c3b7adce?ds=inline

regenerated from template


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index e57041af51..acb6028c65 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:06, 2000/01/05
+# This file was automatically generated by tmake at 16:37, 2000/01/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -33,6 +33,7 @@ ZLIBDIR = $(WXDIR)/src/zlib
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 
+XPMLIB = $(WXDIR)/lib/libxpm.a
 PNGLIB = $(WXDIR)/lib/libpng.a
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
@@ -374,7 +375,7 @@ JPEGOBJS    = \
 		$(JPEGDIR)/jquant2.$(OBJSUFF) \
 		$(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
+XPMOBJS =    $(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/crdatfri.o\
 		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
 		$(XPMDIR)/crifrdat.o\
@@ -388,15 +389,15 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
   else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
   endif
 else
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB) $(XPMLIB)
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
@@ -414,6 +415,10 @@ $(JPEGLIB): $(JPEGOBJS)
 	ar $(AROPTIONS) $@ $(JPEGOBJS)
 	$(RANLIB) $@
 
+$(XPMLIB): $(XPMOBJS)
+	ar $(AROPTIONS) $@ $(XPMOBJS)
+	$(RANLIB) $@
+
 $(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
@@ -472,6 +477,9 @@ clean:
 	-$(RM) ../zlib/*.o
 	-$(RM) ../zlib/*.bak
 	-$(RM) ../jpeg/*.o
+	-$(RM) ../jpeg/*.bak
+	-$(RM) ../xpm/*.o
+	-$(RM) ../xpm/*.bak
 	-$(RM) ../../lib/libwx.a
 
 cleanall: clean