projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added "set new icon" menu item to taskbar sample; updated some makefiles
[wxWidgets.git]
/
distrib
/
msw
/
tmake
/
bcc.t
diff --git
a/distrib/msw/tmake/bcc.t
b/distrib/msw/tmake/bcc.t
index 3a3659ff2022933e6e2821c2809f75188e5dfbdf..e4683f6ecad254e39753a3a39d2cffe35334e09f 100644
(file)
--- 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
#! 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$
#! 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 = "";
#! 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 . " "
$file =~ s/cp?p?$/obj/;
$project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
@@
-36,14
+44,17
@@
}
#! special hack for Borland in 16 bits needs this file
}
#! 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/;
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/;
$file =~ s/cp?p?$/obj/;
- $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+ $obj = "\$(MSWDIR)\\" . $file . " ";
+ $project{"WXMSWOBJS"} .= $obj;
+ $project{"WXCOBJS"} .= $obj if $isCFile;
}
#$}
}
#$}
@@
-87,18
+98,18
@@
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
# 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
+USE_XPM_IN_MSW=
1
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_CLEAN_TARGET=
!if "$(USE_CTL3D)" == "1"
PERIPH_LIBS=
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"
!endif
!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\
lib\
xpm.lib $(PERIPH_LIBS)
PERIPH_TARGET=xpm $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
!endif
PERIPH_TARGET=xpm $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
!endif
@@
-136,8
+147,11
@@
wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
erase $(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
!
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
@@
-162,7
+176,8
@@
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
- s/obj/\$(SRCSUFF)/;
+ $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+ s/obj$/$suffix/;
$text .= $_ . "\n\n";
}
#$}
$text .= $_ . "\n\n";
}
#$}
@@
-177,7
+192,7
@@
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
$text .= $_ . ": ";
$suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/MSWDIR/COMMDIR/;
$text .= $_ . ": ";
$suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/MSWDIR/COMMDIR/;
- s/obj/$suffix/;
+ s/obj
$
/$suffix/;
$text .= $_ . "\n\n";
}
#$}
$text .= $_ . "\n\n";
}
#$}
@@
-192,7
+207,7
@@
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/GENDIR/;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/GENDIR/;
- s/obj/\$(SRCSUFF)/;
+ s/obj
$
/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
$text .= $_ . "\n\n";
}
#$}
@@
-212,26
+227,17
@@
all_execs:
make -f makefile.bcc all_execs
cd $(WXDIR)\src\msw
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
# CONTRIB
-ctl3d: $(CFG)
- cd $(WXDIR)\src\msw\ctl3d\borland
- make -f makefile.bcc -DCFG=$(CFG)
- cd $(WXDIR)\src\msw
-
-wxxpm: $(CFG)
+xpm: $(CFG)
cd $(WXDIR)\src\xpm
make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
cd $(WXDIR)\src\msw
cd $(WXDIR)\src\xpm
make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
cd $(WXDIR)\src\msw
+clean_xpm: $(CFG)
+ cd $(WXDIR)\src\xpm
+ make -f makefile.bcc clean
+ cd $(WXDIR)\src\msw
+
png: $(CFG)
cd $(WXDIR)\src\png
make -f makefile.bcc
png: $(CFG)
cd $(WXDIR)\src\png
make -f makefile.bcc
@@
-269,7
+275,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__
@@
-302,7
+308,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