X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b73db3c34aefd98080b425459322fa821ae271f..5f605ccf3fcce969d9a634bf1cf6aa4f13f74d2e:/distrib/msw/tmake/bcc.t?ds=sidebyside

diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t
index 97b91352a0..d9ccb8f43e 100644
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -2,6 +2,11 @@
 #! 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$
@@ -15,7 +20,10 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         my $tag = "";
-        next if $wxGeneric{$file} =~ /\b(PS|G|U)\b/;
+        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 . " "
@@ -23,7 +31,7 @@
 
     foreach $file (sort keys %wxCommon) {
         #! socket files don't compile under Win16 currently
-        next if $wxCommon{$file} =~ /\b(32|S)\b/;
+        next if $wxCommon{$file} =~ /\b(32|S|U)\b/;
 
         #! needs extra files (sql*.h) so not compiled by default.
         next if $file =~ /^odbc\./;
@@ -36,18 +44,21 @@
     }
 
     #! special hack for Borland in 16 bits needs this file
-    $project{"WXCOMMONOBJS"} .= '${MSWDIR}\resourc2.cpp';
+    $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/;
-        $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXMSWOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 #$}
 
-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -87,20 +98,13 @@ 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
-USE_XPM_IN_MSW=0
 
 PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
 !if "$(USE_CTL3D)" == "1"
-PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
-!endif
-
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !endif
 
 # TODO: add these libraries
@@ -136,8 +140,11 @@ 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 +)
+	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
@@ -162,7 +169,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        s/obj/\$(SRCSUFF)/;
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -177,7 +185,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/MSWDIR/COMMDIR/;
-        s/obj/$suffix/;
+        s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -192,7 +200,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     foreach (@objs) {
         $text .= $_ . ": ";
         s/MSWDIR/GENDIR/;
-        s/obj/\$(SRCSUFF)/;
+        s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -212,29 +220,10 @@ all_execs:
     make -f makefile.bcc all_execs
     cd $(WXDIR)\src\msw
 
-all_libs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d 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
-
 # 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)
-	cd $(WXDIR)\src\msw
-
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.bcc 
+        make -f makefile.bcc
         cd $(WXDIR)\src\msw
 
 clean_png:
@@ -269,7 +258,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
 -I$(WXDIR)\include\wx\msw\gnuwin32
 -L$(BCCDIR)\lib
 -D__WXWIN__
@@ -301,3 +290,11 @@ clean: $(PERIPH_CLEAN_TARGET)
 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