diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t deleted file mode 100644 index d9ccb8f43e..0000000000 --- a/distrib/msw/tmake/bcc.t +++ /dev/null @@ -1,300 +0,0 @@ -#!############################################################################# -#! File: bcc.t -#! Purpose: tmake template file from which makefile.bcc is generated by running -#! tmake -t bcc wxwin.pro -o makefile.bcc -#! -#! TODO: -#! - resourc2.obj is not correctly generated (see list and target). -#! - cpp is incorrectly substituted into filenames containing 'obj' -#! -#! Author: Vadim Zeitlin -#! Created: 14.07.99 -#! Version: $Id$ -#!############################################################################# - -#${ - #! include the code which parses filelist.txt file and initializes - #! %wxCommon, %wxGeneric and %wxMSW hashes. - IncludeTemplate("filelist.t"); - - #! now transform these hashes into $project tags - foreach $file (sort keys %wxGeneric) { - my $tag = ""; - if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) { - #! Need this file too since it has wxGenericPageSetupDialog - next unless $file =~ /^prntdlgg\./; - } - - $file =~ s/cp?p?$/obj/; - $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " " - } - - foreach $file (sort keys %wxCommon) { - #! socket files don't compile under Win16 currently - next if $wxCommon{$file} =~ /\b(32|S|U)\b/; - - #! needs extra files (sql*.h) so not compiled by default. - next if $file =~ /^odbc\./; - - $isCFile = $file =~ /\.c$/; - $file =~ s/cp?p?$/obj/; - $obj = "\$(MSWDIR)\\" . $file . " "; - $project{"WXCOMMONOBJS"} .= $obj; - $project{"WXCOBJS"} .= $obj if $isCFile; - } - - #! special hack for Borland in 16 bits needs this file - $project{"WXCOMMONOBJS"} .= '${MSWDIR}\resourc2.obj'; - - foreach $file (sort keys %wxMSW) { - #! don't take files not appropriate for 16-bit Windows - next if $wxMSW{$file} =~ /\b(32|O)\b/; - - $isCFile = $file =~ /\.c$/; - $file =~ s/cp?p?$/obj/; - $obj = "\$(MSWDIR)\\" . $file . " "; - $project{"WXMSWOBJS"} .= $obj; - $project{"WXCOBJS"} .= $obj if $isCFile; - } -#$} - -# This file was automatically generated by tmake -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! - -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright:(c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds wxWindows library wx.lib for Windows 3.1 -# and Borland C++ 3.1 - -!if "$(BCCDIR)" == "" -!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4 -!endif - -!if "$(WXWIN)" == "" -!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx -!endif - -!if "$(CFG)" == "" -# !error You must start compiling from wx\src, not wx\src\msw. -!endif - -!ifndef DEBUG -DEBUG=0 -!endif - -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\makebcc.env - -THISDIR = $(WXDIR)\src\msw - -# Please set these according to the settings in wx_setup.h, so we can include -# the appropriate libraries in wx.lib -USE_CTL3D=1 - -PERIPH_LIBS= -PERIPH_TARGET= -PERIPH_CLEAN_TARGET= - -!if "$(USE_CTL3D)" == "1" -PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS) -!endif - -# TODO: add these libraries -# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS) -PERIPH_TARGET=zlib png $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET) - -CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) - -LIBTARGET= $(WXLIBDIR)\wx.lib -DUMMY=dummy - -GENDIR=..\generic -COMMDIR=..\common -OLEDIR=.\ole -MSWDIR=. - -DOCDIR = $(WXDIR)\docs - -GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); - -COMMONOBJS = \ - $(MSWDIR)\y_tab.obj \ - #$ ExpandList("WXCOMMONOBJS"); - -MSWOBJS = #$ ExpandList("WXMSWOBJS"); - -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) - -default: wx - -wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) - -$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS) - erase $(LIBTARGET) - 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 -dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h - -$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - -# cl @<< -# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -# << - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - -# $(OBJECTS): $(WXDIR)\include\wx\setup.h - -#${ - $_ = $project{"WXMSWOBJS"}; - my @objs = split; - foreach (@objs) { - $text .= $_ . ": "; - $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)'; - s/obj$/$suffix/; - $text .= $_ . "\n\n"; - } -#$} - -######################################################## -# Common objects (always compiled) - -#${ - $_ = $project{"WXCOMMONOBJS"}; - my @objs = split; - foreach (@objs) { - $text .= $_ . ": "; - $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)'; - s/MSWDIR/COMMDIR/; - s/obj$/$suffix/; - $text .= $_ . "\n\n"; - } -#$} - -######################################################## -# Generic objects (not always compiled, depending on -# whether platforms have native implementations) - -#${ - $_ = $project{"WXGENERICOBJS"}; - my @objs = split; - foreach (@objs) { - $text .= $_ . ": "; - s/MSWDIR/GENDIR/; - s/obj$/\$(SRCSUFF)/; - $text .= $_ . "\n\n"; - } -#$} - -all_utils: - cd $(WXDIR)\utils - make -f makefile.bcc - cd $(WXDIR)\src\msw - -all_samples: - cd $(WXDIR)\samples - make -f makefile.bcc - cd $(WXDIR)\src\msw - -all_execs: - cd $(WXDIR)\utils - make -f makefile.bcc all_execs - cd $(WXDIR)\src\msw - -# CONTRIB -png: $(CFG) - cd $(WXDIR)\src\png - make -f makefile.bcc - cd $(WXDIR)\src\msw - -clean_png: - cd $(WXDIR)\src\png - make -f makefile.bcc clean - cd $(WXDIR)\src\msw - -zlib: $(CFG) - cd $(WXDIR)\src\zlib - make -f makefile.bcc - cd $(WXDIR)\src\msw - -clean_zlib: - cd $(WXDIR)\src\zlib - make -f makefile.bcc clean - cd $(WXDIR)\src\msw - -$(CFG): makefile.bcc - copy &&! --H=$(WXDIR)\src\msw\borland.pch --2 --P --d --w-hid --w-par --w-pia --w-aus --w-rch --ml --Od --WE --Fs- --Vf --Ff=4 --I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib --I$(WXDIR)\include\wx\msw\gnuwin32 --L$(BCCDIR)\lib --D__WXWIN__ --D__WXMSW__ --D__WINDOWS__ --D__WIN16__ -! $(CFG) -!if "$(BOR_VER)" == "3.1" - echo -Ff=4 >>$(CFG) -!elif "$(BOR_VER)" == "4" - echo -Ff=512 >>$(CFG) - echo -dc >>$(CFG) -!else - echo -Ff=512 >>$(CFG) - echo -dc >>$(CFG) -!endif - -# -O was: -Oxt - -clean: $(PERIPH_CLEAN_TARGET) - erase $(LIBTARGET) - erase *.obj - erase *.pch - erase *.csm - erase *.cfg - erase ..\common\y_tab.c - erase ..\common\lex_yy.c - -cleanall: clean - - -MFTYPE=bcc -# 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 diff --git a/src/makebcc.env b/src/makebcc.env deleted file mode 100644 index e9c4876f74..0000000000 --- a/src/makebcc.env +++ /dev/null @@ -1,34 +0,0 @@ -# Common settings for Borland 16-bit compilation (makefile.bcc files) - -WXDIR = $(WXWIN) - -CFG = $(WXDIR)\src\msw\wxwin.cfg -WXLIBDIR = $(WXDIR)\lib -WXLIBDIR2 = $(WXDIR)\contrib\lib -WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include - -!ifndef FINAL -FINAL=0 -!endif - -!if "$(FINAL)" == "0" -LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(WXDIR)\contrib\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS) -OPT = -Od -DEBUG_FLAGS= -v -D__WXDEBUG__ -!else -LINKFLAGS=/Twe /L$(WXDIR)\lib;$(WXDIR)\contrib\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS) -OPT = -O2 -DEBUG_FLAGS = -!endif - -CPPFLAGS=$(DEBUG_FLAGS) $(OPT) $(EXTRACPPFLAGS) @$(CFG) -WXLIB= $(WXLIBDIR)\wx.lib - -SRCSUFF = cpp -OBJSUFF = obj - -.$(SRCSUFF).obj: - bcc $(CPPFLAGS) -c {$< } - -.c.obj: - bcc $(CPPFLAGS) -DUSE_DEFINE -P- -c {$< } diff --git a/src/makelib.bcc b/src/makelib.bcc deleted file mode 100644 index 73705fb5be..0000000000 --- a/src/makelib.bcc +++ /dev/null @@ -1,37 +0,0 @@ -# -# File: makelib.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Include file for libraries. Set LIBTARGET and OBJECTS -# before including this file. - -# WXWIN and BCCDIR are set by parent make - -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\makebcc.env - -$(LIBTARGET): $(OBJECTS) - erase $(LIBTARGET) - tlib $(LIBTARGET) /P1024 @&&! --+$(OBJECTS:.obj =.obj -+) -! - -.$(SRCSUFF).obj: - bcc $(CPPFLAGS) -c {$< } - -.c.obj: - bcc $(CPPFLAGS) -P- -c {$< } - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.rws - -erase $(LIBTARGET) - - diff --git a/src/makeprog.bcc b/src/makeprog.bcc deleted file mode 100644 index baa44c3349..0000000000 --- a/src/makeprog.bcc +++ /dev/null @@ -1,35 +0,0 @@ -# makeprog.bcc -# Incude file for samples - -!include $(WXDIR)\src\makebcc.env - -WXLIB = $(WXDIR)\lib\wx.lib -LIBS=$(WXLIB) $(EXTRALIBS) mathwl cwl import ole2w16 winpng zlib - -all: $(TARGET).exe $(EXTRATARGETS) - -$(TARGET).exe: $(WXLIB) $(OBJECTS) $(TARGET).def $(TARGET).res - tlink $(LINKFLAGS) @&&! -c0wl.obj $(OBJECTS) -$(TARGET) -nul -$(LIBS) -$(TARGET).def -! - brc -K $(TARGET).res - -.$(SRCSUFF).obj: - bcc $(CPPFLAGS) -c {$< } - -.c.obj: - bcc $(CPPFLAGS) -P- -c {$< } - -$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc - brc -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(TARGET) - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.rws