Removal of previous wxValidtor code for wxOS2

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

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 2d42139759fb47ed3274bcffa99ef5fa328da0e1..32974bff5943f181e2d28940c8b0dff8101f5b3a 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 13:22, 1999/10/06
+# This file was automatically generated by tmake at 14:24, 1999/11/15

 # 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"


@@ -100,16 +100,20 @@ GENERICOBJS= $(MSWDIR)\busyinfo.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 \


@@ -122,6 +126,7 @@ COMMONOBJS = \
                $(MSWDIR)\filefn.obj \
                $(MSWDIR)\filesys.obj \
                $(MSWDIR)\fontcmn.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)\framecmn.obj \
                $(MSWDIR)\fs_inet.obj \
                $(MSWDIR)\fs_zip.obj \


@@ -136,9 +141,11 @@ COMMONOBJS = \
                $(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 \


@@ -171,7 +178,7 @@ COMMONOBJS = \
                $(MSWDIR)\wxexpr.obj \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj \
                $(MSWDIR)\wxexpr.obj \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj \

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

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


@@ -204,6 +211,8 @@ 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)\gdiobj.obj \
                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gaugemsw.obj \
                $(MSWDIR)\gdiobj.obj \


@@ -234,6 +243,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 \


@@ -257,7 +267,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


@@ -339,11 +352,15 @@ $(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)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)

 
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
 
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 


@@ -399,6 +416,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)


@@ -430,14 +449,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)


@@ -450,6 +475,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)


@@ -474,6 +501,8 @@ $(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
 $(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(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)


@@ -502,19 +531,23 @@ $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
 
 $(MSWDIR)\layout.obj: $(COMMDIR)\layout.$(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)
 


@@ -572,7 +605,7 @@ $(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)

 
 
 
 
 
 


@@ -647,19 +680,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)


@@ -702,7 +730,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__