X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c5d3e1ccd1d27ab0cf913ddbffb1b54b5802f3a..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/msw/makefile.g95 diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 50f249453a..33541fcfd2 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,5 +1,4 @@ - -# This file was automatically generated by tmake at 20:03, 1999/09/29 +# This file was automatically generated by tmake at 14:24, 1999/11/15 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -34,13 +33,28 @@ ZLIBDIR = $(WXDIR)/src/zlib OLEDIR = $(WXDIR)/src/msw/ole MSWDIR = $(WXDIR)/src/msw +PNGLIB = $(WXDIR)/lib/libpng.a +ZLIBLIB = $(WXDIR)/lib/libzlib.a +JPEGLIB = $(WXDIR)/lib/libjpeg.a + DOCDIR = $(WXDIR)\docs +# Only use the WIN32 wxDirDialog if we have a recent +# version of Mingw32 +ifeq ($(MINGW32),1) + ifeq ($(MINGW32VERSION),2.95) + DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF) + else + DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF) + endif +else + DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF) +endif + GENERICOBJS = \ $(GENDIR)/busyinfo.$(OBJSUFF) \ $(GENDIR)/choicdgg.$(OBJSUFF) \ - $(GENDIR)/dirdlgg.$(OBJSUFF) \ - $(GENDIR)/gridg.$(OBJSUFF) \ + $(GENDIR)/grid.$(OBJSUFF) \ $(GENDIR)/laywin.$(OBJSUFF) \ $(GENDIR)/logg.$(OBJSUFF) \ $(GENDIR)/numdlgg.$(OBJSUFF) \ @@ -60,16 +74,20 @@ GENERICOBJS = \ COMMONOBJS = \ $(COMMDIR)/y_tab.$(OBJSUFF) \ + $(COMMDIR)/appcmn.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ + $(COMMDIR)/clipcmn.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ + $(COMMDIR)/ctrlsub.$(OBJSUFF) \ $(COMMDIR)/date.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \ $(COMMDIR)/db.$(OBJSUFF) \ $(COMMDIR)/dbtable.$(OBJSUFF) \ $(COMMDIR)/dcbase.$(OBJSUFF) \ $(COMMDIR)/dlgcmn.$(OBJSUFF) \ + $(COMMDIR)/dobjcmn.$(OBJSUFF) \ $(COMMDIR)/docmdi.$(OBJSUFF) \ $(COMMDIR)/docview.$(OBJSUFF) \ $(COMMDIR)/dynarray.$(OBJSUFF) \ @@ -82,6 +100,7 @@ COMMONOBJS = \ $(COMMDIR)/filefn.$(OBJSUFF) \ $(COMMDIR)/filesys.$(OBJSUFF) \ $(COMMDIR)/fontcmn.$(OBJSUFF) \ + $(COMMDIR)/fontmap.$(OBJSUFF) \ $(COMMDIR)/framecmn.$(OBJSUFF) \ $(COMMDIR)/fs_inet.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ @@ -91,6 +110,7 @@ COMMONOBJS = \ $(COMMDIR)/hash.$(OBJSUFF) \ $(COMMDIR)/helpbase.$(OBJSUFF) \ $(COMMDIR)/http.$(OBJSUFF) \ + $(COMMDIR)/imagall.$(OBJSUFF) \ $(COMMDIR)/imagbmp.$(OBJSUFF) \ $(COMMDIR)/image.$(OBJSUFF) \ $(COMMDIR)/imaggif.$(OBJSUFF) \ @@ -101,9 +121,11 @@ COMMONOBJS = \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ + $(COMMDIR)/lboxcmn.$(OBJSUFF) \ $(COMMDIR)/list.$(OBJSUFF) \ $(COMMDIR)/log.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ + $(COMMDIR)/menucmn.$(OBJSUFF) \ $(COMMDIR)/mimetype.$(OBJSUFF) \ $(COMMDIR)/module.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \ @@ -151,20 +173,20 @@ HTMLOBJS = \ $(HTMLDIR)/helpdata.$(OBJSUFF) \ $(HTMLDIR)/helpfrm.$(OBJSUFF) \ $(HTMLDIR)/htmlcell.$(OBJSUFF) \ - $(HTMLDIR)/htmlfilter.$(OBJSUFF) \ - $(HTMLDIR)/htmlparser.$(OBJSUFF) \ + $(HTMLDIR)/htmlfilt.$(OBJSUFF) \ + $(HTMLDIR)/htmlpars.$(OBJSUFF) \ $(HTMLDIR)/htmltag.$(OBJSUFF) \ $(HTMLDIR)/htmlwin.$(OBJSUFF) \ - $(HTMLDIR)/htmlwinparser.$(OBJSUFF) \ - $(HTMLDIR)/mod_fonts.$(OBJSUFF) \ - $(HTMLDIR)/mod_hline.$(OBJSUFF) \ - $(HTMLDIR)/mod_image.$(OBJSUFF) \ - $(HTMLDIR)/mod_layout.$(OBJSUFF) \ - $(HTMLDIR)/mod_links.$(OBJSUFF) \ - $(HTMLDIR)/mod_list.$(OBJSUFF) \ - $(HTMLDIR)/mod_pre.$(OBJSUFF) \ - $(HTMLDIR)/mod_tables.$(OBJSUFF) \ - $(HTMLDIR)/search.$(OBJSUFF) + $(HTMLDIR)/htmprint.$(OBJSUFF) \ + $(HTMLDIR)/m_fonts.$(OBJSUFF) \ + $(HTMLDIR)/m_hline.$(OBJSUFF) \ + $(HTMLDIR)/m_image.$(OBJSUFF) \ + $(HTMLDIR)/m_layout.$(OBJSUFF) \ + $(HTMLDIR)/m_links.$(OBJSUFF) \ + $(HTMLDIR)/m_list.$(OBJSUFF) \ + $(HTMLDIR)/m_pre.$(OBJSUFF) \ + $(HTMLDIR)/m_tables.$(OBJSUFF) \ + $(HTMLDIR)/winpars.$(OBJSUFF) MSWOBJS = \ $(MSWDIR)/accel.$(OBJSUFF) \ @@ -198,6 +220,8 @@ MSWOBJS = \ $(MSWDIR)/filedlg.$(OBJSUFF) \ $(MSWDIR)/font.$(OBJSUFF) \ $(MSWDIR)/fontdlg.$(OBJSUFF) \ + $(MSWDIR)/fontenum.$(OBJSUFF) \ + $(MSWDIR)/fontutil.$(OBJSUFF) \ $(MSWDIR)/frame.$(OBJSUFF) \ $(MSWDIR)/gauge95.$(OBJSUFF) \ $(MSWDIR)/gdiobj.$(OBJSUFF) \ @@ -233,6 +257,7 @@ MSWOBJS = \ $(MSWDIR)/settings.$(OBJSUFF) \ $(MSWDIR)/slider95.$(OBJSUFF) \ $(MSWDIR)/spinbutt.$(OBJSUFF) \ + $(MSWDIR)/spinctrl.$(OBJSUFF) \ $(MSWDIR)/statbmp.$(OBJSUFF) \ $(MSWDIR)/statbox.$(OBJSUFF) \ $(MSWDIR)/statbr95.$(OBJSUFF) \ @@ -252,6 +277,15 @@ MSWOBJS = \ $(MSWDIR)/window.$(OBJSUFF) \ $(MSWDIR)/xpmhand.$(OBJSUFF) +ADVANCEDOBJS = \ + $(COMMDIR)/odbc.$(OBJSUFF) \ + $(MSWDIR)/ole/automtn.$(OBJSUFF) \ + $(MSWDIR)/ole/dataobj.$(OBJSUFF) \ + $(MSWDIR)/ole/dropsrc.$(OBJSUFF) \ + $(MSWDIR)/ole/droptgt.$(OBJSUFF) \ + $(MSWDIR)/ole/oleutils.$(OBJSUFF) \ + $(MSWDIR)/ole/uuid.$(OBJSUFF) + ZLIBOBJS = \ $(ZLIBDIR)/adler32.$(OBJSUFF) \ $(ZLIBDIR)/compress.$(OBJSUFF) \ @@ -346,25 +380,44 @@ XPMOBJECTS = $(XPMDIR)/crbuffri.o\ $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\ $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o -OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS) +ifeq ($(MINGW32),1) + ifeq ($(MINGW32VERSION),2.95) + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS) + else + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS) + endif +else + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS) +endif -all: $(OBJECTS) $(WXLIB) +all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB) $(WXLIB): $(OBJECTS) $(EXTRAOBJS) ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS) $(RANLIB) $@ +$(ZLIBLIB): $(ZLIBOBJS) + ar $(AROPTIONS) $@ $(ZLIBOBJS) + $(RANLIB) $@ + +$(PNGLIB): $(PNGOBJS) + ar $(AROPTIONS) $@ $(PNGOBJS) + $(RANLIB) $@ + +$(JPEGLIB): $(JPEGOBJS) + ar $(AROPTIONS) $@ $(JPEGOBJS) + $(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 $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c $(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c - copy ..\common\dosyacc.c ..\common\y_tab.c + $(COPY) ..\\common\\dosyacc.c ..\\common\\y_tab.c $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c - copy ..\common\doslex.c ..\common\lex_yy.c + $(COPY) ..\\common\\doslex.c ..\\common\\lex_yy.c # Replace lex with flex if you run into compilation # problems with lex_yy.c. See also note about LEX_SCANNER @@ -397,21 +450,22 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c # mv y.tab.c $(COMMDIR)/y_tab.c clean: - -erase *.o - -erase *.bak - -erase core - -erase ..\common\y_tab.c - -erase ..\common\lex_yy.c - -erase ..\common\*.o - -erase ..\common\*.bak - -erase ..\generic\*.o - -erase ..\generic\*.bak - -erase ..\html\*.o - -erase ..\png\*.o - -erase ..\png\*.bak - -erase ..\zlib\*.o - -erase ..\zlib\*.bak - -erase ..\jpeg\*.o - -erase ..\..\lib\libwx.a + -$(RM) *.o + -$(RM) ole/*.o + -$(RM) *.bak + -$(RM) core + -$(RM) ../common/y_tab.c + -$(RM) ../common/lex_yy.c + -$(RM) ../common/*.o + -$(RM) ../common/*.bak + -$(RM) ../generic/*.o + -$(RM) ../generic/*.bak + -$(RM) ../html/*.o + -$(RM) ../png/*.o + -$(RM) ../png/*.bak + -$(RM) ../zlib/*.o + -$(RM) ../zlib/*.bak + -$(RM) ../jpeg/*.o + -$(RM) ../../lib/libwx.a cleanall: clean