-
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 23:00, 2001/10/18
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
#
# this central makefile.
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
+DLL_LDFLAGS = -L$(WXDIR)/lib
+DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+ -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
+ -lwsock32 $(DLL_EXTRA_LIBS) \
+ -lstdc++
+endif
+
# Subordinate library possibilities
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
+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
GENERICOBJS = \
$(GENDIR)/busyinfo.$(OBJSUFF) \
+ $(GENDIR)/calctrl.$(OBJSUFF) \
$(GENDIR)/choicdgg.$(OBJSUFF) \
- $(GENDIR)/dirdlgg.$(OBJSUFF) \
- $(GENDIR)/gridg.$(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)/progdlgg.$(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)/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)/clntdata.$(OBJSUFF) \
+ $(COMMDIR)/cmdline.$(OBJSUFF) \
+ $(COMMDIR)/cmdproc.$(OBJSUFF) \
$(COMMDIR)/cmndata.$(OBJSUFF) \
$(COMMDIR)/config.$(OBJSUFF) \
+ $(COMMDIR)/containr.$(OBJSUFF) \
+ $(COMMDIR)/cshelp.$(OBJSUFF) \
$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
- $(COMMDIR)/date.$(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)/http.$(OBJSUFF) \
+ $(COMMDIR)/imagall.$(OBJSUFF) \
$(COMMDIR)/imagbmp.$(OBJSUFF) \
$(COMMDIR)/image.$(OBJSUFF) \
$(COMMDIR)/imaggif.$(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)/mimetype.$(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)/sizer.$(OBJSUFF) \
$(COMMDIR)/socket.$(OBJSUFF) \
+ $(COMMDIR)/statbar.$(OBJSUFF) \
$(COMMDIR)/strconv.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \
+ $(COMMDIR)/sysopt.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \
$(COMMDIR)/textcmn.$(OBJSUFF) \
$(COMMDIR)/textfile.$(OBJSUFF) \
- $(COMMDIR)/time.$(OBJSUFF) \
$(COMMDIR)/timercmn.$(OBJSUFF) \
$(COMMDIR)/tokenzr.$(OBJSUFF) \
+ $(COMMDIR)/toplvcmn.$(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)/helpdata.$(OBJSUFF) \
$(HTMLDIR)/helpfrm.$(OBJSUFF) \
$(HTMLDIR)/htmlcell.$(OBJSUFF) \
- $(HTMLDIR)/htmlfilter.$(OBJSUFF) \
- $(HTMLDIR)/htmlparser.$(OBJSUFF) \
+ $(HTMLDIR)/htmlfilt.$(OBJSUFF) \
+ $(HTMLDIR)/htmlpars.$(OBJSUFF) \
$(HTMLDIR)/htmltag.$(OBJSUFF) \
$(HTMLDIR)/htmlwin.$(OBJSUFF) \
- $(HTMLDIR)/htmlwinparser.$(OBJSUFF) \
- $(HTMLDIR)/mod_fonts.$(OBJSUFF) \
- $(HTMLDIR)/mod_hline.$(OBJSUFF) \
- $(HTMLDIR)/mod_image.$(OBJSUFF) \
- $(HTMLDIR)/mod_layout.$(OBJSUFF) \
- $(HTMLDIR)/mod_links.$(OBJSUFF) \
- $(HTMLDIR)/mod_list.$(OBJSUFF) \
- $(HTMLDIR)/mod_pre.$(OBJSUFF) \
- $(HTMLDIR)/mod_tables.$(OBJSUFF) \
- $(HTMLDIR)/search.$(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_tables.$(OBJSUFF) \
+ $(HTMLDIR)/winpars.$(OBJSUFF)
MSWOBJS = \
$(MSWDIR)/accel.$(OBJSUFF) \
$(MSWDIR)/dcscreen.$(OBJSUFF) \
$(MSWDIR)/dde.$(OBJSUFF) \
$(MSWDIR)/dialog.$(OBJSUFF) \
+ $(MSWDIR)/dialup.$(OBJSUFF) \
$(MSWDIR)/dib.$(OBJSUFF) \
$(MSWDIR)/dibutils.$(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)/fontenum.$(OBJSUFF) \
+ $(MSWDIR)/fontutil.$(OBJSUFF) \
$(MSWDIR)/frame.$(OBJSUFF) \
$(MSWDIR)/gauge95.$(OBJSUFF) \
+ $(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)/menu.$(OBJSUFF) \
$(MSWDIR)/menuitem.$(OBJSUFF) \
$(MSWDIR)/metafile.$(OBJSUFF) \
+ $(MSWDIR)/mimetype.$(OBJSUFF) \
$(MSWDIR)/minifram.$(OBJSUFF) \
$(MSWDIR)/msgdlg.$(OBJSUFF) \
$(MSWDIR)/nativdlg.$(OBJSUFF) \
$(MSWDIR)/palette.$(OBJSUFF) \
$(MSWDIR)/pen.$(OBJSUFF) \
$(MSWDIR)/penwin.$(OBJSUFF) \
- $(MSWDIR)/pnghand.$(OBJSUFF) \
$(MSWDIR)/printdlg.$(OBJSUFF) \
$(MSWDIR)/printwin.$(OBJSUFF) \
$(MSWDIR)/radiobox.$(OBJSUFF) \
$(MSWDIR)/scrolbar.$(OBJSUFF) \
$(MSWDIR)/settings.$(OBJSUFF) \
$(MSWDIR)/slider95.$(OBJSUFF) \
+ $(MSWDIR)/snglinst.$(OBJSUFF) \
$(MSWDIR)/spinbutt.$(OBJSUFF) \
+ $(MSWDIR)/spinctrl.$(OBJSUFF) \
$(MSWDIR)/statbmp.$(OBJSUFF) \
$(MSWDIR)/statbox.$(OBJSUFF) \
$(MSWDIR)/statbr95.$(OBJSUFF) \
$(MSWDIR)/taskbar.$(OBJSUFF) \
$(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)/wave.$(OBJSUFF) \
- $(MSWDIR)/window.$(OBJSUFF) \
- $(MSWDIR)/xpmhand.$(OBJSUFF)
+ $(MSWDIR)/window.$(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) \
$(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
+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)
+ ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+ OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
+ else
+ OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
+ endif
+else
+ OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
+endif
+
+ARCHINCDIR=$(subst /,\,$(WXDIR))\lib\msw$(INCEXT)
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
- $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
-all: $(OBJECTS) $(WXLIB)
+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 $(ARCHINCDIR)
+ mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(ARCHINCDIR)\wx
+ $(COPY) $(WXDIR)\include\wx\msw\setup.h $@
+
+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
# mv y.tab.c $(COMMDIR)/y_tab.c
clean:
- -erase *.o
- -erase *.bak
- -erase core
- -erase ..\common\y_tab.c
- -erase ..\common\lex_yy.c
- -erase ..\common\*.o
- -erase ..\common\*.bak
- -erase ..\generic\*.o
- -erase ..\generic\*.bak
- -erase ..\html\*.o
- -erase ..\png\*.o
- -erase ..\png\*.bak
- -erase ..\zlib\*.o
- -erase ..\zlib\*.bak
- -erase ..\jpeg\*.o
- -erase ..\..\lib\libwx.a
+ -$(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) ../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
+
projects / wxWidgets.git / blobdiff