!include ..\makewat.env
-LIBTARGET = $(WXDIR)\lib\$(LIBNAME).lib
+LIBTARGET = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBUGSUFFIX)_w.lib
EXTRATARGETS = zlib regex
EXTRATARGETSCLEAN = clean_zlib clean_regex
OLEDIR=$(MSWDIR)\ole
COMMONOBJS = &
- #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)", " &\n\t\$(OUTPUTDIR)")
+ #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
MSWOBJS = &
- #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)", " &\n\t\$(OUTPUTDIR)")
+ #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
OBJECTS = $(COMMONOBJS) $(MSWOBJS)
$(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
clean: .SYMBOLIC $(EXTRATARGETSCLEAN)
- -erase *.obj
+ -erase $(OUTPUTDIR)\*.obj
-erase $(LIBTARGET)
- -erase *.pch
- -erase *.err
- -erase *.lbc
+ -erase $(OUTPUTDIR)\*.pch
+ -erase $(OUTPUTDIR)\*.err
+ -erase $(OUTPUTDIR)\*.lbc
cleanall: clean
-erase $(LBCFILE)
$_ = $project{"WXMSWOBJS"};
my @objs = split;
foreach (@objs) {
- $text .= "\$(OUTPUTDIR)" . $_ . ': $(';
+ $text .= "\$(OUTPUTDIR)\\" . $_ . ': $(';
s/\.obj$//;
$text .= 'MSWDIR)\\';
$_ = $project{"WXCOMMONOBJS"};
my @objs = split;
foreach (@objs) {
- $text .= "\$(OUTPUTDIR)" . $_;
+ $text .= "\$(OUTPUTDIR)\\" . $_;
s/\.obj$//;
$text .= ': $(COMMDIR)\\';
my $suffix, $cc;
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