X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9d61c23a836b4e4f76d117d18d6b9848b915c39..a0378c28b877a68d8ef9991ce4b1433b2560d928:/distrib/msw/tmake/b32.t diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index 71cb6946ec..f6aa42cb3f 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -38,10 +38,16 @@ next; } - my $isOle = $wxMSW{$file} =~ /\bO\b/; + my $isOleObj = $wxMSW{$file} =~ /\bO\b/; $file =~ s/cp?p?$/obj/; - $project{"WXMSWOBJS"} .= ($isOle ? "\$(OLEDIR)\\" : "\$(MSWDIR)\\") - . $file . " " + my $obj = "\$(MSWDIR)\\" . $file . " "; + + $project{"WXMSWOBJS"} .= $obj; + if ( $isOleObj ) { + #! remember that this file is in ole subdir + $project{"WXOLEOBJS"} .= $obj; + } + } #$} @@ -152,7 +158,7 @@ all: all_libs all_execs $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) - tlib $(LIBTARGET) /P512 @&&! + tlib $(LIBTARGET) /P1024 @&&! +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) ! @@ -194,6 +200,7 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c my @objs = split; foreach (@objs) { $text .= $_ . ": "; + if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; } s/obj$/\$(SRCSUFF)/; $text .= $_ . "\n\n"; }