X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f85afd4e46af8d5432aefa584bb3e54a8eac5522..baccb514311d801fc4268e10bbccdb7f0b566522:/src/msw/makefile.bcc

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 2d42139759..5e26611f21 100644
--- 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 00:24, 1999/10/28
 # 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_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
@@ -100,16 +100,20 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 
 COMMONOBJS = \
 		$(MSWDIR)\y_tab.obj \
+		$(MSWDIR)\appcmn.obj \
 		$(MSWDIR)\choiccmn.obj \
+		$(MSWDIR)\clipcmn.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)\dobjcmn.obj \
 		$(MSWDIR)\docmdi.obj \
 		$(MSWDIR)\docview.obj \
 		$(MSWDIR)\dynarray.obj \
@@ -136,9 +140,11 @@ COMMONOBJS = \
 		$(MSWDIR)\intl.obj \
 		$(MSWDIR)\ipcbase.obj \
 		$(MSWDIR)\layout.obj \
+		$(MSWDIR)\lboxcmn.obj \
 		$(MSWDIR)\list.obj \
 		$(MSWDIR)\log.obj \
 		$(MSWDIR)\memory.obj \
+		$(MSWDIR)\menucmn.obj \
 		$(MSWDIR)\module.obj \
 		$(MSWDIR)\mstream.obj \
 		$(MSWDIR)\object.obj \
@@ -171,7 +177,7 @@ COMMONOBJS = \
 		$(MSWDIR)\wxexpr.obj \
 		$(MSWDIR)\zipstrm.obj \
 		$(MSWDIR)\zstream.obj \
-		${MSWDIR}\resourc2.cpp
+		${MSWDIR}\resourc2.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\app.obj \
@@ -234,6 +240,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\settings.obj \
 		$(MSWDIR)\slidrmsw.obj \
 		$(MSWDIR)\spinbutt.obj \
+		$(MSWDIR)\spinctrl.obj \
 		$(MSWDIR)\statbmp.obj \
 		$(MSWDIR)\statbox.obj \
 		$(MSWDIR)\statline.obj \
@@ -257,7 +264,10 @@ wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 $(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
@@ -343,7 +353,7 @@ $(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
 
@@ -399,6 +409,8 @@ $(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(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)
@@ -430,14 +442,20 @@ $(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
 ########################################################
 # Common objects (always compiled)
 
+$(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(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)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
+
 $(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
@@ -450,6 +468,8 @@ $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(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)
@@ -502,19 +522,23 @@ $(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)\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)
 
@@ -572,7 +596,7 @@ $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
-${MSWDIR}\resourc2.cpp: ${COMMDIR}\resourc2.cpp
+${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(SRCSUFF)
 
 
 
@@ -647,19 +671,14 @@ all_execs:
 
 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)
@@ -702,7 +721,7 @@ $(CFG): makefile.bcc
 -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__