X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9317fd47263a9521466156d7bf0f7988000bf15..2cc78389312dce6285d0d6b6e891d24372252ada:/src/msw/makefile.g95?ds=sidebyside diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 7bb5fb33d6..d132ac33fc 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 00:09, 2000/01/14 +# This file was automatically generated by tmake at 20:55, 2001/07/13 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -25,10 +25,10 @@ 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 \ + -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \ -lwsock32 $(DLL_EXTRA_LIBS) \ -lstdc++ endif @@ -43,7 +43,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 @@ -51,7 +50,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 @@ -72,7 +70,11 @@ GENERICOBJS = \ $(GENDIR)/busyinfo.$(OBJSUFF) \ $(GENDIR)/calctrl.$(OBJSUFF) \ $(GENDIR)/choicdgg.$(OBJSUFF) \ + $(GENDIR)/dirctrlg.$(OBJSUFF) \ + $(GENDIR)/dragimgg.$(OBJSUFF) \ $(GENDIR)/grid.$(OBJSUFF) \ + $(GENDIR)/gridctrl.$(OBJSUFF) \ + $(GENDIR)/gridsel.$(OBJSUFF) \ $(GENDIR)/laywin.$(OBJSUFF) \ $(GENDIR)/logg.$(OBJSUFF) \ $(GENDIR)/numdlgg.$(OBJSUFF) \ @@ -82,12 +84,17 @@ GENERICOBJS = \ $(GENDIR)/propform.$(OBJSUFF) \ $(GENDIR)/proplist.$(OBJSUFF) \ $(GENDIR)/sashwin.$(OBJSUFF) \ - $(GENDIR)/scrolwin.$(OBJSUFF) \ + $(GENDIR)/scrlwing.$(OBJSUFF) \ + $(GENDIR)/spinctlg.$(OBJSUFF) \ + $(GENDIR)/splash.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ $(GENDIR)/statusbr.$(OBJSUFF) \ $(GENDIR)/tbarsmpl.$(OBJSUFF) \ $(GENDIR)/textdlgg.$(OBJSUFF) \ $(GENDIR)/tipdlg.$(OBJSUFF) \ + $(GENDIR)/tipwin.$(OBJSUFF) \ + $(GENDIR)/treectlg.$(OBJSUFF) \ + $(GENDIR)/treelay.$(OBJSUFF) \ $(GENDIR)/wizard.$(OBJSUFF) COMMONOBJS = \ @@ -96,21 +103,27 @@ COMMONOBJS = \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \ + $(COMMDIR)/cmdproc.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ + $(COMMDIR)/cshelp.$(OBJSUFF) \ $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ $(COMMDIR)/ctrlsub.$(OBJSUFF) \ $(COMMDIR)/datetime.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \ $(COMMDIR)/db.$(OBJSUFF) \ + $(COMMDIR)/dbgrid.$(OBJSUFF) \ $(COMMDIR)/dbtable.$(OBJSUFF) \ $(COMMDIR)/dcbase.$(OBJSUFF) \ + $(COMMDIR)/dircmn.$(OBJSUFF) \ $(COMMDIR)/dlgcmn.$(OBJSUFF) \ + $(COMMDIR)/dndcmn.$(OBJSUFF) \ $(COMMDIR)/dobjcmn.$(OBJSUFF) \ $(COMMDIR)/docmdi.$(OBJSUFF) \ $(COMMDIR)/docview.$(OBJSUFF) \ $(COMMDIR)/dynarray.$(OBJSUFF) \ $(COMMDIR)/dynlib.$(OBJSUFF) \ + $(COMMDIR)/effects.$(OBJSUFF) \ $(COMMDIR)/encconv.$(OBJSUFF) \ $(COMMDIR)/event.$(OBJSUFF) \ $(COMMDIR)/extended.$(OBJSUFF) \ @@ -118,14 +131,18 @@ COMMONOBJS = \ $(COMMDIR)/file.$(OBJSUFF) \ $(COMMDIR)/fileconf.$(OBJSUFF) \ $(COMMDIR)/filefn.$(OBJSUFF) \ + $(COMMDIR)/filename.$(OBJSUFF) \ $(COMMDIR)/filesys.$(OBJSUFF) \ $(COMMDIR)/fontcmn.$(OBJSUFF) \ $(COMMDIR)/fontmap.$(OBJSUFF) \ $(COMMDIR)/framecmn.$(OBJSUFF) \ $(COMMDIR)/fs_inet.$(OBJSUFF) \ + $(COMMDIR)/fs_mem.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ $(COMMDIR)/ftp.$(OBJSUFF) \ + $(COMMDIR)/gaugecmn.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ + $(COMMDIR)/geometry.$(OBJSUFF) \ $(COMMDIR)/gifdecod.$(OBJSUFF) \ $(COMMDIR)/hash.$(OBJSUFF) \ $(COMMDIR)/helpbase.$(OBJSUFF) \ @@ -139,6 +156,7 @@ COMMONOBJS = \ $(COMMDIR)/imagpng.$(OBJSUFF) \ $(COMMDIR)/imagpnm.$(OBJSUFF) \ $(COMMDIR)/imagtiff.$(OBJSUFF) \ + $(COMMDIR)/imagxpm.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ @@ -146,17 +164,23 @@ COMMONOBJS = \ $(COMMDIR)/list.$(OBJSUFF) \ $(COMMDIR)/log.$(OBJSUFF) \ $(COMMDIR)/longlong.$(OBJSUFF) \ + $(COMMDIR)/matrix.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ $(COMMDIR)/menucmn.$(OBJSUFF) \ - $(COMMDIR)/mimetype.$(OBJSUFF) \ + $(COMMDIR)/mimecmn.$(OBJSUFF) \ $(COMMDIR)/module.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \ + $(COMMDIR)/nbkbase.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \ $(COMMDIR)/objstrm.$(OBJSUFF) \ $(COMMDIR)/paper.$(OBJSUFF) \ + $(COMMDIR)/popupcmn.$(OBJSUFF) \ $(COMMDIR)/prntbase.$(OBJSUFF) \ $(COMMDIR)/process.$(OBJSUFF) \ $(COMMDIR)/protocol.$(OBJSUFF) \ + $(COMMDIR)/quantize.$(OBJSUFF) \ + $(COMMDIR)/radiocmn.$(OBJSUFF) \ + $(COMMDIR)/regex.$(OBJSUFF) \ $(COMMDIR)/resource.$(OBJSUFF) \ $(COMMDIR)/sckaddr.$(OBJSUFF) \ $(COMMDIR)/sckfile.$(OBJSUFF) \ @@ -168,11 +192,13 @@ COMMONOBJS = \ $(COMMDIR)/strconv.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \ + $(COMMDIR)/sysopt.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ $(COMMDIR)/timercmn.$(OBJSUFF) \ $(COMMDIR)/tokenzr.$(OBJSUFF) \ + $(COMMDIR)/treebase.$(OBJSUFF) \ $(COMMDIR)/txtstrm.$(OBJSUFF) \ $(COMMDIR)/unzip.$(OBJSUFF) \ $(COMMDIR)/url.$(OBJSUFF) \ @@ -185,6 +211,7 @@ COMMONOBJS = \ $(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \ $(COMMDIR)/wxexpr.$(OBJSUFF) \ + $(COMMDIR)/xpmdecod.$(OBJSUFF) \ $(COMMDIR)/zipstrm.$(OBJSUFF) \ $(COMMDIR)/zstream.$(OBJSUFF) @@ -205,6 +232,7 @@ HTMLOBJS = \ $(HTMLDIR)/m_layout.$(OBJSUFF) \ $(HTMLDIR)/m_links.$(OBJSUFF) \ $(HTMLDIR)/m_list.$(OBJSUFF) \ + $(HTMLDIR)/m_meta.$(OBJSUFF) \ $(HTMLDIR)/m_pre.$(OBJSUFF) \ $(HTMLDIR)/m_tables.$(OBJSUFF) \ $(HTMLDIR)/winpars.$(OBJSUFF) @@ -241,6 +269,7 @@ MSWOBJS = \ $(MSWDIR)/dir.$(OBJSUFF) \ $(MSWDIR)/dragimag.$(OBJSUFF) \ $(MSWDIR)/enhmeta.$(OBJSUFF) \ + $(MSWDIR)/evtloop.$(OBJSUFF) \ $(MSWDIR)/filedlg.$(OBJSUFF) \ $(MSWDIR)/font.$(OBJSUFF) \ $(MSWDIR)/fontdlg.$(OBJSUFF) \ @@ -250,7 +279,10 @@ MSWOBJS = \ $(MSWDIR)/gauge95.$(OBJSUFF) \ $(MSWDIR)/gdiimage.$(OBJSUFF) \ $(MSWDIR)/gdiobj.$(OBJSUFF) \ + $(MSWDIR)/glcanvas.$(OBJSUFF) \ $(MSWDIR)/gsocket.$(OBJSUFF) \ + $(MSWDIR)/gsockmsw.$(OBJSUFF) \ + $(MSWDIR)/helpchm.$(OBJSUFF) \ $(MSWDIR)/helpwin.$(OBJSUFF) \ $(MSWDIR)/icon.$(OBJSUFF) \ $(MSWDIR)/imaglist.$(OBJSUFF) \ @@ -262,6 +294,7 @@ MSWOBJS = \ $(MSWDIR)/menu.$(OBJSUFF) \ $(MSWDIR)/menuitem.$(OBJSUFF) \ $(MSWDIR)/metafile.$(OBJSUFF) \ + $(MSWDIR)/mimetype.$(OBJSUFF) \ $(MSWDIR)/minifram.$(OBJSUFF) \ $(MSWDIR)/msgdlg.$(OBJSUFF) \ $(MSWDIR)/nativdlg.$(OBJSUFF) \ @@ -280,6 +313,7 @@ MSWOBJS = \ $(MSWDIR)/scrolbar.$(OBJSUFF) \ $(MSWDIR)/settings.$(OBJSUFF) \ $(MSWDIR)/slider95.$(OBJSUFF) \ + $(MSWDIR)/snglinst.$(OBJSUFF) \ $(MSWDIR)/spinbutt.$(OBJSUFF) \ $(MSWDIR)/spinctrl.$(OBJSUFF) \ $(MSWDIR)/statbmp.$(OBJSUFF) \ @@ -291,6 +325,7 @@ MSWOBJS = \ $(MSWDIR)/taskbar.$(OBJSUFF) \ $(MSWDIR)/tbar95.$(OBJSUFF) \ $(MSWDIR)/textctrl.$(OBJSUFF) \ + $(MSWDIR)/tglbtn.$(OBJSUFF) \ $(MSWDIR)/thread.$(OBJSUFF) \ $(MSWDIR)/timer.$(OBJSUFF) \ $(MSWDIR)/tooltip.$(OBJSUFF) \ @@ -298,8 +333,7 @@ MSWOBJS = \ $(MSWDIR)/utils.$(OBJSUFF) \ $(MSWDIR)/utilsexc.$(OBJSUFF) \ $(MSWDIR)/wave.$(OBJSUFF) \ - $(MSWDIR)/window.$(OBJSUFF) \ - $(MSWDIR)/xpmhand.$(OBJSUFF) + $(MSWDIR)/window.$(OBJSUFF) ADVANCEDOBJS = \ $(COMMDIR)/odbc.$(OBJSUFF) \ @@ -392,18 +426,6 @@ JPEGOBJS = \ $(JPEGDIR)/jquant2.$(OBJSUFF) \ $(JPEGDIR)/jdmerge.$(OBJSUFF) -XPMOBJS = $(XPMDIR)/crbuffri.o\ - $(XPMDIR)/crdatfri.o\ - $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\ - $(XPMDIR)/crifrdat.o\ - $(XPMDIR)/data.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)/wrffrp.o $(XPMDIR)/wrffri.o - TIFFOBJS = $(TIFFDIR)/tif_aux.o \ $(TIFFDIR)/tif_close.o \ $(TIFFDIR)/tif_codec.o \ @@ -448,7 +470,11 @@ else OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) endif -all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) +ifndef WXMAKINGDLL +all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) +else +all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL) +endif ifndef WXMAKINGDLL @@ -502,23 +528,19 @@ endif $(ZLIBLIB): $(ZLIBOBJS) - ar $(AROPTIONS) $@ $(ZLIBOBJS) + $(AR) $(AROPTIONS) $@ $(ZLIBOBJS) $(RANLIB) $@ $(PNGLIB): $(PNGOBJS) - ar $(AROPTIONS) $@ $(PNGOBJS) + $(AR) $(AROPTIONS) $@ $(PNGOBJS) $(RANLIB) $@ $(JPEGLIB): $(JPEGOBJS) - ar $(AROPTIONS) $@ $(JPEGOBJS) - $(RANLIB) $@ - -$(XPMLIB): $(XPMOBJS) - ar $(AROPTIONS) $@ $(XPMOBJS) + $(AR) $(AROPTIONS) $@ $(JPEGOBJS) $(RANLIB) $@ $(TIFFLIB): $(TIFFOBJS) - ar $(AROPTIONS) $@ $(TIFFOBJS) + $(AR) $(AROPTIONS) $@ $(TIFFOBJS) $(RANLIB) $@ @@ -581,11 +603,15 @@ clean: -$(RM) ../png/*.bak -$(RM) ../jpeg/*.o -$(RM) ../jpeg/*.bak - -$(RM) ../xpm/*.o - -$(RM) ../xpm/*.bak -$(RM) ../tiff/*.o -$(RM) ../tiff/*.bak + +cleanall: clean -$(RM) $(WXLIB) + -$(RM) $(ZLIBLIB) + -$(RM) $(PNGLIB) + -$(RM) $(JPEGLIB) + -$(RM) $(TIFFLIB) ifdef WXMAKINGDLL -$(RM) $(WXDLL) @@ -596,7 +622,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes" endif endif - -cleanall: clean - -