X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/180db9083613b9b6eca8451ee19553c6581f5505..b5435dccd098ae153c3b7b3b8fca8dd0d763986c:/src/msw/makefile.g95?ds=inline diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index f5369aa6dc..a0c1924acb 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 10:56, 2001/11/03 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -6,7 +6,6 @@ # Author: Julian Smart, Robert Roebling, Vadim Zeitlin # Created: 1993 # Updated: 1999 -# Copyright:(c) 1993, AIAI, University of Edinburgh, # Copyright:(c) 1999, Vadim Zeitlin # Copyright:(c) 1999, Robert Roebling # @@ -21,16 +20,22 @@ include $(WXDIR)/src/makeg95.env # DLL Name, if building wxWindows as a DLL. ifdef WXMAKINGDLL -WXDLL = $(WXDIR)/lib/wxmsw$(WXVERSION)$(UNIEXT).dll -WXDEF = wxmsw$(WXVERSION)$(UNIEXT).def -DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \ - $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \ - $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a +WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).dll +WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def +DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a \ + $(WXDIR)/lib/libpng$(MIN_SUFFIX).a \ + $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a \ + $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a \ + $(WXDIR)/lib/libregex$(MIN_SUFFIX).a DLL_LDFLAGS = -L$(WXDIR)/lib -DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \ - -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \ - -lwsock32 $(DLL_EXTRA_LIBS) \ - -lstdc++ +DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32 +ifeq ($(wxUSE_GUI),0) + DLL_LDLIBS = $(DLL_BASE_LDLIBS) +else + DLL_LDLIBS = -lcomctl32 -lctl3d32 -lole32 -loleaut32 \ + -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \ + $(DLL_BASE_LDLIBS) +endif endif # Subordinate library possibilities @@ -48,30 +53,34 @@ 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 +ZLIBLIB = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a +PNGLIB = $(WXDIR)/lib/libpng$(MIN_SUFFIX).a +JPEGLIB = $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a +TIFFLIB = $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a +REGEXLIB= $(WXDIR)/lib/libregex$(MIN_SUFFIX).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))" "" +ifeq "$(strip $(RECENT_MINGW))" "yes" DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF) - else - DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF) - endif else DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF) endif +ifeq ($(wxUSE_GUI),0) + DIRDLGOBJ = +endif + +GENERICOBJS_BASE = \ + GENERICOBJS = \ + $(GENERICOBJS_BASE) \ $(GENDIR)/busyinfo.$(OBJSUFF) \ $(GENDIR)/calctrl.$(OBJSUFF) \ $(GENDIR)/choicdgg.$(OBJSUFF) \ + $(GENDIR)/dcbuffer.$(OBJSUFF) \ $(GENDIR)/dcpsg.$(OBJSUFF) \ $(GENDIR)/dirctrlg.$(OBJSUFF) \ $(GENDIR)/dragimgg.$(OBJSUFF) \ @@ -83,11 +92,9 @@ GENERICOBJS = \ $(GENDIR)/numdlgg.$(OBJSUFF) \ $(GENDIR)/panelg.$(OBJSUFF) \ $(GENDIR)/progdlgg.$(OBJSUFF) \ - $(GENDIR)/prop.$(OBJSUFF) \ - $(GENDIR)/propform.$(OBJSUFF) \ - $(GENDIR)/proplist.$(OBJSUFF) \ $(GENDIR)/sashwin.$(OBJSUFF) \ $(GENDIR)/scrlwing.$(OBJSUFF) \ + $(GENDIR)/selstore.$(OBJSUFF) \ $(GENDIR)/spinctlg.$(OBJSUFF) \ $(GENDIR)/splash.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ @@ -97,132 +104,151 @@ GENERICOBJS = \ $(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) \ +COMMONOBJS_BASE = \ + $(COMMDIR)/appbase.$(OBJSUFF) \ $(COMMDIR)/clntdata.$(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)/dseldlg.$(OBJSUFF) \ $(COMMDIR)/dynarray.$(OBJSUFF) \ $(COMMDIR)/dynlib.$(OBJSUFF) \ - $(COMMDIR)/effects.$(OBJSUFF) \ + $(COMMDIR)/dynload.$(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)/fmapbase.$(OBJSUFF) \ $(COMMDIR)/fs_inet.$(OBJSUFF) \ $(COMMDIR)/fs_mem.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ $(COMMDIR)/ftp.$(OBJSUFF) \ + $(COMMDIR)/hash.$(OBJSUFF) \ + $(COMMDIR)/hashmap.$(OBJSUFF) \ + $(COMMDIR)/http.$(OBJSUFF) \ + $(COMMDIR)/intl.$(OBJSUFF) \ + $(COMMDIR)/ipcbase.$(OBJSUFF) \ + $(COMMDIR)/list.$(OBJSUFF) \ + $(COMMDIR)/log.$(OBJSUFF) \ + $(COMMDIR)/longlong.$(OBJSUFF) \ + $(COMMDIR)/memory.$(OBJSUFF) \ + $(COMMDIR)/mimecmn.$(OBJSUFF) \ + $(COMMDIR)/module.$(OBJSUFF) \ + $(COMMDIR)/msgout.$(OBJSUFF) \ + $(COMMDIR)/mstream.$(OBJSUFF) \ + $(COMMDIR)/object.$(OBJSUFF) \ + $(COMMDIR)/process.$(OBJSUFF) \ + $(COMMDIR)/protocol.$(OBJSUFF) \ + $(COMMDIR)/regex.$(OBJSUFF) \ + $(COMMDIR)/sckaddr.$(OBJSUFF) \ + $(COMMDIR)/sckfile.$(OBJSUFF) \ + $(COMMDIR)/sckipc.$(OBJSUFF) \ + $(COMMDIR)/sckstrm.$(OBJSUFF) \ + $(COMMDIR)/socket.$(OBJSUFF) \ + $(COMMDIR)/stopwatch.$(OBJSUFF) \ + $(COMMDIR)/strconv.$(OBJSUFF) \ + $(COMMDIR)/stream.$(OBJSUFF) \ + $(COMMDIR)/string.$(OBJSUFF) \ + $(COMMDIR)/sysopt.$(OBJSUFF) \ + $(COMMDIR)/textbuf.$(OBJSUFF) \ + $(COMMDIR)/textfile.$(OBJSUFF) \ + $(COMMDIR)/tokenzr.$(OBJSUFF) \ + $(COMMDIR)/txtstrm.$(OBJSUFF) \ + $(COMMDIR)/unzip.$(OBJSUFF) \ + $(COMMDIR)/url.$(OBJSUFF) \ + $(COMMDIR)/utilscmn.$(OBJSUFF) \ + $(COMMDIR)/variant.$(OBJSUFF) \ + $(COMMDIR)/wfstream.$(OBJSUFF) \ + $(COMMDIR)/wxchar.$(OBJSUFF) \ + $(COMMDIR)/zipstrm.$(OBJSUFF) \ + $(COMMDIR)/zstream.$(OBJSUFF) + +COMMONOBJS_BASEONLY = \ + $(COMMDIR)/init.$(OBJSUFF) + +COMMONOBJS = \ + $(COMMONOBJS_BASE) \ + $(COMMDIR)/accesscmn.$(OBJSUFF) \ + $(COMMDIR)/appcmn.$(OBJSUFF) \ + $(COMMDIR)/artprov.$(OBJSUFF) \ + $(COMMDIR)/artstd.$(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)/datacmn.$(OBJSUFF) \ + $(COMMDIR)/dbgrid.$(OBJSUFF) \ + $(COMMDIR)/dcbase.$(OBJSUFF) \ + $(COMMDIR)/dlgcmn.$(OBJSUFF) \ + $(COMMDIR)/dndcmn.$(OBJSUFF) \ + $(COMMDIR)/dobjcmn.$(OBJSUFF) \ + $(COMMDIR)/docmdi.$(OBJSUFF) \ + $(COMMDIR)/docview.$(OBJSUFF) \ + $(COMMDIR)/dpycmn.$(OBJSUFF) \ + $(COMMDIR)/dseldlg.$(OBJSUFF) \ + $(COMMDIR)/effects.$(OBJSUFF) \ + $(COMMDIR)/fddlgcmn.$(OBJSUFF) \ + $(COMMDIR)/fldlgcmn.$(OBJSUFF) \ + $(COMMDIR)/fontcmn.$(OBJSUFF) \ + $(COMMDIR)/fontmap.$(OBJSUFF) \ + $(COMMDIR)/framecmn.$(OBJSUFF) \ $(COMMDIR)/gaugecmn.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ $(COMMDIR)/geometry.$(OBJSUFF) \ $(COMMDIR)/gifdecod.$(OBJSUFF) \ - $(COMMDIR)/hash.$(OBJSUFF) \ $(COMMDIR)/helpbase.$(OBJSUFF) \ - $(COMMDIR)/http.$(OBJSUFF) \ + $(COMMDIR)/iconbndl.$(OBJSUFF) \ $(COMMDIR)/imagall.$(OBJSUFF) \ $(COMMDIR)/imagbmp.$(OBJSUFF) \ $(COMMDIR)/image.$(OBJSUFF) \ + $(COMMDIR)/imagfill.$(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)/intl.$(OBJSUFF) \ - $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ $(COMMDIR)/lboxcmn.$(OBJSUFF) \ - $(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) \ - $(COMMDIR)/sckipc.$(OBJSUFF) \ - $(COMMDIR)/sckstrm.$(OBJSUFF) \ - $(COMMDIR)/serbase.$(OBJSUFF) \ + $(COMMDIR)/rgncmn.$(OBJSUFF) \ + $(COMMDIR)/settcmn.$(OBJSUFF) \ $(COMMDIR)/sizer.$(OBJSUFF) \ - $(COMMDIR)/socket.$(OBJSUFF) \ $(COMMDIR)/statbar.$(OBJSUFF) \ - $(COMMDIR)/strconv.$(OBJSUFF) \ - $(COMMDIR)/stream.$(OBJSUFF) \ - $(COMMDIR)/string.$(OBJSUFF) \ - $(COMMDIR)/sysopt.$(OBJSUFF) \ + $(COMMDIR)/taskbarcmn.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ - $(COMMDIR)/textfile.$(OBJSUFF) \ $(COMMDIR)/timercmn.$(OBJSUFF) \ - $(COMMDIR)/tokenzr.$(OBJSUFF) \ $(COMMDIR)/toplvcmn.$(OBJSUFF) \ $(COMMDIR)/treebase.$(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)/xpmdecod.$(OBJSUFF) \ - $(COMMDIR)/zipstrm.$(OBJSUFF) \ - $(COMMDIR)/zstream.$(OBJSUFF) + $(COMMDIR)/xpmdecod.$(OBJSUFF) HTMLOBJS = \ $(HTMLDIR)/helpctrl.$(OBJSUFF) \ @@ -241,12 +267,30 @@ HTMLOBJS = \ $(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)/basemsw.$(OBJSUFF) \ + $(MSWDIR)/dde.$(OBJSUFF) \ + $(MSWDIR)/dir.$(OBJSUFF) \ + $(MSWDIR)/gsocket.$(OBJSUFF) \ + $(MSWDIR)/gsockmsw.$(OBJSUFF) \ + $(MSWDIR)/main.$(OBJSUFF) \ + $(MSWDIR)/mimetype.$(OBJSUFF) \ + $(MSWDIR)/mslu.$(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) \ @@ -262,7 +306,6 @@ MSWOBJS = \ $(MSWDIR)/colour.$(OBJSUFF) \ $(MSWDIR)/combobox.$(OBJSUFF) \ $(MSWDIR)/control.$(OBJSUFF) \ - $(MSWDIR)/curico.$(OBJSUFF) \ $(MSWDIR)/cursor.$(OBJSUFF) \ $(MSWDIR)/data.$(OBJSUFF) \ $(MSWDIR)/dc.$(OBJSUFF) \ @@ -270,12 +313,10 @@ 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)/dir.$(OBJSUFF) \ + $(MSWDIR)/display.$(OBJSUFF) \ $(MSWDIR)/dragimag.$(OBJSUFF) \ $(MSWDIR)/enhmeta.$(OBJSUFF) \ $(MSWDIR)/evtloop.$(OBJSUFF) \ @@ -290,22 +331,19 @@ MSWOBJS = \ $(MSWDIR)/gdiimage.$(OBJSUFF) \ $(MSWDIR)/gdiobj.$(OBJSUFF) \ $(MSWDIR)/glcanvas.$(OBJSUFF) \ - $(MSWDIR)/gsocket.$(OBJSUFF) \ - $(MSWDIR)/gsockmsw.$(OBJSUFF) \ $(MSWDIR)/helpbest.$(OBJSUFF) \ $(MSWDIR)/helpchm.$(OBJSUFF) \ $(MSWDIR)/helpwin.$(OBJSUFF) \ $(MSWDIR)/icon.$(OBJSUFF) \ $(MSWDIR)/imaglist.$(OBJSUFF) \ + $(MSWDIR)/iniconf.$(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)/mimetype.$(OBJSUFF) \ $(MSWDIR)/minifram.$(OBJSUFF) \ $(MSWDIR)/msgdlg.$(OBJSUFF) \ $(MSWDIR)/nativdlg.$(OBJSUFF) \ @@ -314,17 +352,15 @@ MSWOBJS = \ $(MSWDIR)/palette.$(OBJSUFF) \ $(MSWDIR)/pen.$(OBJSUFF) \ $(MSWDIR)/penwin.$(OBJSUFF) \ + $(MSWDIR)/popupwin.$(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)/snglinst.$(OBJSUFF) \ $(MSWDIR)/spinbutt.$(OBJSUFF) \ $(MSWDIR)/spinctrl.$(OBJSUFF) \ $(MSWDIR)/statbmp.$(OBJSUFF) \ @@ -337,18 +373,20 @@ MSWOBJS = \ $(MSWDIR)/tbar95.$(OBJSUFF) \ $(MSWDIR)/textctrl.$(OBJSUFF) \ $(MSWDIR)/tglbtn.$(OBJSUFF) \ - $(MSWDIR)/thread.$(OBJSUFF) \ $(MSWDIR)/timer.$(OBJSUFF) \ $(MSWDIR)/tooltip.$(OBJSUFF) \ $(MSWDIR)/toplevel.$(OBJSUFF) \ $(MSWDIR)/treectrl.$(OBJSUFF) \ - $(MSWDIR)/utils.$(OBJSUFF) \ - $(MSWDIR)/utilsexc.$(OBJSUFF) \ + $(MSWDIR)/utilsgui.$(OBJSUFF) \ + $(MSWDIR)/uxtheme.$(OBJSUFF) \ $(MSWDIR)/wave.$(OBJSUFF) \ $(MSWDIR)/window.$(OBJSUFF) +ADVANCEDOBJS_BASE = \ + ADVANCEDOBJS = \ - $(COMMDIR)/odbc.$(OBJSUFF) \ + $(ADVANCEDOBJS_BASE) \ + $(MSWDIR)/ole/access.$(OBJSUFF) \ $(MSWDIR)/ole/automtn.$(OBJSUFF) \ $(MSWDIR)/ole/dataobj.$(OBJSUFF) \ $(MSWDIR)/ole/dropsrc.$(OBJSUFF) \ @@ -472,17 +510,27 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \ $(TIFFDIR)/tif_write.o \ $(TIFFDIR)/tif_zip.o -ifeq ($(MINGW32),1) - ifneq "$(findstring 2.95, $(MINGW32VERSION))" "" - OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) - else - OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) - endif +ifeq "$(strip $(RECENT_MINGW))" "yes" + OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) else OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) endif +ifeq ($(wxUSE_GUI),0) + OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE) +endif -ARCHINCDIR=$(subst /,\,$(WXDIR))/lib/msw$(INCEXT) +# how do you do "VAR=\" ? BLEAGH! +BACKSLASH=$(subst a,\,a) +ifeq (,$(findstring $(OSTYPE),"cygwin!msys")) + PATH_SEPARATOR:=$(BACKSLASH) + PATH_SUBST=/ +else + PATH_SEPARATOR=/ + PATH_SUBST:=$(BACKSLASH) +endif + +#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT)) +ARCHINCDIR=$(WXDIR)/lib/$(TOOLKIT)$(INCEXT) SETUP_H=$(ARCHINCDIR)/wx/setup.h @@ -493,11 +541,16 @@ all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEX endif $(ARCHINCDIR)/wx: - mkdir $(ARCHINCDIR) - mkdir $(ARCHINCDIR)/wx + mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)) + mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx) + +# Copy ALWAYS uses forward slashes now. + +$(SETUP_H): $(ARCHINCDIR)/wx $(WXDIR)/include/wx/msw/setup.h + $(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@) -$(SETUP_H): $(ARCHINCDIR)/wx - $(COPY) $(WXDIR)/include/wx/msw/setup.h $@ +# $(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 @@ -512,11 +565,12 @@ else ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes" $(WXDLL): $(OBJECTS) $(EXTRAOBJS) - $(CC) -shared -o $@ \ + $(CXX) -shared -o $@ \ -Wl,--output-def,$(WXDEF) \ -Wl,--out-implib,$(WXLIB) \ $(OBJECTS) $(EXTRAOBJS) \ - $(DLL_LDFLAGS) $(DLL_LDLIBS) + $(DLL_LDFLAGS) $(DLL_LDLIBS) \ + $(ALL_LDFLAGS_DLL) else ifeq ($(MINGW32),1) @@ -537,11 +591,11 @@ $(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS) $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS) $(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF) - $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF) + $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL) $(DLLTOOL) $(DLL_STUFF) - $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) + $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL) $(DLLTOOL) $(DLL_STUFF) - $(CC) -mdll wx.exp -o $@ $(LD_STUFF) + $(CC) -mdll wx.exp -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL) -$(RM) wx.base -$(RM) wx.exp @@ -567,56 +621,15 @@ $(TIFFLIB): $(TIFFOBJS) $(RANLIB) $@ $(REGEXLIB): - $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) + $(MAKE) -C $(REGEXDIR) -f makefile.g95 MINGW32=$(MINGW32) WXDIR=$(WXDIR) WXWIN=$(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 - -$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.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 -# above. -# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l -# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l -# -# Try one of these if the above line doesn't work. -# Alternative syntax (1) -# $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c -# Alternative syntax (2) -# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l -# -# sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \ -# sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \ -# sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c -# rm -f lex.yy.c -# -# Replace yacc with bison if you run into compilation -# problems with y_tab.c. -# -# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y -# $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y -# -# If you use e.g. gcc on Unix, uncomment these lines -# and comment out the above. -# -# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y -# $(YACC) $(COMMDIR)/parser.y -# mv y.tab.c $(COMMDIR)/y_tab.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