X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3c8a7ad5e663f8b55d9fbc3268a29a7f072c2eb..211cc8dc907ee50ca6d383b8df16bba9a4d3ce2d:/src/msw/makefile.g95?ds=sidebyside diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 0748398440..8d8eea7b82 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:13, 2000/03/31 +# This file was automatically generated by tmake at 13:52, 2001/08/06 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -25,7 +25,7 @@ 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 -lopengl32 \ @@ -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,25 +70,30 @@ 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) \ $(GENDIR)/panelg.$(OBJSUFF) \ - $(GENDIR)/plot.$(OBJSUFF) \ $(GENDIR)/progdlgg.$(OBJSUFF) \ $(GENDIR)/prop.$(OBJSUFF) \ $(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) @@ -100,15 +103,20 @@ COMMONOBJS = \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \ + $(COMMDIR)/cmdproc.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ + $(COMMDIR)/containr.$(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) \ @@ -116,13 +124,16 @@ COMMONOBJS = \ $(COMMDIR)/docview.$(OBJSUFF) \ $(COMMDIR)/dynarray.$(OBJSUFF) \ $(COMMDIR)/dynlib.$(OBJSUFF) \ + $(COMMDIR)/effects.$(OBJSUFF) \ $(COMMDIR)/encconv.$(OBJSUFF) \ $(COMMDIR)/event.$(OBJSUFF) \ $(COMMDIR)/extended.$(OBJSUFF) \ + $(COMMDIR)/fddlgcmn.$(OBJSUFF) \ $(COMMDIR)/ffile.$(OBJSUFF) \ $(COMMDIR)/file.$(OBJSUFF) \ $(COMMDIR)/fileconf.$(OBJSUFF) \ $(COMMDIR)/filefn.$(OBJSUFF) \ + $(COMMDIR)/filename.$(OBJSUFF) \ $(COMMDIR)/filesys.$(OBJSUFF) \ $(COMMDIR)/fontcmn.$(OBJSUFF) \ $(COMMDIR)/fontmap.$(OBJSUFF) \ @@ -131,6 +142,7 @@ COMMONOBJS = \ $(COMMDIR)/fs_mem.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ $(COMMDIR)/ftp.$(OBJSUFF) \ + $(COMMDIR)/gaugecmn.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ $(COMMDIR)/geometry.$(OBJSUFF) \ $(COMMDIR)/gifdecod.$(OBJSUFF) \ @@ -146,6 +158,7 @@ COMMONOBJS = \ $(COMMDIR)/imagpng.$(OBJSUFF) \ $(COMMDIR)/imagpnm.$(OBJSUFF) \ $(COMMDIR)/imagtiff.$(OBJSUFF) \ + $(COMMDIR)/imagxpm.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ @@ -153,17 +166,23 @@ COMMONOBJS = \ $(COMMDIR)/list.$(OBJSUFF) \ $(COMMDIR)/log.$(OBJSUFF) \ $(COMMDIR)/longlong.$(OBJSUFF) \ + $(COMMDIR)/matrix.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ $(COMMDIR)/menucmn.$(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) \ @@ -175,11 +194,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) \ @@ -192,6 +213,7 @@ COMMONOBJS = \ $(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \ $(COMMDIR)/wxexpr.$(OBJSUFF) \ + $(COMMDIR)/xpmdecod.$(OBJSUFF) \ $(COMMDIR)/zipstrm.$(OBJSUFF) \ $(COMMDIR)/zstream.$(OBJSUFF) @@ -249,6 +271,8 @@ MSWOBJS = \ $(MSWDIR)/dir.$(OBJSUFF) \ $(MSWDIR)/dragimag.$(OBJSUFF) \ $(MSWDIR)/enhmeta.$(OBJSUFF) \ + $(MSWDIR)/evtloop.$(OBJSUFF) \ + $(MSWDIR)/fdrepdlg.$(OBJSUFF) \ $(MSWDIR)/filedlg.$(OBJSUFF) \ $(MSWDIR)/font.$(OBJSUFF) \ $(MSWDIR)/fontdlg.$(OBJSUFF) \ @@ -292,6 +316,7 @@ MSWOBJS = \ $(MSWDIR)/scrolbar.$(OBJSUFF) \ $(MSWDIR)/settings.$(OBJSUFF) \ $(MSWDIR)/slider95.$(OBJSUFF) \ + $(MSWDIR)/snglinst.$(OBJSUFF) \ $(MSWDIR)/spinbutt.$(OBJSUFF) \ $(MSWDIR)/spinctrl.$(OBJSUFF) \ $(MSWDIR)/statbmp.$(OBJSUFF) \ @@ -303,6 +328,7 @@ MSWOBJS = \ $(MSWDIR)/taskbar.$(OBJSUFF) \ $(MSWDIR)/tbar95.$(OBJSUFF) \ $(MSWDIR)/textctrl.$(OBJSUFF) \ + $(MSWDIR)/tglbtn.$(OBJSUFF) \ $(MSWDIR)/thread.$(OBJSUFF) \ $(MSWDIR)/timer.$(OBJSUFF) \ $(MSWDIR)/tooltip.$(OBJSUFF) \ @@ -310,8 +336,7 @@ MSWOBJS = \ $(MSWDIR)/utils.$(OBJSUFF) \ $(MSWDIR)/utilsexc.$(OBJSUFF) \ $(MSWDIR)/wave.$(OBJSUFF) \ - $(MSWDIR)/window.$(OBJSUFF) \ - $(MSWDIR)/xpmhand.$(OBJSUFF) + $(MSWDIR)/window.$(OBJSUFF) ADVANCEDOBJS = \ $(COMMDIR)/odbc.$(OBJSUFF) \ @@ -404,27 +429,6 @@ JPEGOBJS = \ $(JPEGDIR)/jquant2.$(OBJSUFF) \ $(JPEGDIR)/jdmerge.$(OBJSUFF) -# NOTE: these filenames are case sensitive! -XPMOBJS = $(XPMDIR)/Attrib.o\ - $(XPMDIR)/CrBufFrI.o\ - $(XPMDIR)/CrDatFrI.o\ - $(XPMDIR)/create.o\ - $(XPMDIR)/CrIFrBuf.o\ - $(XPMDIR)/CrIFrDat.o\ - $(XPMDIR)/data.o\ - $(XPMDIR)/Image.o\ - $(XPMDIR)/Info.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)/WrFFrI.o - TIFFOBJS = $(TIFFDIR)/tif_aux.o \ $(TIFFDIR)/tif_close.o \ $(TIFFDIR)/tif_codec.o \ @@ -470,9 +474,9 @@ else endif ifndef WXMAKINGDLL -all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) +all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) else -all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL) +all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL) endif ifndef WXMAKINGDLL @@ -538,10 +542,6 @@ $(JPEGLIB): $(JPEGOBJS) $(AR) $(AROPTIONS) $@ $(JPEGOBJS) $(RANLIB) $@ -$(XPMLIB): $(XPMOBJS) - $(AR) $(AROPTIONS) $@ $(XPMOBJS) - $(RANLIB) $@ - $(TIFFLIB): $(TIFFOBJS) $(AR) $(AROPTIONS) $@ $(TIFFOBJS) $(RANLIB) $@ @@ -606,15 +606,14 @@ 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) $(XPMLIB) -$(RM) $(TIFFLIB) ifdef WXMAKINGDLL @@ -626,7 +625,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes" endif endif - -cleanall: clean - -