X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/112d35a2cbbd58fc98a020d22b5c40ada18507d7..c6e62f74fcac5b62889b59e7ce7a41d0ce884d7b:/src/msw/makefile.g95?ds=sidebyside diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 74d2837f3d..acb6028c65 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 02:45, 1999/12/21 +# 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) \ @@ -77,6 +79,7 @@ COMMONOBJS = \ $(COMMDIR)/appcmn.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ + $(COMMDIR)/cmdline.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ $(COMMDIR)/ctrlcmn.$(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) \ @@ -371,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\ @@ -385,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) @@ -411,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 @@ -469,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