X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5efec4430047b3fe3b18ea6fcb0ff103aa42764a..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/msw/makefile.g95 diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 2bf04f0a06..f0b9403606 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 00:24, 1999/10/28 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -19,6 +19,24 @@ WXDIR = ../.. # this central makefile. include $(WXDIR)/src/makeg95.env +# DLL Name, if building wxWindows as a DLL. +ifdef WXMAKINGDLL +WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).dll +WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def +DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \ + $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \ + $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a +DLL_LDFLAGS = -L$(WXDIR)/lib +DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32 +ifeq ($(wxUSE_GUI),0) + DLL_LDLIBS = $(DLL_BASE_LDLIBS) +else + DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \ + -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \ + $(DLL_BASE_LDLIBS) +endif +endif + # Subordinate library possibilities EXTRAOBJS= @@ -26,20 +44,50 @@ EXTRAOBJS= GENDIR = $(WXDIR)/src/generic COMMDIR = $(WXDIR)/src/common HTMLDIR = $(WXDIR)/src/html -XPMDIR = $(WXDIR)/src/xpm +ZLIBDIR = $(WXDIR)/src/zlib PNGDIR = $(WXDIR)/src/png JPEGDIR = $(WXDIR)/src/jpeg -ZLIBDIR = $(WXDIR)/src/zlib +TIFFDIR = $(WXDIR)/src/tiff OLEDIR = $(WXDIR)/src/msw/ole MSWDIR = $(WXDIR)/src/msw +REGEXDIR= $(WXDIR)/src/regex + +ZLIBLIB = $(WXDIR)/lib/libzlib.a +PNGLIB = $(WXDIR)/lib/libpng.a +JPEGLIB = $(WXDIR)/lib/libjpeg.a +TIFFLIB = $(WXDIR)/lib/libtiff.a +REGEXLIB= $(WXDIR)/lib/libregex.a + +DOCDIR = $(WXDIR)/docs + +# Only use the WIN32 wxDirDialog if we have a recent +# version of Mingw32 +ifeq ($(MINGW32),1) + ifneq "$(findstring 2.95, $(MINGW32VERSION))" "" + DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF) + else + DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF) + endif +else + DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF) +endif +ifeq ($(wxUSE_GUI),0) + DIRDLGOBJ = +endif -DOCDIR = $(WXDIR)\docs +GENERICOBJS_BASE = \ GENERICOBJS = \ + $(GENERICOBJS_BASE) \ $(GENDIR)/busyinfo.$(OBJSUFF) \ + $(GENDIR)/calctrl.$(OBJSUFF) \ $(GENDIR)/choicdgg.$(OBJSUFF) \ - $(GENDIR)/dirdlgg.$(OBJSUFF) \ + $(GENDIR)/dcpsg.$(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) \ @@ -49,109 +97,151 @@ 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)/tabg.$(OBJSUFF) \ + $(GENDIR)/tbarsmpl.$(OBJSUFF) \ $(GENDIR)/textdlgg.$(OBJSUFF) \ $(GENDIR)/tipdlg.$(OBJSUFF) \ + $(GENDIR)/tipwin.$(OBJSUFF) \ + $(GENDIR)/treectlg.$(OBJSUFF) \ + $(GENDIR)/treelay.$(OBJSUFF) \ $(GENDIR)/wizard.$(OBJSUFF) -COMMONOBJS = \ - $(COMMDIR)/y_tab.$(OBJSUFF) \ - $(COMMDIR)/appcmn.$(OBJSUFF) \ - $(COMMDIR)/choiccmn.$(OBJSUFF) \ - $(COMMDIR)/clipcmn.$(OBJSUFF) \ - $(COMMDIR)/cmndata.$(OBJSUFF) \ +COMMONOBJS_BASE = \ + $(COMMDIR)/appcmn.$(OBJSUFF) \ + $(COMMDIR)/clntdata.$(OBJSUFF) \ + $(COMMDIR)/cmdline.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ - $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ - $(COMMDIR)/ctrlsub.$(OBJSUFF) \ - $(COMMDIR)/date.$(OBJSUFF) \ + $(COMMDIR)/datetime.$(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)/dircmn.$(OBJSUFF) \ $(COMMDIR)/dynarray.$(OBJSUFF) \ $(COMMDIR)/dynlib.$(OBJSUFF) \ + $(COMMDIR)/dynload.$(OBJSUFF) \ + $(COMMDIR)/encconv.$(OBJSUFF) \ $(COMMDIR)/event.$(OBJSUFF) \ $(COMMDIR)/extended.$(OBJSUFF) \ $(COMMDIR)/ffile.$(OBJSUFF) \ $(COMMDIR)/file.$(OBJSUFF) \ $(COMMDIR)/fileconf.$(OBJSUFF) \ $(COMMDIR)/filefn.$(OBJSUFF) \ + $(COMMDIR)/filename.$(OBJSUFF) \ $(COMMDIR)/filesys.$(OBJSUFF) \ - $(COMMDIR)/fontcmn.$(OBJSUFF) \ - $(COMMDIR)/framecmn.$(OBJSUFF) \ + $(COMMDIR)/fontmap.$(OBJSUFF) \ $(COMMDIR)/fs_inet.$(OBJSUFF) \ + $(COMMDIR)/fs_mem.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ $(COMMDIR)/ftp.$(OBJSUFF) \ - $(COMMDIR)/gdicmn.$(OBJSUFF) \ - $(COMMDIR)/gifdecod.$(OBJSUFF) \ $(COMMDIR)/hash.$(OBJSUFF) \ - $(COMMDIR)/helpbase.$(OBJSUFF) \ + $(COMMDIR)/hashmap.$(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)/longlong.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ - $(COMMDIR)/menucmn.$(OBJSUFF) \ - $(COMMDIR)/mimetype.$(OBJSUFF) \ + $(COMMDIR)/mimecmn.$(OBJSUFF) \ $(COMMDIR)/module.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \ - $(COMMDIR)/objstrm.$(OBJSUFF) \ - $(COMMDIR)/paper.$(OBJSUFF) \ - $(COMMDIR)/prntbase.$(OBJSUFF) \ $(COMMDIR)/process.$(OBJSUFF) \ $(COMMDIR)/protocol.$(OBJSUFF) \ - $(COMMDIR)/resource.$(OBJSUFF) \ + $(COMMDIR)/regex.$(OBJSUFF) \ $(COMMDIR)/sckaddr.$(OBJSUFF) \ $(COMMDIR)/sckfile.$(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)/sysopt.$(OBJSUFF) \ + $(COMMDIR)/textbuf.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ - $(COMMDIR)/time.$(OBJSUFF) \ $(COMMDIR)/timercmn.$(OBJSUFF) \ $(COMMDIR)/tokenzr.$(OBJSUFF) \ $(COMMDIR)/txtstrm.$(OBJSUFF) \ $(COMMDIR)/unzip.$(OBJSUFF) \ $(COMMDIR)/url.$(OBJSUFF) \ $(COMMDIR)/utilscmn.$(OBJSUFF) \ - $(COMMDIR)/valgen.$(OBJSUFF) \ - $(COMMDIR)/validate.$(OBJSUFF) \ - $(COMMDIR)/valtext.$(OBJSUFF) \ $(COMMDIR)/variant.$(OBJSUFF) \ $(COMMDIR)/wfstream.$(OBJSUFF) \ - $(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \ - $(COMMDIR)/wxexpr.$(OBJSUFF) \ $(COMMDIR)/zipstrm.$(OBJSUFF) \ $(COMMDIR)/zstream.$(OBJSUFF) +COMMONOBJS_BASEONLY = \ + $(COMMDIR)/init.$(OBJSUFF) + +COMMONOBJS = \ + $(COMMONOBJS_BASE) \ + $(COMMDIR)/y_tab.$(OBJSUFF) \ + $(COMMDIR)/choiccmn.$(OBJSUFF) \ + $(COMMDIR)/clipcmn.$(OBJSUFF) \ + $(COMMDIR)/cmdproc.$(OBJSUFF) \ + $(COMMDIR)/cmndata.$(OBJSUFF) \ + $(COMMDIR)/containr.$(OBJSUFF) \ + $(COMMDIR)/cshelp.$(OBJSUFF) \ + $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ + $(COMMDIR)/ctrlsub.$(OBJSUFF) \ + $(COMMDIR)/dbgrid.$(OBJSUFF) \ + $(COMMDIR)/dcbase.$(OBJSUFF) \ + $(COMMDIR)/dlgcmn.$(OBJSUFF) \ + $(COMMDIR)/dndcmn.$(OBJSUFF) \ + $(COMMDIR)/dobjcmn.$(OBJSUFF) \ + $(COMMDIR)/docmdi.$(OBJSUFF) \ + $(COMMDIR)/docview.$(OBJSUFF) \ + $(COMMDIR)/dseldlg.$(OBJSUFF) \ + $(COMMDIR)/effects.$(OBJSUFF) \ + $(COMMDIR)/fddlgcmn.$(OBJSUFF) \ + $(COMMDIR)/fontcmn.$(OBJSUFF) \ + $(COMMDIR)/framecmn.$(OBJSUFF) \ + $(COMMDIR)/gaugecmn.$(OBJSUFF) \ + $(COMMDIR)/gdicmn.$(OBJSUFF) \ + $(COMMDIR)/geometry.$(OBJSUFF) \ + $(COMMDIR)/gifdecod.$(OBJSUFF) \ + $(COMMDIR)/helpbase.$(OBJSUFF) \ + $(COMMDIR)/imagall.$(OBJSUFF) \ + $(COMMDIR)/imagbmp.$(OBJSUFF) \ + $(COMMDIR)/image.$(OBJSUFF) \ + $(COMMDIR)/imaggif.$(OBJSUFF) \ + $(COMMDIR)/imagiff.$(OBJSUFF) \ + $(COMMDIR)/imagjpeg.$(OBJSUFF) \ + $(COMMDIR)/imagpcx.$(OBJSUFF) \ + $(COMMDIR)/imagpng.$(OBJSUFF) \ + $(COMMDIR)/imagpnm.$(OBJSUFF) \ + $(COMMDIR)/imagtiff.$(OBJSUFF) \ + $(COMMDIR)/imagxpm.$(OBJSUFF) \ + $(COMMDIR)/layout.$(OBJSUFF) \ + $(COMMDIR)/lboxcmn.$(OBJSUFF) \ + $(COMMDIR)/matrix.$(OBJSUFF) \ + $(COMMDIR)/menucmn.$(OBJSUFF) \ + $(COMMDIR)/nbkbase.$(OBJSUFF) \ + $(COMMDIR)/paper.$(OBJSUFF) \ + $(COMMDIR)/popupcmn.$(OBJSUFF) \ + $(COMMDIR)/prntbase.$(OBJSUFF) \ + $(COMMDIR)/quantize.$(OBJSUFF) \ + $(COMMDIR)/radiocmn.$(OBJSUFF) \ + $(COMMDIR)/resource.$(OBJSUFF) \ + $(COMMDIR)/sizer.$(OBJSUFF) \ + $(COMMDIR)/statbar.$(OBJSUFF) \ + $(COMMDIR)/tbarbase.$(OBJSUFF) \ + $(COMMDIR)/textcmn.$(OBJSUFF) \ + $(COMMDIR)/toplvcmn.$(OBJSUFF) \ + $(COMMDIR)/treebase.$(OBJSUFF) \ + $(COMMDIR)/valgen.$(OBJSUFF) \ + $(COMMDIR)/validate.$(OBJSUFF) \ + $(COMMDIR)/valtext.$(OBJSUFF) \ + $(COMMDIR)/wincmn.$(OBJSUFF) \ + $(COMMDIR)/wxexpr.$(OBJSUFF) \ + $(COMMDIR)/xpmdecod.$(OBJSUFF) + HTMLOBJS = \ $(HTMLDIR)/helpctrl.$(OBJSUFF) \ $(HTMLDIR)/helpdata.$(OBJSUFF) \ @@ -162,17 +252,36 @@ HTMLOBJS = \ $(HTMLDIR)/htmltag.$(OBJSUFF) \ $(HTMLDIR)/htmlwin.$(OBJSUFF) \ $(HTMLDIR)/htmprint.$(OBJSUFF) \ + $(HTMLDIR)/m_dflist.$(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_meta.$(OBJSUFF) \ $(HTMLDIR)/m_pre.$(OBJSUFF) \ + $(HTMLDIR)/m_style.$(OBJSUFF) \ $(HTMLDIR)/m_tables.$(OBJSUFF) \ $(HTMLDIR)/winpars.$(OBJSUFF) +MSWOBJS_BASE = \ + $(MSWDIR)/dde.$(OBJSUFF) \ + $(MSWDIR)/dir.$(OBJSUFF) \ + $(MSWDIR)/gsocket.$(OBJSUFF) \ + $(MSWDIR)/gsockmsw.$(OBJSUFF) \ + $(MSWDIR)/main.$(OBJSUFF) \ + $(MSWDIR)/mimetype.$(OBJSUFF) \ + $(MSWDIR)/regconf.$(OBJSUFF) \ + $(MSWDIR)/registry.$(OBJSUFF) \ + $(MSWDIR)/snglinst.$(OBJSUFF) \ + $(MSWDIR)/thread.$(OBJSUFF) \ + $(MSWDIR)/utils.$(OBJSUFF) \ + $(MSWDIR)/utilsexc.$(OBJSUFF) \ + $(MSWDIR)/volume.$(OBJSUFF) + MSWOBJS = \ + $(MSWOBJS_BASE) \ $(MSWDIR)/accel.$(OBJSUFF) \ $(MSWDIR)/app.$(OBJSUFF) \ $(MSWDIR)/bitmap.$(OBJSUFF) \ @@ -196,45 +305,50 @@ MSWOBJS = \ $(MSWDIR)/dcmemory.$(OBJSUFF) \ $(MSWDIR)/dcprint.$(OBJSUFF) \ $(MSWDIR)/dcscreen.$(OBJSUFF) \ - $(MSWDIR)/dde.$(OBJSUFF) \ $(MSWDIR)/dialog.$(OBJSUFF) \ + $(MSWDIR)/dialup.$(OBJSUFF) \ $(MSWDIR)/dib.$(OBJSUFF) \ $(MSWDIR)/dibutils.$(OBJSUFF) \ $(MSWDIR)/dragimag.$(OBJSUFF) \ + $(MSWDIR)/enhmeta.$(OBJSUFF) \ + $(MSWDIR)/evtloop.$(OBJSUFF) \ + $(MSWDIR)/fdrepdlg.$(OBJSUFF) \ $(MSWDIR)/filedlg.$(OBJSUFF) \ $(MSWDIR)/font.$(OBJSUFF) \ $(MSWDIR)/fontdlg.$(OBJSUFF) \ + $(MSWDIR)/fontenum.$(OBJSUFF) \ + $(MSWDIR)/fontutil.$(OBJSUFF) \ $(MSWDIR)/frame.$(OBJSUFF) \ $(MSWDIR)/gauge95.$(OBJSUFF) \ + $(MSWDIR)/gdiimage.$(OBJSUFF) \ $(MSWDIR)/gdiobj.$(OBJSUFF) \ - $(MSWDIR)/gsocket.$(OBJSUFF) \ + $(MSWDIR)/glcanvas.$(OBJSUFF) \ + $(MSWDIR)/helpbest.$(OBJSUFF) \ + $(MSWDIR)/helpchm.$(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)/mslu.$(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) \ @@ -249,17 +363,18 @@ MSWOBJS = \ $(MSWDIR)/taskbar.$(OBJSUFF) \ $(MSWDIR)/tbar95.$(OBJSUFF) \ $(MSWDIR)/textctrl.$(OBJSUFF) \ - $(MSWDIR)/thread.$(OBJSUFF) \ + $(MSWDIR)/tglbtn.$(OBJSUFF) \ $(MSWDIR)/timer.$(OBJSUFF) \ $(MSWDIR)/tooltip.$(OBJSUFF) \ + $(MSWDIR)/toplevel.$(OBJSUFF) \ $(MSWDIR)/treectrl.$(OBJSUFF) \ - $(MSWDIR)/utils.$(OBJSUFF) \ - $(MSWDIR)/utilsexc.$(OBJSUFF) \ $(MSWDIR)/wave.$(OBJSUFF) \ - $(MSWDIR)/window.$(OBJSUFF) \ - $(MSWDIR)/xpmhand.$(OBJSUFF) + $(MSWDIR)/window.$(OBJSUFF) + +ADVANCEDOBJS_BASE = \ ADVANCEDOBJS = \ + $(ADVANCEDOBJS_BASE) \ $(COMMDIR)/odbc.$(OBJSUFF) \ $(MSWDIR)/ole/automtn.$(OBJSUFF) \ $(MSWDIR)/ole/dataobj.$(OBJSUFF) \ @@ -350,50 +465,171 @@ JPEGOBJS = \ $(JPEGDIR)/jquant2.$(OBJSUFF) \ $(JPEGDIR)/jdmerge.$(OBJSUFF) -XPMOBJECTS = $(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 - -OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(ADVANCEDOBJS) # $(XPMOBJECTS) +TIFFOBJS = $(TIFFDIR)/tif_aux.o \ + $(TIFFDIR)/tif_close.o \ + $(TIFFDIR)/tif_codec.o \ + $(TIFFDIR)/tif_compress.o \ + $(TIFFDIR)/tif_dir.o \ + $(TIFFDIR)/tif_dirinfo.o \ + $(TIFFDIR)/tif_dirread.o \ + $(TIFFDIR)/tif_dirwrite.o \ + $(TIFFDIR)/tif_dumpmode.o \ + $(TIFFDIR)/tif_error.o \ + $(TIFFDIR)/tif_fax3.o \ + $(TIFFDIR)/tif_fax3sm.o \ + $(TIFFDIR)/tif_flush.o \ + $(TIFFDIR)/tif_getimage.o \ + $(TIFFDIR)/tif_jpeg.o \ + $(TIFFDIR)/tif_luv.o \ + $(TIFFDIR)/tif_lzw.o \ + $(TIFFDIR)/tif_next.o \ + $(TIFFDIR)/tif_open.o \ + $(TIFFDIR)/tif_packbits.o \ + $(TIFFDIR)/tif_pixarlog.o \ + $(TIFFDIR)/tif_predict.o \ + $(TIFFDIR)/tif_print.o \ + $(TIFFDIR)/tif_read.o \ + $(TIFFDIR)/tif_strip.o \ + $(TIFFDIR)/tif_swab.o \ + $(TIFFDIR)/tif_thunder.o \ + $(TIFFDIR)/tif_tile.o \ + $(TIFFDIR)/tif_version.o \ + $(TIFFDIR)/tif_warning.o \ + $(TIFFDIR)/tif_win32.o \ + $(TIFFDIR)/tif_write.o \ + $(TIFFDIR)/tif_zip.o ifeq ($(MINGW32),1) - ifeq ($(MINGW32VERSION),2.95) - OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS) + ifneq "$(findstring 2.95, $(MINGW32VERSION))" "" + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) else - OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS) + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) endif else - OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS) + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) +endif +ifeq ($(wxUSE_GUI),0) + OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE) +endif + +# MBN: if anyone has a better solution for this kludge, step +# forward, *please* +# this tests is we are on cygwin or not ( will _not_ work if you are using +# ZSH on plain Win32, tought ); it uses the presence of "/" +# in the PATH variable + +# how do you do "VAR=\" ? BLEAGH! +BACKSLASH=$(subst a,\,a) +ifeq (,$(findstring /,$(PATH))) + IS_CYGWIN=0 + PATH_SEPARATOR:=$(BACKSLASH) + PATH_SUBST=/ +else + IS_CYGWIN=1 + PATH_SEPARATOR=/ + PATH_SUBST:=$(BACKSLASH) endif -all: $(OBJECTS) $(WXLIB) +#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT)) +ARCHINCDIR=$(WXDIR)/lib/$(TOOLKIT)$(INCEXT) + +SETUP_H=$(ARCHINCDIR)/wx/setup.h + +ifndef WXMAKINGDLL +all: $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) +else +all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL) +endif + +$(ARCHINCDIR)/wx: + mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)) + mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx) + +$(SETUP_H): $(ARCHINCDIR)/wx + $(COPY) $(WXDIR)/include/wx/msw/setup.h $@ + +# $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@) + +ifndef WXMAKINGDLL $(WXLIB): $(OBJECTS) $(EXTRAOBJS) ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS) $(RANLIB) $@ -$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h +else + +# The new linker is a few orders of magnitude faster than the old way +# of creating DLLs. +ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes" + +$(WXDLL): $(OBJECTS) $(EXTRAOBJS) + $(CC) -shared -o $@ \ + -Wl,--output-def,$(WXDEF) \ + -Wl,--out-implib,$(WXLIB) \ + $(OBJECTS) $(EXTRAOBJS) \ + $(DLL_LDFLAGS) $(DLL_LDLIBS) +else + +ifeq ($(MINGW32),1) + DLL_ENTRY = _DllMainCRTStartup@12 +else + DLL_ENTRY = __cygwin_dll_entry@12 +endif +LD_STUFF = $(OBJECTS) $(EXTRAOBJS) -Wl,-e,$(DLL_ENTRY) \ + $(DLL_LDFLAGS) $(DLL_LDLIBS) #-Wl,--image-base=0x66000000 + +DLL_STUFF = --as=$(AS) --dllname $(notdir $(WXDLL)) \ + --def $(WXDEF) \ + --base-file wx.base --output-exp wx.exp + +$(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS) + $(DLLTOOL) --output-def $@ --output-lib $(WXLIB) \ + --dllname $(notdir $(WXDLL)) \ + $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS) + +$(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF) + $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF) + $(DLLTOOL) $(DLL_STUFF) + $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) + $(DLLTOOL) $(DLL_STUFF) + $(CC) -mdll wx.exp -o $@ $(LD_STUFF) + -$(RM) wx.base + -$(RM) wx.exp + +endif + +endif + + +$(ZLIBLIB): $(ZLIBOBJS) + $(AR) $(AROPTIONS) $@ $(ZLIBOBJS) + $(RANLIB) $@ + +$(PNGLIB): $(PNGOBJS) + $(AR) $(AROPTIONS) $@ $(PNGOBJS) + $(RANLIB) $@ + +$(JPEGLIB): $(JPEGOBJS) + $(AR) $(AROPTIONS) $@ $(JPEGOBJS) + $(RANLIB) $@ + +$(TIFFLIB): $(TIFFOBJS) + $(AR) $(AROPTIONS) $@ $(TIFFOBJS) + $(RANLIB) $@ + +$(REGEXLIB): + $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) + +$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/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 @@ -427,20 +663,41 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c clean: -$(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 + -$(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) ../zlib/*.o + -$(RM) ../zlib/*.bak + -$(RM) ../png/*.o + -$(RM) ../png/*.bak + -$(RM) ../jpeg/*.o + -$(RM) ../jpeg/*.bak + -$(RM) ../tiff/*.o + -$(RM) ../tiff/*.bak + -$(RM) ../regex/*.o + -$(RM) ../regex/*.bak cleanall: clean + -$(RM) $(WXLIB) + -$(RM) $(ZLIBLIB) + -$(RM) $(PNGLIB) + -$(RM) $(JPEGLIB) + -$(RM) $(TIFFLIB) + -$(RM) $(REGEXLIB) + +ifdef WXMAKINGDLL + -$(RM) $(WXDLL) + -$(RM) $(WXDEF) +ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes" + -$(RM) wx.base + -$(RM) wx.exp +endif +endif +