X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d0512bd8f4bdf548e0385b21f54f14b68b4b174..c6e62f74fcac5b62889b59e7ce7a41d0ce884d7b:/src/msw/makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 4670010e64..acb6028c65 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 13:22, 1999/11/24
+# 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
@@ -53,6 +54,7 @@ endif
 
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
+		$(GENDIR)/calctrl.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
 		$(GENDIR)/grid.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
@@ -67,7 +69,7 @@ GENERICOBJS = \
 		$(GENDIR)/scrolwin.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
 		$(GENDIR)/statusbr.$(OBJSUFF) \
-		$(GENDIR)/tabg.$(OBJSUFF) \
+		$(GENDIR)/tbarsmpl.$(OBJSUFF) \
 		$(GENDIR)/textdlgg.$(OBJSUFF) \
 		$(GENDIR)/tipdlg.$(OBJSUFF) \
 		$(GENDIR)/wizard.$(OBJSUFF)
@@ -77,11 +79,12 @@ COMMONOBJS  = \
 		$(COMMDIR)/appcmn.$(OBJSUFF) \
 		$(COMMDIR)/choiccmn.$(OBJSUFF) \
 		$(COMMDIR)/clipcmn.$(OBJSUFF) \
+		$(COMMDIR)/cmdline.$(OBJSUFF) \
 		$(COMMDIR)/cmndata.$(OBJSUFF) \
 		$(COMMDIR)/config.$(OBJSUFF) \
 		$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
 		$(COMMDIR)/ctrlsub.$(OBJSUFF) \
-		$(COMMDIR)/date.$(OBJSUFF) \
+		$(COMMDIR)/datetime.$(OBJSUFF) \
 		$(COMMDIR)/datstrm.$(OBJSUFF) \
 		$(COMMDIR)/db.$(OBJSUFF) \
 		$(COMMDIR)/dbtable.$(OBJSUFF) \
@@ -92,6 +95,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/docview.$(OBJSUFF) \
 		$(COMMDIR)/dynarray.$(OBJSUFF) \
 		$(COMMDIR)/dynlib.$(OBJSUFF) \
+		$(COMMDIR)/encconv.$(OBJSUFF) \
 		$(COMMDIR)/event.$(OBJSUFF) \
 		$(COMMDIR)/extended.$(OBJSUFF) \
 		$(COMMDIR)/ffile.$(OBJSUFF) \
@@ -118,12 +122,14 @@ COMMONOBJS  = \
 		$(COMMDIR)/imagpcx.$(OBJSUFF) \
 		$(COMMDIR)/imagpng.$(OBJSUFF) \
 		$(COMMDIR)/imagpnm.$(OBJSUFF) \
+		$(COMMDIR)/imagtiff.$(OBJSUFF) \
 		$(COMMDIR)/intl.$(OBJSUFF) \
 		$(COMMDIR)/ipcbase.$(OBJSUFF) \
 		$(COMMDIR)/layout.$(OBJSUFF) \
 		$(COMMDIR)/lboxcmn.$(OBJSUFF) \
 		$(COMMDIR)/list.$(OBJSUFF) \
 		$(COMMDIR)/log.$(OBJSUFF) \
+		$(COMMDIR)/longlong.$(OBJSUFF) \
 		$(COMMDIR)/memory.$(OBJSUFF) \
 		$(COMMDIR)/menucmn.$(OBJSUFF) \
 		$(COMMDIR)/mimetype.$(OBJSUFF) \
@@ -147,10 +153,8 @@ COMMONOBJS  = \
 		$(COMMDIR)/stream.$(OBJSUFF) \
 		$(COMMDIR)/string.$(OBJSUFF) \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
-		$(COMMDIR)/tbarsmpl.$(OBJSUFF) \
 		$(COMMDIR)/textcmn.$(OBJSUFF) \
 		$(COMMDIR)/textfile.$(OBJSUFF) \
-		$(COMMDIR)/time.$(OBJSUFF) \
 		$(COMMDIR)/timercmn.$(OBJSUFF) \
 		$(COMMDIR)/tokenzr.$(OBJSUFF) \
 		$(COMMDIR)/txtstrm.$(OBJSUFF) \
@@ -178,6 +182,7 @@ HTMLOBJS = \
 		$(HTMLDIR)/htmltag.$(OBJSUFF) \
 		$(HTMLDIR)/htmlwin.$(OBJSUFF) \
 		$(HTMLDIR)/htmprint.$(OBJSUFF) \
+		$(HTMLDIR)/m_dflist.$(OBJSUFF) \
 		$(HTMLDIR)/m_fonts.$(OBJSUFF) \
 		$(HTMLDIR)/m_hline.$(OBJSUFF) \
 		$(HTMLDIR)/m_image.$(OBJSUFF) \
@@ -214,8 +219,10 @@ MSWOBJS     = \
 		$(MSWDIR)/dcscreen.$(OBJSUFF) \
 		$(MSWDIR)/dde.$(OBJSUFF) \
 		$(MSWDIR)/dialog.$(OBJSUFF) \
+		$(MSWDIR)/dialup.$(OBJSUFF) \
 		$(MSWDIR)/dib.$(OBJSUFF) \
 		$(MSWDIR)/dibutils.$(OBJSUFF) \
+		$(MSWDIR)/dir.$(OBJSUFF) \
 		$(MSWDIR)/dragimag.$(OBJSUFF) \
 		$(MSWDIR)/filedlg.$(OBJSUFF) \
 		$(MSWDIR)/font.$(OBJSUFF) \
@@ -246,7 +253,6 @@ MSWOBJS     = \
 		$(MSWDIR)/palette.$(OBJSUFF) \
 		$(MSWDIR)/pen.$(OBJSUFF) \
 		$(MSWDIR)/penwin.$(OBJSUFF) \
-		$(MSWDIR)/pnghand.$(OBJSUFF) \
 		$(MSWDIR)/printdlg.$(OBJSUFF) \
 		$(MSWDIR)/printwin.$(OBJSUFF) \
 		$(MSWDIR)/radiobox.$(OBJSUFF) \
@@ -369,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\
@@ -383,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)
@@ -409,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
@@ -467,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