-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 18:32, 2000/02/17
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
PERIPH_CLEAN_TARGET=
!if "$(USE_CTL3D)" == "1"
-PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
!endif
!if "$(USE_XPM_IN_MSW)" == "1"
DOCDIR = $(WXDIR)\docs
GENERICOBJS= $(MSWDIR)\busyinfo.obj \
+ $(MSWDIR)\calctrl.obj \
$(MSWDIR)\choicdgg.obj \
$(MSWDIR)\dirdlgg.obj \
- $(MSWDIR)\extdlgg.obj \
- $(MSWDIR)\gridg.obj \
+ $(MSWDIR)\grid.obj \
$(MSWDIR)\imaglist.obj \
$(MSWDIR)\laywin.obj \
$(MSWDIR)\listctrl.obj \
+ $(MSWDIR)\logg.obj \
$(MSWDIR)\notebook.obj \
$(MSWDIR)\numdlgg.obj \
$(MSWDIR)\panelg.obj \
+ $(MSWDIR)\plot.obj \
$(MSWDIR)\progdlgg.obj \
$(MSWDIR)\prop.obj \
$(MSWDIR)\propform.obj \
$(MSWDIR)\splitter.obj \
$(MSWDIR)\statusbr.obj \
$(MSWDIR)\tabg.obj \
+ $(MSWDIR)\tbarsmpl.obj \
$(MSWDIR)\textdlgg.obj \
$(MSWDIR)\tipdlg.obj \
- $(MSWDIR)\treectrl.obj
+ $(MSWDIR)\treectrl.obj \
+ $(MSWDIR)\wizard.obj
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
+ $(MSWDIR)\appcmn.obj \
$(MSWDIR)\choiccmn.obj \
+ $(MSWDIR)\clipcmn.obj \
+ $(MSWDIR)\cmdline.obj \
$(MSWDIR)\cmndata.obj \
$(MSWDIR)\config.obj \
$(MSWDIR)\ctrlcmn.obj \
- $(MSWDIR)\date.obj \
+ $(MSWDIR)\ctrlsub.obj \
+ $(MSWDIR)\datetime.obj \
$(MSWDIR)\datstrm.obj \
$(MSWDIR)\db.obj \
$(MSWDIR)\dbtable.obj \
$(MSWDIR)\dcbase.obj \
$(MSWDIR)\dlgcmn.obj \
+ $(MSWDIR)\dndcmn.obj \
+ $(MSWDIR)\dobjcmn.obj \
$(MSWDIR)\docmdi.obj \
$(MSWDIR)\docview.obj \
$(MSWDIR)\dynarray.obj \
$(MSWDIR)\dynlib.obj \
+ $(MSWDIR)\encconv.obj \
$(MSWDIR)\event.obj \
$(MSWDIR)\extended.obj \
$(MSWDIR)\ffile.obj \
$(MSWDIR)\fileconf.obj \
$(MSWDIR)\filefn.obj \
$(MSWDIR)\filesys.obj \
+ $(MSWDIR)\fontcmn.obj \
+ $(MSWDIR)\fontmap.obj \
$(MSWDIR)\framecmn.obj \
$(MSWDIR)\fs_inet.obj \
+ $(MSWDIR)\fs_mem.obj \
$(MSWDIR)\fs_zip.obj \
$(MSWDIR)\gdicmn.obj \
+ $(MSWDIR)\geometry.obj \
+ $(MSWDIR)\gifdecod.obj \
$(MSWDIR)\hash.obj \
$(MSWDIR)\helpbase.obj \
+ $(MSWDIR)\imagall.obj \
$(MSWDIR)\imagbmp.obj \
$(MSWDIR)\image.obj \
$(MSWDIR)\imaggif.obj \
- $(MSWDIR)\imagjpeg.obj \
- $(MSWDIR)\imagpng.obj \
$(MSWDIR)\intl.obj \
$(MSWDIR)\ipcbase.obj \
$(MSWDIR)\layout.obj \
+ $(MSWDIR)\lboxcmn.obj \
$(MSWDIR)\list.obj \
$(MSWDIR)\log.obj \
+ $(MSWDIR)\longlong.obj \
$(MSWDIR)\memory.obj \
+ $(MSWDIR)\menucmn.obj \
$(MSWDIR)\module.obj \
$(MSWDIR)\mstream.obj \
$(MSWDIR)\object.obj \
$(MSWDIR)\paper.obj \
$(MSWDIR)\prntbase.obj \
$(MSWDIR)\resource.obj \
+ $(MSWDIR)\serbase.obj \
+ $(MSWDIR)\sizer.obj \
$(MSWDIR)\strconv.obj \
$(MSWDIR)\stream.obj \
$(MSWDIR)\string.obj \
$(MSWDIR)\tbarbase.obj \
- $(MSWDIR)\tbarsmpl.obj \
$(MSWDIR)\textcmn.obj \
$(MSWDIR)\textfile.obj \
- $(MSWDIR)\time.obj \
$(MSWDIR)\timercmn.obj \
$(MSWDIR)\tokenzr.obj \
$(MSWDIR)\txtstrm.obj \
$(MSWDIR)\wxexpr.obj \
$(MSWDIR)\zipstrm.obj \
$(MSWDIR)\zstream.obj \
- ${MSWDIR}\resourc2.cpp
+ ${MSWDIR}\resourc2.obj
MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\app.obj \
$(MSWDIR)\dcscreen.obj \
$(MSWDIR)\dde.obj \
$(MSWDIR)\dialog.obj \
+ $(MSWDIR)\dialup.obj \
$(MSWDIR)\dib.obj \
$(MSWDIR)\dibutils.obj \
+ $(MSWDIR)\dir.obj \
$(MSWDIR)\dragimag.obj \
$(MSWDIR)\filedlg.obj \
$(MSWDIR)\font.obj \
$(MSWDIR)\fontdlg.obj \
+ $(MSWDIR)\fontenum.obj \
+ $(MSWDIR)\fontutil.obj \
$(MSWDIR)\frame.obj \
$(MSWDIR)\gaugemsw.obj \
+ $(MSWDIR)\gdiimage.obj \
$(MSWDIR)\gdiobj.obj \
+ $(MSWDIR)\gsocket.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\iniconf.obj \
$(MSWDIR)\palette.obj \
$(MSWDIR)\pen.obj \
$(MSWDIR)\penwin.obj \
- $(MSWDIR)\pnghand.obj \
$(MSWDIR)\printdlg.obj \
$(MSWDIR)\printwin.obj \
$(MSWDIR)\radiobox.obj \
$(MSWDIR)\settings.obj \
$(MSWDIR)\slidrmsw.obj \
$(MSWDIR)\spinbutt.obj \
+ $(MSWDIR)\spinctrl.obj \
$(MSWDIR)\statbmp.obj \
$(MSWDIR)\statbox.obj \
$(MSWDIR)\statline.obj \
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
erase $(LIBTARGET)
- tlib $(LIBTARGET) /P1024 @&&!
-+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+ tlib $(LIBTARGET) /P2048 @&&!
++$(COMMONOBJS:.obj =.obj +)\
++$(GENERICOBJS:.obj =.obj +)\
++$(MSWOBJS:.obj =.obj +)\
++$(PERIPH_LIBS:.lib =.lib +)
!
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
+$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
+
$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
+$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
+
$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
$(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF)
+$(MSWDIR)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
+
+$(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
+
$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
-$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdi$(SRCSUFF).obj
+$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
+
+$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
+
+$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
-$(MSWDIR)\pnghand.obj: $(MSWDIR)\pnghand.$(SRCSUFF)
-
$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
$(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
+$(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
+
$(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
$(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF)
########################################################
# Common objects (always compiled)
+$(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
+
$(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
+$(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
+
+$(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF)
+
$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
$(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
-$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
+$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
+
+$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
+$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
+
+$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
+
$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
$(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
+$(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
+
$(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
$(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
$(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
+$(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
+
+$(MSWDIR)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
+
$(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
$(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
+$(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
+
$(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
+$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
+
+$(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
+
$(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
$(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
+$(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
+
$(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
$(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
$(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
-$(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
-
-$(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
-
$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
$(MSWDIR)\layout.obj: $(COMMDIR)\layout.$(SRCSUFF)
+$(MSWDIR)\lboxcmn.obj: $(COMMDIR)\lboxcmn.$(SRCSUFF)
+
$(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
$(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
+$(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF)
+
$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
+$(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
+
$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
-$(MSWDIR)\object.obj: $(COMMDIR)\$(SRCSUFF)ect.obj
+$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
-$(MSWDIR)\objstrm.obj: $(COMMDIR)\$(SRCSUFF)strm.obj
+$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
+$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
+
+$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
+
$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
$(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
-$(MSWDIR)\tbarsmpl.obj: $(COMMDIR)\tbarsmpl.$(SRCSUFF)
-
$(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
$(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
-$(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF)
-
$(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
-${MSWDIR}\resourc2.cpp: ${COMMDIR}\resourc2.cpp
+${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(SRCSUFF)
$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
+$(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
+
$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
$(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(SRCSUFF)
-$(MSWDIR)\extdlgg.obj: $(GENDIR)\extdlgg.$(SRCSUFF)
-
-$(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
+$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
$(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
$(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
+$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
+
$(MSWDIR)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF)
$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(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)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
+$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
+
$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
$(MSWDIR)\treectrl.obj: $(GENDIR)\treectrl.$(SRCSUFF)
+$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
+
all_utils:
all_libs:
cd $(WXDIR)\src\msw
- make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+ make -f makefile.bcc dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
wxstring wxtree mfutils # wxxpm
all_contribs:
cd $(WXDIR)\src\msw
- make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm
+ make -f makefile.bcc fafa wxstring itsy gauge # wxxpm
# CONTRIB
-ctl3d: $(CFG)
- cd $(WXDIR)\src\msw\ctl3d\borland
- make -f makefile.bcc -DCFG=$(CFG)
- cd $(WXDIR)\src\msw
-
wxxpm: $(CFG)
cd $(WXDIR)\src\xpm
make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
-Fs-
-Vf
-Ff=4
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib
-D__WXWIN__
MFTYPE=bcc
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+# Can't use this or we'll have to distribute all tmake files with wxWindows
+#makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+
+self:
cd $(WXWIN)\distrib\msw\tmake
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
copy makefile.$(MFTYPE) $(WXWIN)\src\msw