-# This file was automatically generated by tmake at 16:52, 2000/02/29
+# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
# Makefile : Builds wxWindows library wx.lib for MS Windows,
# and Borland C++ (32-bit).
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=0
-USE_XPM_IN_MSW=1
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
!endif
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
-!endif
-
-#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
+#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
+PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0"
DUMMY=dummy
!else
DUMMY=dummydll
-LIBS= cw32 import32 ole2w32
+LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
!endif
LIBTARGET=$(WXLIB)
GENERICOBJS= $(MSWDIR)\busyinfo.obj \
$(MSWDIR)\calctrl.obj \
$(MSWDIR)\choicdgg.obj \
+ $(MSWDIR)\dcbuffer.obj \
+ $(MSWDIR)\dcpsg.obj \
+ $(MSWDIR)\dirctrlg.obj \
$(MSWDIR)\dragimgg.obj \
$(MSWDIR)\grid.obj \
+ $(MSWDIR)\gridctrl.obj \
+ $(MSWDIR)\gridsel.obj \
$(MSWDIR)\laywin.obj \
$(MSWDIR)\logg.obj \
$(MSWDIR)\numdlgg.obj \
$(MSWDIR)\panelg.obj \
- $(MSWDIR)\plot.obj \
$(MSWDIR)\progdlgg.obj \
$(MSWDIR)\prop.obj \
$(MSWDIR)\propform.obj \
$(MSWDIR)\proplist.obj \
$(MSWDIR)\sashwin.obj \
- $(MSWDIR)\scrolwin.obj \
+ $(MSWDIR)\scrlwing.obj \
+ $(MSWDIR)\spinctlg.obj \
+ $(MSWDIR)\splash.obj \
$(MSWDIR)\splitter.obj \
$(MSWDIR)\statusbr.obj \
$(MSWDIR)\tbarsmpl.obj \
$(MSWDIR)\textdlgg.obj \
$(MSWDIR)\tipdlg.obj \
+ $(MSWDIR)\tipwin.obj \
+ $(MSWDIR)\treectlg.obj \
$(MSWDIR)\treelay.obj \
$(MSWDIR)\wizard.obj
# Not needed:
# $(MSWDIR)\colrdlgg.obj \
# $(MSWDIR)\fontdlgg.obj \
-# $(MSWDIR)\helpxlp.obj \
# $(MSWDIR)\msgdlgg.obj \
# $(MSWDIR)\printps.obj \
# $(MSWDIR)\prntdlgg.obj \
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
$(MSWDIR)\appcmn.obj \
+ $(MSWDIR)\artprov.obj \
+ $(MSWDIR)\artstd.obj \
$(MSWDIR)\choiccmn.obj \
$(MSWDIR)\clipcmn.obj \
+ $(MSWDIR)\clntdata.obj \
$(MSWDIR)\cmdline.obj \
+ $(MSWDIR)\cmdproc.obj \
$(MSWDIR)\cmndata.obj \
$(MSWDIR)\config.obj \
+ $(MSWDIR)\containr.obj \
+ $(MSWDIR)\cshelp.obj \
$(MSWDIR)\ctrlcmn.obj \
$(MSWDIR)\ctrlsub.obj \
$(MSWDIR)\datetime.obj \
$(MSWDIR)\datstrm.obj \
$(MSWDIR)\db.obj \
+ $(MSWDIR)\dbgrid.obj \
$(MSWDIR)\dbtable.obj \
$(MSWDIR)\dcbase.obj \
+ $(MSWDIR)\dircmn.obj \
$(MSWDIR)\dlgcmn.obj \
$(MSWDIR)\dndcmn.obj \
$(MSWDIR)\dobjcmn.obj \
$(MSWDIR)\docmdi.obj \
$(MSWDIR)\docview.obj \
+ $(MSWDIR)\dseldlg.obj \
$(MSWDIR)\dynarray.obj \
$(MSWDIR)\dynlib.obj \
+ $(MSWDIR)\dynload.obj \
+ $(MSWDIR)\effects.obj \
$(MSWDIR)\encconv.obj \
$(MSWDIR)\event.obj \
$(MSWDIR)\extended.obj \
+ $(MSWDIR)\fddlgcmn.obj \
$(MSWDIR)\ffile.obj \
$(MSWDIR)\file.obj \
$(MSWDIR)\fileconf.obj \
$(MSWDIR)\filefn.obj \
+ $(MSWDIR)\filename.obj \
$(MSWDIR)\filesys.obj \
$(MSWDIR)\fontcmn.obj \
$(MSWDIR)\fontmap.obj \
$(MSWDIR)\fs_mem.obj \
$(MSWDIR)\fs_zip.obj \
$(MSWDIR)\ftp.obj \
+ $(MSWDIR)\gaugecmn.obj \
$(MSWDIR)\gdicmn.obj \
$(MSWDIR)\geometry.obj \
$(MSWDIR)\gifdecod.obj \
$(MSWDIR)\hash.obj \
+ $(MSWDIR)\hashmap.obj \
$(MSWDIR)\helpbase.obj \
$(MSWDIR)\http.obj \
+ $(MSWDIR)\iconbndl.obj \
$(MSWDIR)\imagall.obj \
$(MSWDIR)\imagbmp.obj \
$(MSWDIR)\image.obj \
+ $(MSWDIR)\imagfill.obj \
$(MSWDIR)\imaggif.obj \
+ $(MSWDIR)\imagiff.obj \
$(MSWDIR)\imagjpeg.obj \
$(MSWDIR)\imagpcx.obj \
$(MSWDIR)\imagpng.obj \
$(MSWDIR)\imagpnm.obj \
$(MSWDIR)\imagtiff.obj \
+ $(MSWDIR)\imagxpm.obj \
$(MSWDIR)\intl.obj \
$(MSWDIR)\ipcbase.obj \
$(MSWDIR)\layout.obj \
$(MSWDIR)\list.obj \
$(MSWDIR)\log.obj \
$(MSWDIR)\longlong.obj \
+ $(MSWDIR)\matrix.obj \
$(MSWDIR)\memory.obj \
$(MSWDIR)\menucmn.obj \
$(MSWDIR)\mimecmn.obj \
$(MSWDIR)\module.obj \
+ $(MSWDIR)\msgout.obj \
$(MSWDIR)\mstream.obj \
+ $(MSWDIR)\nbkbase.obj \
$(MSWDIR)\object.obj \
- $(MSWDIR)\objstrm.obj \
$(MSWDIR)\odbc.obj \
$(MSWDIR)\paper.obj \
+ $(MSWDIR)\popupcmn.obj \
$(MSWDIR)\prntbase.obj \
$(MSWDIR)\process.obj \
$(MSWDIR)\protocol.obj \
+ $(MSWDIR)\quantize.obj \
+ $(MSWDIR)\radiocmn.obj \
+ $(MSWDIR)\regex.obj \
$(MSWDIR)\resource.obj \
$(MSWDIR)\sckaddr.obj \
$(MSWDIR)\sckfile.obj \
$(MSWDIR)\sckipc.obj \
$(MSWDIR)\sckstrm.obj \
- $(MSWDIR)\serbase.obj \
+ $(MSWDIR)\settcmn.obj \
$(MSWDIR)\sizer.obj \
$(MSWDIR)\socket.obj \
+ $(MSWDIR)\statbar.obj \
$(MSWDIR)\strconv.obj \
$(MSWDIR)\stream.obj \
$(MSWDIR)\string.obj \
+ $(MSWDIR)\sysopt.obj \
$(MSWDIR)\tbarbase.obj \
+ $(MSWDIR)\textbuf.obj \
$(MSWDIR)\textcmn.obj \
$(MSWDIR)\textfile.obj \
$(MSWDIR)\timercmn.obj \
$(MSWDIR)\tokenzr.obj \
+ $(MSWDIR)\toplvcmn.obj \
+ $(MSWDIR)\treebase.obj \
$(MSWDIR)\txtstrm.obj \
$(MSWDIR)\unzip.obj \
$(MSWDIR)\url.obj \
$(MSWDIR)\wincmn.obj \
$(MSWDIR)\wxchar.obj \
$(MSWDIR)\wxexpr.obj \
+ $(MSWDIR)\xpmdecod.obj \
$(MSWDIR)\zipstrm.obj \
$(MSWDIR)\zstream.obj
MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\app.obj \
+ $(MSWDIR)\automtn.obj \
$(MSWDIR)\bitmap.obj \
$(MSWDIR)\bmpbuttn.obj \
$(MSWDIR)\brush.obj \
$(MSWDIR)\dropsrc.obj \
$(MSWDIR)\droptgt.obj \
$(MSWDIR)\enhmeta.obj \
+ $(MSWDIR)\evtloop.obj \
+ $(MSWDIR)\fdrepdlg.obj \
$(MSWDIR)\filedlg.obj \
$(MSWDIR)\font.obj \
$(MSWDIR)\fontdlg.obj \
$(MSWDIR)\gdiobj.obj \
$(MSWDIR)\glcanvas.obj \
$(MSWDIR)\gsocket.obj \
+ $(MSWDIR)\gsockmsw.obj \
+ $(MSWDIR)\helpbest.obj \
+ $(MSWDIR)\helpchm.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\imaglist.obj \
+ $(MSWDIR)\iniconf.obj \
$(MSWDIR)\joystick.obj \
$(MSWDIR)\listbox.obj \
$(MSWDIR)\listctrl.obj \
$(MSWDIR)\mimetype.obj \
$(MSWDIR)\minifram.obj \
$(MSWDIR)\msgdlg.obj \
+ $(MSWDIR)\mslu.obj \
$(MSWDIR)\nativdlg.obj \
$(MSWDIR)\notebook.obj \
$(MSWDIR)\oleutils.obj \
$(MSWDIR)\palette.obj \
$(MSWDIR)\pen.obj \
$(MSWDIR)\penwin.obj \
+ $(MSWDIR)\popupwin.obj \
$(MSWDIR)\printdlg.obj \
$(MSWDIR)\printwin.obj \
$(MSWDIR)\radiobox.obj \
$(MSWDIR)\scrolbar.obj \
$(MSWDIR)\settings.obj \
$(MSWDIR)\slider95.obj \
+ $(MSWDIR)\snglinst.obj \
$(MSWDIR)\spinbutt.obj \
$(MSWDIR)\spinctrl.obj \
$(MSWDIR)\statbmp.obj \
$(MSWDIR)\taskbar.obj \
$(MSWDIR)\tbar95.obj \
$(MSWDIR)\textctrl.obj \
+ $(MSWDIR)\tglbtn.obj \
$(MSWDIR)\thread.obj \
$(MSWDIR)\timer.obj \
$(MSWDIR)\tooltip.obj \
+ $(MSWDIR)\toplevel.obj \
$(MSWDIR)\treectrl.obj \
$(MSWDIR)\utils.obj \
$(MSWDIR)\utilsexc.obj \
$(MSWDIR)\uuid.obj \
+ $(MSWDIR)\volume.obj \
$(MSWDIR)\wave.obj \
- $(MSWDIR)\window.obj \
- $(MSWDIR)\xpmhand.obj
+ $(MSWDIR)\window.obj
HTMLOBJS = $(MSWDIR)\helpctrl.obj \
$(MSWDIR)\helpdata.obj \
$(MSWDIR)\m_list.obj \
$(MSWDIR)\m_meta.obj \
$(MSWDIR)\m_pre.obj \
+ $(MSWDIR)\m_style.obj \
$(MSWDIR)\m_tables.obj \
$(MSWDIR)\winpars.obj
default: wx
-wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all: wx
+
+# Copy the in-CVS setup0.h to setup.h if necessary
+makesetuph:
+ cd $(WXDIR)\include\wx\msw
+ if not exist setup.h copy setup0.h setup.h
+ cd $(WXDIR)\src\msw
-all: all_libs all_execs
+# Copy include\wx\msw\setup.h to the architecture-specific location
+makearchsetuph:
+ copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
+ cd $(WXDIR)\src\msw
+
+$(ARCHINCDIR)\wx:
+ -mkdir $(ARCHINCDIR)
+ -mkdir $(ARCHINCDIR)\wx
!if "$(DLL)" == "0"
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET)
- tlib $(LIBTARGET) /P1024 @&&!
+ tlib "$(LIBTARGET)" /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
!
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll
- tlink32 $(LINK_FLAGS) /v @&&!
+ $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
c0d32.obj $(OBJECTS)
$(WXLIBDIR)\wx
nul
wxb32
!
implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
-
!endif
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
-dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
+
+version.res:
+ brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
+$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
+
$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
$(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
$(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
+$(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
+
+$(MSWDIR)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.$(SRCSUFF)
+
$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+
+$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
+
+$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
+
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
$(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
+
$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
$(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
+$(MSWDIR)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF)
+
$(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
$(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+
$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
$(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF)
+$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
+
$(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
$(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
$(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
+$(MSWDIR)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF)
+
$(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
$(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
+$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
+
$(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF)
$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
$(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
+$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
+
$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
-$(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
-
########################################################
$(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
+$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
+
+$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF)
+
$(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
$(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
+$(MSWDIR)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF)
+
$(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF)
+$(MSWDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF)
+
$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
+$(MSWDIR)\containr.obj: $(COMMDIR)\containr.$(SRCSUFF)
+
+$(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
+
$(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
$(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
+$(MSWDIR)\dbgrid.obj: $(COMMDIR)\dbgrid.$(SRCSUFF)
+
$(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
$(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
+$(MSWDIR)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
+
$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
$(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
+$(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
+
$(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
+$(MSWDIR)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF)
+
+$(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
+
$(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
$(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
$(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
+$(MSWDIR)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF)
+
$(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
$(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
$(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
+$(MSWDIR)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
+
$(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
$(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
$(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
+$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF)
+
$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
$(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
+$(MSWDIR)\hashmap.obj: $(COMMDIR)\hashmap.$(SRCSUFF)
+
$(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
$(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
+$(MSWDIR)\iconbndl.obj: $(COMMDIR)\iconbndl.$(SRCSUFF)
+
$(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
$(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
$(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
+$(MSWDIR)\imagfill.obj: $(COMMDIR)\imagfill.$(SRCSUFF)
+
$(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
+$(MSWDIR)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF)
+
$(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
$(MSWDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF)
$(MSWDIR)\imagtiff.obj: $(COMMDIR)\imagtiff.$(SRCSUFF)
+$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
+
$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
$(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF)
+$(MSWDIR)\matrix.obj: $(COMMDIR)\matrix.$(SRCSUFF)
+
$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
$(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
+$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF)
+
$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
-$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
+$(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)
-$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
+$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
$(MSWDIR)\odbc.obj: $(COMMDIR)\odbc.$(SRCSUFF)
$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
+$(MSWDIR)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF)
+
$(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
$(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
+
+$(MSWDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF)
+
+$(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
+
$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
$(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
$(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
-$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
+$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
$(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
+$(MSWDIR)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF)
+
$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
$(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
+$(MSWDIR)\sysopt.obj: $(COMMDIR)\sysopt.$(SRCSUFF)
+
$(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
+$(MSWDIR)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF)
+
$(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
$(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
+$(MSWDIR)\toplvcmn.obj: $(COMMDIR)\toplvcmn.$(SRCSUFF)
+
+$(MSWDIR)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF)
+
$(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
+$(MSWDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF)
+
$(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
+$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+
+$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
+
+$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
+
$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
+$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+
+$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+
$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
-$(MSWDIR)\plot.obj: $(GENDIR)\plot.$(SRCSUFF)
-
$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
-$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
+$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
+
+$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
+
+$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
+$(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
+
+$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
+
$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
$(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
+$(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF)
+
$(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
$(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
all_utils:
cd $(WXDIR)\utils
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
all_samples:
cd $(WXDIR)\samples
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
all_execs:
cd $(WXDIR)\utils
- make -f makefile.b32 all_execs
+ ${MAKE} -f makefile.b32 all_execs
cd $(WXDIR)\src\msw
-wxxpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
- cd $(WXDIR)\src\msw
-
-clean_wxxpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 clean
- cd $(WXDIR)\src\msw
-
png: $(CFG)
cd $(WXDIR)\src\png
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
clean_png:
cd $(WXDIR)\src\png
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
zlib: $(CFG)
cd $(WXDIR)\src\zlib
- make -f makefile.b32 lib
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_zlib:
cd $(WXDIR)\src\zlib
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
jpeg: $(CFG)
cd $(WXDIR)\src\jpeg
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
clean_jpeg:
cd $(WXDIR)\src\jpeg
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
-xpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 lib
+regex: $(CFG)
+ cd $(WXDIR)\src\regex
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
-clean_xpm:
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 clean
+clean_regex:
+ cd $(WXDIR)\src\regex
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
tiff: $(CFG)
cd $(WXDIR)\src\tiff
- make -f makefile.b32 lib
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_tiff:
cd $(WXDIR)\src\tiff
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
$(CFG): makefile.b32
copy &&!
+-Hc
-H=$(WXDIR)\src\msw\wx32.csm
-3
-d
-w-par
-w-aus
-w-hid # virtual function A hides virtual function B
--WE
-tWM
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
+-I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32
--L$(BCCDIR)\lib
+-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D__WXWIN__
-D__WXMSW__
-D__WINDOWS__
$(WIN95FLAG)
! $(CFG)
-#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
-# -Oxt
-
clean: $(PERIPH_CLEAN_TARGET)
-erase $(LIBTARGET)
+ -erase $(WXLIBDIR)\wx.dll
+ -erase $(WXLIBDIR)\wx.tds
+ -erase $(WXLIBDIR)\wx.il?
-erase *.obj
-erase *.pch
-erase *.csm
allhlp: wxhlp portinghlp prophlp
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 hlp
+ ${MAKE} -f makefile.b32 hlp
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxbuild\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgrid\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
allhtml: wxhtml portinghtml prophtml
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 html
+ ${MAKE} -f makefile.b32 html
cd $(THISDIR)
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\dialoged\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\hytext\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
allps: wxps referencps portingps propps
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 ps
+ ${MAKE} -f makefile.b32 ps
cd $(THISDIR)
allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 pdfrtf
+ ${MAKE} -f makefile.b32 pdfrtf
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
projects / wxWidgets.git / blobdiff