projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxUSE_LOG fixes.
[wxWidgets.git]
/
distrib
/
msw
/
tmake
/
watbase.t
diff --git
a/distrib/msw/tmake/watbase.t
b/distrib/msw/tmake/watbase.t
index 9935d993191fbbe4641f9d6bdeba3b826355728b..9bd90fac90b9e45451e03f5926a74844f3ce9cdb 100644
(file)
--- a/
distrib/msw/tmake/watbase.t
+++ b/
distrib/msw/tmake/watbase.t
@@
-58,7
+58,7
@@
wxUSE_GUI=0
!include ..\makewat.env
!include ..\makewat.env
-LIBTARGET = $(WXDIR)\lib\
$(LIBNAME)
.lib
+LIBTARGET = $(WXDIR)\lib\
wx$(TOOLKIT)$(DEBUGSUFFIX)_w
.lib
EXTRATARGETS = zlib regex
EXTRATARGETSCLEAN = clean_zlib clean_regex
EXTRATARGETS = zlib regex
EXTRATARGETSCLEAN = clean_zlib clean_regex
@@
-67,10
+67,10
@@
MSWDIR=$(WXDIR)\src\msw
OLEDIR=$(MSWDIR)\ole
COMMONOBJS = &
OLEDIR=$(MSWDIR)\ole
COMMONOBJS = &
- #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)
", " &\n\t\$(OUTPUTDIR)
")
+ #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)
\\", " &\n\t\$(OUTPUTDIR)\\
")
MSWOBJS = &
MSWOBJS = &
- #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)
", " &\n\t\$(OUTPUTDIR)
")
+ #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)
\\", " &\n\t\$(OUTPUTDIR)\\
")
OBJECTS = $(COMMONOBJS) $(MSWOBJS)
OBJECTS = $(COMMONOBJS) $(MSWOBJS)
@@
-88,7
+88,7
@@
$(OUTPUTDIR):
$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
copy $(WXDIR)\include\wx\msw\setup.h $@
$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
copy $(WXDIR)\include\wx\msw\setup.h $@
-LBCFILE=$(OUTPUTDIR)wx$(TOOLKIT).lbc
+LBCFILE=$(OUTPUTDIR)
\
wx$(TOOLKIT).lbc
$(LIBTARGET) : $(OBJECTS)
%create $(LBCFILE)
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
$(LIBTARGET) : $(OBJECTS)
%create $(LBCFILE)
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
@@
-96,11
+96,11
@@
$(LIBTARGET) : $(OBJECTS)
clean: .SYMBOLIC $(EXTRATARGETSCLEAN)
clean: .SYMBOLIC $(EXTRATARGETSCLEAN)
- -erase *.obj
+ -erase
$(OUTPUTDIR)\
*.obj
-erase $(LIBTARGET)
-erase $(LIBTARGET)
- -erase *.pch
- -erase *.err
- -erase *.lbc
+ -erase
$(OUTPUTDIR)\
*.pch
+ -erase
$(OUTPUTDIR)\
*.err
+ -erase
$(OUTPUTDIR)\
*.lbc
cleanall: clean
-erase $(LBCFILE)
cleanall: clean
-erase $(LBCFILE)
@@
-109,7
+109,7
@@
cleanall: clean
$_ = $project{"WXMSWOBJS"};
my @objs = split;
foreach (@objs) {
$_ = $project{"WXMSWOBJS"};
my @objs = split;
foreach (@objs) {
- $text .= "\$(OUTPUTDIR)" . $_ . ': $(';
+ $text .= "\$(OUTPUTDIR)
\\
" . $_ . ': $(';
s/\.obj$//;
$text .= 'MSWDIR)\\';
s/\.obj$//;
$text .= 'MSWDIR)\\';
@@
-136,7
+136,7
@@
cleanall: clean
$_ = $project{"WXCOMMONOBJS"};
my @objs = split;
foreach (@objs) {
$_ = $project{"WXCOMMONOBJS"};
my @objs = split;
foreach (@objs) {
- $text .= "\$(OUTPUTDIR)" . $_;
+ $text .= "\$(OUTPUTDIR)
\\
" . $_;
s/\.obj$//;
$text .= ': $(COMMDIR)\\';
my $suffix, $cc;
s/\.obj$//;
$text .= ': $(COMMDIR)\\';
my $suffix, $cc;
@@
-178,5
+178,5
@@
clean_regex: .SYMBOLIC
MFTYPE=watbase
self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
cd $(WXDIR)\distrib\msw\tmake
MFTYPE=watbase
self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
cd $(WXDIR)\distrib\msw\tmake
- tmake -t $(MFTYPE) wxwin.pro -o makebase.wat
+
perl -S
tmake -t $(MFTYPE) wxwin.pro -o makebase.wat
copy makebase.wat $(WXDIR)\src\msw
copy makebase.wat $(WXDIR)\src\msw