-# This file was automatically generated by tmake at 00:09, 2000/01/14
+# 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!
#
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
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
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
$(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)/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 = \
$(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) \
$(COMMDIR)/docmdi.$(OBJSUFF) \
$(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) \
$(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) \
$(COMMDIR)/imagpng.$(OBJSUFF) \
$(COMMDIR)/imagpnm.$(OBJSUFF) \
$(COMMDIR)/imagtiff.$(OBJSUFF) \
+ $(COMMDIR)/imagxpm.$(OBJSUFF) \
$(COMMDIR)/intl.$(OBJSUFF) \
$(COMMDIR)/ipcbase.$(OBJSUFF) \
$(COMMDIR)/layout.$(OBJSUFF) \
$(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) \
$(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) \
$(COMMDIR)/wincmn.$(OBJSUFF) \
$(COMMDIR)/wxchar.$(OBJSUFF) \
$(COMMDIR)/wxexpr.$(OBJSUFF) \
+ $(COMMDIR)/xpmdecod.$(OBJSUFF) \
$(COMMDIR)/zipstrm.$(OBJSUFF) \
$(COMMDIR)/zstream.$(OBJSUFF)
$(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)
$(MSWDIR)/dir.$(OBJSUFF) \
$(MSWDIR)/dragimag.$(OBJSUFF) \
$(MSWDIR)/enhmeta.$(OBJSUFF) \
+ $(MSWDIR)/evtloop.$(OBJSUFF) \
+ $(MSWDIR)/fdrepdlg.$(OBJSUFF) \
$(MSWDIR)/filedlg.$(OBJSUFF) \
$(MSWDIR)/font.$(OBJSUFF) \
$(MSWDIR)/fontdlg.$(OBJSUFF) \
$(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) \
$(MSWDIR)/menu.$(OBJSUFF) \
$(MSWDIR)/menuitem.$(OBJSUFF) \
$(MSWDIR)/metafile.$(OBJSUFF) \
+ $(MSWDIR)/mimetype.$(OBJSUFF) \
$(MSWDIR)/minifram.$(OBJSUFF) \
$(MSWDIR)/msgdlg.$(OBJSUFF) \
$(MSWDIR)/nativdlg.$(OBJSUFF) \
$(MSWDIR)/scrolbar.$(OBJSUFF) \
$(MSWDIR)/settings.$(OBJSUFF) \
$(MSWDIR)/slider95.$(OBJSUFF) \
+ $(MSWDIR)/snglinst.$(OBJSUFF) \
$(MSWDIR)/spinbutt.$(OBJSUFF) \
$(MSWDIR)/spinctrl.$(OBJSUFF) \
$(MSWDIR)/statbmp.$(OBJSUFF) \
$(MSWDIR)/taskbar.$(OBJSUFF) \
$(MSWDIR)/tbar95.$(OBJSUFF) \
$(MSWDIR)/textctrl.$(OBJSUFF) \
+ $(MSWDIR)/tglbtn.$(OBJSUFF) \
$(MSWDIR)/thread.$(OBJSUFF) \
$(MSWDIR)/timer.$(OBJSUFF) \
$(MSWDIR)/tooltip.$(OBJSUFF) \
$(MSWDIR)/utils.$(OBJSUFF) \
$(MSWDIR)/utilsexc.$(OBJSUFF) \
$(MSWDIR)/wave.$(OBJSUFF) \
- $(MSWDIR)/window.$(OBJSUFF) \
- $(MSWDIR)/xpmhand.$(OBJSUFF)
+ $(MSWDIR)/window.$(OBJSUFF)
ADVANCEDOBJS = \
$(COMMDIR)/odbc.$(OBJSUFF) \
$(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 \
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
$(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) $@
-$(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)
endif
endif
-
-cleanall: clean
-
-
projects / wxWidgets.git / blobdiff