String changes for translations,

[wxWidgets.git] / src / msw / makefile.bcc

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index ff7e40f21caf993c47ed57867263a76afa41259c..796e088cc93790de7630295053ee1c95f00447c6 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 00:42, 1999/07/27
+# This file was automatically generated by tmake at 13:22, 1999/11/24

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #


@@ -47,7 +47,7 @@ PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
 !if "$(USE_CTL3D)" == "1"
 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"
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"


@@ -76,11 +76,11 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\choicdgg.obj \
                $(MSWDIR)\dirdlgg.obj \
 GENERICOBJS= $(MSWDIR)\busyinfo.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)\imaglist.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\listctrl.obj \

+               $(MSWDIR)\logg.obj \

                $(MSWDIR)\notebook.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\panelg.obj \
                $(MSWDIR)\notebook.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\panelg.obj \


@@ -95,20 +95,25 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\tabg.obj \
                $(MSWDIR)\textdlgg.obj \
                $(MSWDIR)\tipdlg.obj \
                $(MSWDIR)\tabg.obj \
                $(MSWDIR)\textdlgg.obj \
                $(MSWDIR)\tipdlg.obj \

-               $(MSWDIR)\treectrl.obj
+               $(MSWDIR)\treectrl.obj \
+               $(MSWDIR)\wizard.obj

 
 COMMONOBJS = \
                $(MSWDIR)\y_tab.obj \
 
 COMMONOBJS = \
                $(MSWDIR)\y_tab.obj \

+               $(MSWDIR)\appcmn.obj \

                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\choiccmn.obj \

+               $(MSWDIR)\clipcmn.obj \

                $(MSWDIR)\cmndata.obj \
                $(MSWDIR)\config.obj \
                $(MSWDIR)\ctrlcmn.obj \
                $(MSWDIR)\cmndata.obj \
                $(MSWDIR)\config.obj \
                $(MSWDIR)\ctrlcmn.obj \

+               $(MSWDIR)\ctrlsub.obj \

                $(MSWDIR)\date.obj \
                $(MSWDIR)\datstrm.obj \
                $(MSWDIR)\db.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dlgcmn.obj \
                $(MSWDIR)\date.obj \
                $(MSWDIR)\datstrm.obj \
                $(MSWDIR)\db.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dlgcmn.obj \

+               $(MSWDIR)\dobjcmn.obj \

                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
                $(MSWDIR)\dynarray.obj \


@@ -120,23 +125,27 @@ COMMONOBJS = \
                $(MSWDIR)\fileconf.obj \
                $(MSWDIR)\filefn.obj \
                $(MSWDIR)\filesys.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_zip.obj \
                $(MSWDIR)\gdicmn.obj \
                $(MSWDIR)\framecmn.obj \
                $(MSWDIR)\fs_inet.obj \
                $(MSWDIR)\fs_zip.obj \
                $(MSWDIR)\gdicmn.obj \

+               $(MSWDIR)\gifdecod.obj \

                $(MSWDIR)\hash.obj \
                $(MSWDIR)\helpbase.obj \
                $(MSWDIR)\hash.obj \
                $(MSWDIR)\helpbase.obj \

+               $(MSWDIR)\imagall.obj \

                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
                $(MSWDIR)\imaggif.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)\intl.obj \
                $(MSWDIR)\ipcbase.obj \
                $(MSWDIR)\layout.obj \

+               $(MSWDIR)\lboxcmn.obj \

                $(MSWDIR)\list.obj \
                $(MSWDIR)\log.obj \
                $(MSWDIR)\memory.obj \
                $(MSWDIR)\list.obj \
                $(MSWDIR)\log.obj \
                $(MSWDIR)\memory.obj \

+               $(MSWDIR)\menucmn.obj \

                $(MSWDIR)\module.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\object.obj \
                $(MSWDIR)\module.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\object.obj \


@@ -144,6 +153,9 @@ COMMONOBJS = \
                $(MSWDIR)\paper.obj \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\resource.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)\stream.obj \
                $(MSWDIR)\string.obj \
                $(MSWDIR)\tbarbase.obj \


@@ -164,9 +176,9 @@ COMMONOBJS = \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \

-               $(MSWDIR)\zipstream.obj \
+               $(MSWDIR)\zipstrm.obj \

                $(MSWDIR)\zstream.obj \
                $(MSWDIR)\zstream.obj \

-               ${MSWDIR}\resourc2.cpp
+               ${MSWDIR}\resourc2.obj

 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \


@@ -199,9 +211,13 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \

+               $(MSWDIR)\fontenum.obj \
+               $(MSWDIR)\fontutil.obj \

                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gaugemsw.obj \
                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gaugemsw.obj \

+               $(MSWDIR)\gdiimage.obj \

                $(MSWDIR)\gdiobj.obj \
                $(MSWDIR)\gdiobj.obj \

+               $(MSWDIR)\gsocket.obj \

                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\iniconf.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\iniconf.obj \


@@ -219,7 +235,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \

-               $(MSWDIR)\pnghand.obj \

                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \


@@ -229,6 +244,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slidrmsw.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slidrmsw.obj \
                $(MSWDIR)\spinbutt.obj \

+               $(MSWDIR)\spinctrl.obj \

                $(MSWDIR)\statbmp.obj \
                $(MSWDIR)\statbox.obj \
                $(MSWDIR)\statline.obj \
                $(MSWDIR)\statbmp.obj \
                $(MSWDIR)\statbox.obj \
                $(MSWDIR)\statline.obj \


@@ -252,7 +268,10 @@ wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
        erase $(LIBTARGET)
        tlib $(LIBTARGET) /P1024 @&&!
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
        erase $(LIBTARGET)
        tlib $(LIBTARGET) /P1024 @&&!

-+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
++$(COMMONOBJS:.obj =.obj +)\
++$(GENERICOBJS:.obj =.obj +)\
++$(MSWOBJS:.obj =.obj +)\
++$(PERIPH_LIBS:.lib =.lib +)

 !
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 !
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h


@@ -334,11 +353,19 @@ $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
 $(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(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)\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)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 


@@ -374,8 +401,6 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
 $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(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)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)


@@ -394,6 +419,8 @@ $(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(SRCSUFF)
 
 $(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(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)
 $(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
 
 $(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF)


@@ -425,14 +452,20 @@ $(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
 ########################################################
 # Common objects (always compiled)
 
 ########################################################
 # Common objects (always compiled)
 

+$(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
+

 $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 

+$(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
+

 $(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
 $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
 $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 

+$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
+

 $(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 $(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)


@@ -445,6 +478,8 @@ $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
 
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 

+$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
+

 $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)


@@ -467,6 +502,10 @@ $(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
 $(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
 
 $(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)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
 $(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)


@@ -475,39 +514,43 @@ $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
 $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
 
 $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 

+$(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
+

 $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
 $(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(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)\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)\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)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
 $(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
 
 $(MSWDIR)\log.obj: $(COMMDIR)\log.$(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)\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)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 


@@ -515,6 +558,12 @@ $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(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)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
 $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
 $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)


@@ -555,11 +604,11 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
 
 $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
 
 
 $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
 

-$(MSWDIR)\zipstream.obj: $(COMMDIR)\zipstream.$(SRCSUFF)
+$(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)

 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 

-${MSWDIR}\resourc2.cpp: ${COMMDIR}\resourc2.cpp
+${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(SRCSUFF)

 
 
 
 
 
 


@@ -573,9 +622,7 @@ $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
 $(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(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)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
 


@@ -583,6 +630,8 @@ $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
 $(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(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)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF)
 
 $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)


@@ -613,6 +662,8 @@ $(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
 
 $(MSWDIR)\treectrl.obj: $(GENDIR)\treectrl.$(SRCSUFF)
 
 
 $(MSWDIR)\treectrl.obj: $(GENDIR)\treectrl.$(SRCSUFF)
 

+$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
+

 
 
 all_utils:
 
 
 all_utils:


@@ -632,19 +683,14 @@ all_execs:
 
 all_libs:
     cd $(WXDIR)\src\msw
 
 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
           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
 
 # 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)
 wxxpm: $(CFG)
        cd $(WXDIR)\src\xpm
        make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)


@@ -687,7 +733,7 @@ $(CFG): makefile.bcc
 -Fs-
 -Vf
 -Ff=4
 -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__
 -I$(WXDIR)\include\wx\msw\gnuwin32
 -L$(BCCDIR)\lib
 -D__WXWIN__


@@ -720,7 +766,10 @@ cleanall: clean
 
 
 MFTYPE=bcc
 
 
 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
        cd $(WXWIN)\distrib\msw\tmake
        tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
        copy makefile.$(MFTYPE) $(WXWIN)\src\msw