X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a570331df89d26dfb682bedab0faf13e2c285d8..18c98e42eeb75317f75c9ba20b09a5bd531a690c:/src/msw/makefile.g95?ds=sidebyside diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 6b006ef58c..932f95baa3 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,69 +1,48 @@ - - -# This file was automatically generated by tmake at 17:20, 1999/07/21 +# This file was automatically generated by tmake at 18:37, 1999/10/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # -# File: makefile.unx -# Author: Julian Smart +# File: makefile.g95 +# Author: Julian Smart, Robert Roebling, Vadim Zeitlin # Created: 1993 -# Updated: -# Copyright:(c) 1993, AIAI, University of Edinburgh -# -# "@(#)makefile.unx 1.2 5/9/94" +# Updated: 1999 +# Copyright:(c) 1993, AIAI, University of Edinburgh, +# Copyright:(c) 1999, Vadim Zeitlin +# Copyright:(c) 1999, Robert Roebling # # Makefile for libwx.a # Replace this with your own path if necessary WXDIR = ../.. -# All common UNIX compiler flags and options are now in +# All common compiler flags and options are now in # this central makefile. include $(WXDIR)/src/makeg95.env -# IMPORTANT: if you want to link in subsidiary libraries, -# required for some optional parts of wxWindows, you must -# set EXTRATARGETS and EXTRAOBJS to match the settings in wx_setup.h. -# Having done this, you won't have to worry about linking them -# into each application. -# -# Here's the full list. -# prologio: Required if using the wxWindows resource facility -# USE_WX_RESOURCES should be 1 -# xmgauge: Gauge class (required for Motif only) -# USE_GAUGE should be 1 -# xpm: XPM pixmap support -# USE_XPM_IN_X should be 1 -# wxstring: string class -# USE_GNU_WXSTRING should be 1 -# -# Unfortunately, 'ar' doesn't like combining objects and libraries, -# so we must identify all the objects from the subordinate libraries. Yuck! -XPMSRC=../../contrib/wxxpm/objects$(GUISUFFIX) -XPMOBJS=$(XPMSRC)/crbuffri.$(OBJSUFF) $(XPMSRC)/crbuffrp.$(OBJSUFF) $(XPMSRC)/crdatfri.$(OBJSUFF) $(XPMSRC)/crdatfrp.$(OBJSUFF)\ - $(XPMSRC)/create.$(OBJSUFF) $(XPMSRC)/crifrbuf.$(OBJSUFF) $(XPMSRC)/crifrdat.$(OBJSUFF) $(XPMSRC)/crpfrbuf.$(OBJSUFF) $(XPMSRC)/crpfrdat.$(OBJSUFF)\ - $(XPMSRC)/data.$(OBJSUFF) $(XPMSRC)/hashtab.$(OBJSUFF) $(XPMSRC)/misc.$(OBJSUFF) $(XPMSRC)/parse.$(OBJSUFF) $(XPMSRC)/rdftodat.$(OBJSUFF)\ - $(XPMSRC)/rdftoi.$(OBJSUFF) $(XPMSRC)/rdftop.$(OBJSUFF) $(XPMSRC)/rgb.$(OBJSUFF) $(XPMSRC)/scan.$(OBJSUFF) $(XPMSRC)/simx.$(OBJSUFF)\ - $(XPMSRC)/wrffrdat.$(OBJSUFF) $(XPMSRC)/wrffri.$(OBJSUFF) $(XPMSRC)/wrffrp.$(OBJSUFF) - # Subordinate library possibilities EXTRAOBJS= -GENDIR=../generic -COMMDIR=../common -XPMDIR=../xpm -OLEDIR=ole -MSWDIR=. +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +XPMDIR = $(WXDIR)/src/xpm +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +OLEDIR = $(WXDIR)/src/msw/ole +MSWDIR = $(WXDIR)/src/msw DOCDIR = $(WXDIR)\docs -GENERICOBJS= $(GENDIR)/busyinfo.$(OBJSUFF) \ +GENERICOBJS = \ + $(GENDIR)/busyinfo.$(OBJSUFF) \ $(GENDIR)/choicdgg.$(OBJSUFF) \ $(GENDIR)/dirdlgg.$(OBJSUFF) \ - $(GENDIR)/extdlgg.$(OBJSUFF) \ - $(GENDIR)/gridg.$(OBJSUFF) \ + $(GENDIR)/grid.$(OBJSUFF) \ $(GENDIR)/laywin.$(OBJSUFF) \ + $(GENDIR)/logg.$(OBJSUFF) \ + $(GENDIR)/numdlgg.$(OBJSUFF) \ $(GENDIR)/panelg.$(OBJSUFF) \ $(GENDIR)/progdlgg.$(OBJSUFF) \ $(GENDIR)/prop.$(OBJSUFF) \ @@ -75,18 +54,25 @@ GENERICOBJS= $(GENDIR)/busyinfo.$(OBJSUFF) \ $(GENDIR)/statusbr.$(OBJSUFF) \ $(GENDIR)/tabg.$(OBJSUFF) \ $(GENDIR)/textdlgg.$(OBJSUFF) \ - $(GENDIR)/tipdlg.$(OBJSUFF) + $(GENDIR)/tipdlg.$(OBJSUFF) \ + $(GENDIR)/wizard.$(OBJSUFF) -COMMONOBJS = \ +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) \ @@ -98,22 +84,28 @@ COMMONOBJS = \ $(COMMDIR)/fileconf.$(OBJSUFF) \ $(COMMDIR)/filefn.$(OBJSUFF) \ $(COMMDIR)/filesys.$(OBJSUFF) \ + $(COMMDIR)/fontcmn.$(OBJSUFF) \ $(COMMDIR)/framecmn.$(OBJSUFF) \ $(COMMDIR)/fs_inet.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ $(COMMDIR)/ftp.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ + $(COMMDIR)/gifdecod.$(OBJSUFF) \ $(COMMDIR)/hash.$(OBJSUFF) \ $(COMMDIR)/helpbase.$(OBJSUFF) \ $(COMMDIR)/http.$(OBJSUFF) \ + $(COMMDIR)/imagall.$(OBJSUFF) \ $(COMMDIR)/imagbmp.$(OBJSUFF) \ $(COMMDIR)/image.$(OBJSUFF) \ $(COMMDIR)/imaggif.$(OBJSUFF) \ $(COMMDIR)/imagjpeg.$(OBJSUFF) \ + $(COMMDIR)/imagpcx.$(OBJSUFF) \ $(COMMDIR)/imagpng.$(OBJSUFF) \ + $(COMMDIR)/imagpnm.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ + $(COMMDIR)/lboxcmn.$(OBJSUFF) \ $(COMMDIR)/list.$(OBJSUFF) \ $(COMMDIR)/log.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ @@ -129,13 +121,16 @@ COMMONOBJS = \ $(COMMDIR)/resource.$(OBJSUFF) \ $(COMMDIR)/sckaddr.$(OBJSUFF) \ $(COMMDIR)/sckfile.$(OBJSUFF) \ - $(COMMDIR)/sckint.$(OBJSUFF) \ $(COMMDIR)/sckipc.$(OBJSUFF) \ $(COMMDIR)/sckstrm.$(OBJSUFF) \ + $(COMMDIR)/serbase.$(OBJSUFF) \ + $(COMMDIR)/sizer.$(OBJSUFF) \ $(COMMDIR)/socket.$(OBJSUFF) \ + $(COMMDIR)/strconv.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ + $(COMMDIR)/tbarsmpl.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ $(COMMDIR)/time.$(OBJSUFF) \ @@ -153,93 +148,207 @@ COMMONOBJS = \ $(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \ $(COMMDIR)/wxexpr.$(OBJSUFF) \ - $(COMMDIR)/zipstream.$(OBJSUFF) \ + $(COMMDIR)/zipstrm.$(OBJSUFF) \ $(COMMDIR)/zstream.$(OBJSUFF) -MSWOBJS = accel.$(OBJSUFF) \ - app.$(OBJSUFF) \ - bitmap.$(OBJSUFF) \ - bmpbuttn.$(OBJSUFF) \ - brush.$(OBJSUFF) \ - button.$(OBJSUFF) \ - caret.$(OBJSUFF) \ - checkbox.$(OBJSUFF) \ - checklst.$(OBJSUFF) \ - choice.$(OBJSUFF) \ - clipbrd.$(OBJSUFF) \ - colordlg.$(OBJSUFF) \ - colour.$(OBJSUFF) \ - combobox.$(OBJSUFF) \ - control.$(OBJSUFF) \ - curico.$(OBJSUFF) \ - cursor.$(OBJSUFF) \ - data.$(OBJSUFF) \ - dc.$(OBJSUFF) \ - dcclient.$(OBJSUFF) \ - dcmemory.$(OBJSUFF) \ - dcprint.$(OBJSUFF) \ - dcscreen.$(OBJSUFF) \ - dde.$(OBJSUFF) \ - dialog.$(OBJSUFF) \ - dib.$(OBJSUFF) \ - dibutils.$(OBJSUFF) \ - dragimag.$(OBJSUFF) \ - filedlg.$(OBJSUFF) \ - font.$(OBJSUFF) \ - fontdlg.$(OBJSUFF) \ - frame.$(OBJSUFF) \ - gauge95.$(OBJSUFF) \ - gdiobj.$(OBJSUFF) \ - helpwin.$(OBJSUFF) \ - icon.$(OBJSUFF) \ - imaglist.$(OBJSUFF) \ - iniconf.$(OBJSUFF) \ - joystick.$(OBJSUFF) \ - listbox.$(OBJSUFF) \ - listctrl.$(OBJSUFF) \ - main.$(OBJSUFF) \ - mdi.$(OBJSUFF) \ - menu.$(OBJSUFF) \ - menuitem.$(OBJSUFF) \ - metafile.$(OBJSUFF) \ - minifram.$(OBJSUFF) \ - msgdlg.$(OBJSUFF) \ - nativdlg.$(OBJSUFF) \ - notebook.$(OBJSUFF) \ - ownerdrw.$(OBJSUFF) \ - palette.$(OBJSUFF) \ - pen.$(OBJSUFF) \ - penwin.$(OBJSUFF) \ - pnghand.$(OBJSUFF) \ - printdlg.$(OBJSUFF) \ - printwin.$(OBJSUFF) \ - radiobox.$(OBJSUFF) \ - radiobut.$(OBJSUFF) \ - regconf.$(OBJSUFF) \ - region.$(OBJSUFF) \ - registry.$(OBJSUFF) \ - scrolbar.$(OBJSUFF) \ - settings.$(OBJSUFF) \ - slider95.$(OBJSUFF) \ - spinbutt.$(OBJSUFF) \ - statbmp.$(OBJSUFF) \ - statbox.$(OBJSUFF) \ - statbr95.$(OBJSUFF) \ - statline.$(OBJSUFF) \ - stattext.$(OBJSUFF) \ - tabctrl.$(OBJSUFF) \ - taskbar.$(OBJSUFF) \ - tbar95.$(OBJSUFF) \ - textctrl.$(OBJSUFF) \ - thread.$(OBJSUFF) \ - timer.$(OBJSUFF) \ - tooltip.$(OBJSUFF) \ - treectrl.$(OBJSUFF) \ - utils.$(OBJSUFF) \ - utilsexc.$(OBJSUFF) \ - wave.$(OBJSUFF) \ - window.$(OBJSUFF) \ - xpmhand.$(OBJSUFF) +HTMLOBJS = \ + $(HTMLDIR)/helpctrl.$(OBJSUFF) \ + $(HTMLDIR)/helpdata.$(OBJSUFF) \ + $(HTMLDIR)/helpfrm.$(OBJSUFF) \ + $(HTMLDIR)/htmlcell.$(OBJSUFF) \ + $(HTMLDIR)/htmlfilt.$(OBJSUFF) \ + $(HTMLDIR)/htmlpars.$(OBJSUFF) \ + $(HTMLDIR)/htmltag.$(OBJSUFF) \ + $(HTMLDIR)/htmlwin.$(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)/search.$(OBJSUFF) \ + $(HTMLDIR)/winpars.$(OBJSUFF) + +MSWOBJS = \ + $(MSWDIR)/accel.$(OBJSUFF) \ + $(MSWDIR)/app.$(OBJSUFF) \ + $(MSWDIR)/bitmap.$(OBJSUFF) \ + $(MSWDIR)/bmpbuttn.$(OBJSUFF) \ + $(MSWDIR)/brush.$(OBJSUFF) \ + $(MSWDIR)/button.$(OBJSUFF) \ + $(MSWDIR)/caret.$(OBJSUFF) \ + $(MSWDIR)/checkbox.$(OBJSUFF) \ + $(MSWDIR)/checklst.$(OBJSUFF) \ + $(MSWDIR)/choice.$(OBJSUFF) \ + $(MSWDIR)/clipbrd.$(OBJSUFF) \ + $(MSWDIR)/colordlg.$(OBJSUFF) \ + $(MSWDIR)/colour.$(OBJSUFF) \ + $(MSWDIR)/combobox.$(OBJSUFF) \ + $(MSWDIR)/control.$(OBJSUFF) \ + $(MSWDIR)/curico.$(OBJSUFF) \ + $(MSWDIR)/cursor.$(OBJSUFF) \ + $(MSWDIR)/data.$(OBJSUFF) \ + $(MSWDIR)/dc.$(OBJSUFF) \ + $(MSWDIR)/dcclient.$(OBJSUFF) \ + $(MSWDIR)/dcmemory.$(OBJSUFF) \ + $(MSWDIR)/dcprint.$(OBJSUFF) \ + $(MSWDIR)/dcscreen.$(OBJSUFF) \ + $(MSWDIR)/dde.$(OBJSUFF) \ + $(MSWDIR)/dialog.$(OBJSUFF) \ + $(MSWDIR)/dib.$(OBJSUFF) \ + $(MSWDIR)/dibutils.$(OBJSUFF) \ + $(MSWDIR)/dragimag.$(OBJSUFF) \ + $(MSWDIR)/filedlg.$(OBJSUFF) \ + $(MSWDIR)/font.$(OBJSUFF) \ + $(MSWDIR)/fontdlg.$(OBJSUFF) \ + $(MSWDIR)/frame.$(OBJSUFF) \ + $(MSWDIR)/gauge95.$(OBJSUFF) \ + $(MSWDIR)/gdiobj.$(OBJSUFF) \ + $(MSWDIR)/gsocket.$(OBJSUFF) \ + $(MSWDIR)/helpwin.$(OBJSUFF) \ + $(MSWDIR)/icon.$(OBJSUFF) \ + $(MSWDIR)/imaglist.$(OBJSUFF) \ + $(MSWDIR)/joystick.$(OBJSUFF) \ + $(MSWDIR)/listbox.$(OBJSUFF) \ + $(MSWDIR)/listctrl.$(OBJSUFF) \ + $(MSWDIR)/main.$(OBJSUFF) \ + $(MSWDIR)/mdi.$(OBJSUFF) \ + $(MSWDIR)/menu.$(OBJSUFF) \ + $(MSWDIR)/menuitem.$(OBJSUFF) \ + $(MSWDIR)/metafile.$(OBJSUFF) \ + $(MSWDIR)/minifram.$(OBJSUFF) \ + $(MSWDIR)/msgdlg.$(OBJSUFF) \ + $(MSWDIR)/nativdlg.$(OBJSUFF) \ + $(MSWDIR)/notebook.$(OBJSUFF) \ + $(MSWDIR)/ownerdrw.$(OBJSUFF) \ + $(MSWDIR)/palette.$(OBJSUFF) \ + $(MSWDIR)/pen.$(OBJSUFF) \ + $(MSWDIR)/penwin.$(OBJSUFF) \ + $(MSWDIR)/pnghand.$(OBJSUFF) \ + $(MSWDIR)/printdlg.$(OBJSUFF) \ + $(MSWDIR)/printwin.$(OBJSUFF) \ + $(MSWDIR)/radiobox.$(OBJSUFF) \ + $(MSWDIR)/radiobut.$(OBJSUFF) \ + $(MSWDIR)/regconf.$(OBJSUFF) \ + $(MSWDIR)/region.$(OBJSUFF) \ + $(MSWDIR)/registry.$(OBJSUFF) \ + $(MSWDIR)/scrolbar.$(OBJSUFF) \ + $(MSWDIR)/settings.$(OBJSUFF) \ + $(MSWDIR)/slider95.$(OBJSUFF) \ + $(MSWDIR)/spinbutt.$(OBJSUFF) \ + $(MSWDIR)/spinctrl.$(OBJSUFF) \ + $(MSWDIR)/statbmp.$(OBJSUFF) \ + $(MSWDIR)/statbox.$(OBJSUFF) \ + $(MSWDIR)/statbr95.$(OBJSUFF) \ + $(MSWDIR)/statline.$(OBJSUFF) \ + $(MSWDIR)/stattext.$(OBJSUFF) \ + $(MSWDIR)/tabctrl.$(OBJSUFF) \ + $(MSWDIR)/taskbar.$(OBJSUFF) \ + $(MSWDIR)/tbar95.$(OBJSUFF) \ + $(MSWDIR)/textctrl.$(OBJSUFF) \ + $(MSWDIR)/thread.$(OBJSUFF) \ + $(MSWDIR)/timer.$(OBJSUFF) \ + $(MSWDIR)/tooltip.$(OBJSUFF) \ + $(MSWDIR)/treectrl.$(OBJSUFF) \ + $(MSWDIR)/utils.$(OBJSUFF) \ + $(MSWDIR)/utilsexc.$(OBJSUFF) \ + $(MSWDIR)/wave.$(OBJSUFF) \ + $(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) \ + $(ZLIBDIR)/crc32.$(OBJSUFF) \ + $(ZLIBDIR)/gzio.$(OBJSUFF) \ + $(ZLIBDIR)/uncompr.$(OBJSUFF) \ + $(ZLIBDIR)/deflate.$(OBJSUFF) \ + $(ZLIBDIR)/trees.$(OBJSUFF) \ + $(ZLIBDIR)/zutil.$(OBJSUFF) \ + $(ZLIBDIR)/inflate.$(OBJSUFF) \ + $(ZLIBDIR)/infblock.$(OBJSUFF) \ + $(ZLIBDIR)/inftrees.$(OBJSUFF) \ + $(ZLIBDIR)/infcodes.$(OBJSUFF) \ + $(ZLIBDIR)/infutil.$(OBJSUFF) \ + $(ZLIBDIR)/inffast.$(OBJSUFF) + +PNGOBJS = \ + $(PNGDIR)/png.$(OBJSUFF) \ + $(PNGDIR)/pngread.$(OBJSUFF) \ + $(PNGDIR)/pngrtran.$(OBJSUFF) \ + $(PNGDIR)/pngrutil.$(OBJSUFF) \ + $(PNGDIR)/pngpread.$(OBJSUFF) \ + $(PNGDIR)/pngtrans.$(OBJSUFF) \ + $(PNGDIR)/pngwrite.$(OBJSUFF) \ + $(PNGDIR)/pngwtran.$(OBJSUFF) \ + $(PNGDIR)/pngwutil.$(OBJSUFF) \ + $(PNGDIR)/pngerror.$(OBJSUFF) \ + $(PNGDIR)/pngmem.$(OBJSUFF) \ + $(PNGDIR)/pngwio.$(OBJSUFF) \ + $(PNGDIR)/pngrio.$(OBJSUFF) \ + $(PNGDIR)/pngget.$(OBJSUFF) \ + $(PNGDIR)/pngset.$(OBJSUFF) + + +JPEGOBJS = \ + $(JPEGDIR)/jcomapi.$(OBJSUFF) \ + $(JPEGDIR)/jutils.$(OBJSUFF) \ + $(JPEGDIR)/jerror.$(OBJSUFF) \ + $(JPEGDIR)/jmemmgr.$(OBJSUFF) \ + $(JPEGDIR)/jmemnobs.$(OBJSUFF) \ + $(JPEGDIR)/jcapimin.$(OBJSUFF) \ + $(JPEGDIR)/jcapistd.$(OBJSUFF) \ + $(JPEGDIR)/jctrans.$(OBJSUFF) \ + $(JPEGDIR)/jcparam.$(OBJSUFF) \ + $(JPEGDIR)/jdatadst.$(OBJSUFF) \ + $(JPEGDIR)/jcinit.$(OBJSUFF) \ + $(JPEGDIR)/jcmaster.$(OBJSUFF) \ + $(JPEGDIR)/jcmarker.$(OBJSUFF) \ + $(JPEGDIR)/jcmainct.$(OBJSUFF) \ + $(JPEGDIR)/jcprepct.$(OBJSUFF) \ + $(JPEGDIR)/jccoefct.$(OBJSUFF) \ + $(JPEGDIR)/jccolor.$(OBJSUFF) \ + $(JPEGDIR)/jcsample.$(OBJSUFF) \ + $(JPEGDIR)/jchuff.$(OBJSUFF) \ + $(JPEGDIR)/jcphuff.$(OBJSUFF) \ + $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \ + $(JPEGDIR)/jfdctfst.$(OBJSUFF) \ + $(JPEGDIR)/jfdctflt.$(OBJSUFF) \ + $(JPEGDIR)/jfdctint.$(OBJSUFF) \ + $(JPEGDIR)/jdapimin.$(OBJSUFF) \ + $(JPEGDIR)/jdapistd.$(OBJSUFF) \ + $(JPEGDIR)/jdtrans.$(OBJSUFF) \ + $(JPEGDIR)/jdatasrc.$(OBJSUFF) \ + $(JPEGDIR)/jdmaster.$(OBJSUFF) \ + $(JPEGDIR)/jdinput.$(OBJSUFF) \ + $(JPEGDIR)/jdmarker.$(OBJSUFF) \ + $(JPEGDIR)/jdhuff.$(OBJSUFF) \ + $(JPEGDIR)/jdphuff.$(OBJSUFF) \ + $(JPEGDIR)/jdmainct.$(OBJSUFF) \ + $(JPEGDIR)/jdcoefct.$(OBJSUFF) \ + $(JPEGDIR)/jdpostct.$(OBJSUFF) \ + $(JPEGDIR)/jddctmgr.$(OBJSUFF) \ + $(JPEGDIR)/jidctfst.$(OBJSUFF) \ + $(JPEGDIR)/jidctflt.$(OBJSUFF) \ + $(JPEGDIR)/jidctint.$(OBJSUFF) \ + $(JPEGDIR)/jidctred.$(OBJSUFF) \ + $(JPEGDIR)/jdsample.$(OBJSUFF) \ + $(JPEGDIR)/jdcolor.$(OBJSUFF) \ + $(JPEGDIR)/jquant1.$(OBJSUFF) \ + $(JPEGDIR)/jquant2.$(OBJSUFF) \ + $(JPEGDIR)/jdmerge.$(OBJSUFF) XPMOBJECTS = $(XPMDIR)/crbuffri.o\ $(XPMDIR)/crdatfri.o\ @@ -253,14 +362,23 @@ XPMOBJECTS = $(XPMDIR)/crbuffri.o\ $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\ $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o -OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS) - -all: $(OBJECTS) $(WXLIB) +OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(ADVANCEDOBJS) # $(XPMOBJECTS) -base: - cd $(WXDIR)/src/common; $(MAKE) -f makefile.g95 GUI=$(GUI) GUISUFFIX=$(GUISUFFIX) CC=$(CC)\ - OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' +ifeq ($(MINGW32),1) + ifeq ($(MINGW32VERSION),2.95) + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS) + else + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS) + endif +else + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS) +endif +all: $(OBJECTS) $(WXLIB) $(WXLIB): $(OBJECTS) $(EXTRAOBJS) ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS) @@ -307,23 +425,22 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c # $(YACC) $(COMMDIR)/parser.y # mv y.tab.c $(COMMDIR)/y_tab.c -# Extra targets -rcparser: - cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 - cd $(WXDIR)/src/msw - -clean_rcp: - cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean - cd $(WXDIR)/src/msw - clean: - -erase *.o - -erase core - -erase ..\common\y_tab.c - -erase ..\common\lex_yy.c - -erase ..\common\*.o - -erase ..\generic\*.o - -erase ..\..\lib\libwx$(GUISUFFIX).a + rm -f *.o + rm -f *.bak + rm -f core + rm -f ..\common\y_tab.c + rm -f ..\common\lex_yy.c + rm -f ..\common\*.o + rm -f ..\common\*.bak + rm -f ..\generic\*.o + rm -f ..\generic\*.bak + rm -f ..\html\*.o + rm -f ..\png\*.o + rm -f ..\png\*.bak + rm -f ..\zlib\*.o + rm -f ..\zlib\*.bak + rm -f ..\jpeg\*.o + rm -f ..\..\lib\libwx.a cleanall: clean -