X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/876325579b10197de643289ccce5ea31e9e48a3b..4c3f56612eea0998f8619d2c81543eb18765cbcf:/distrib/msw/tmake/dos.t diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t index f3e30fb933..592ab83d3e 100644 --- a/distrib/msw/tmake/dos.t +++ b/distrib/msw/tmake/dos.t @@ -32,7 +32,9 @@ $isCFile = $file =~ /\.c$/; $file =~ s/cp?p?$/obj/; $obj = "\$(COMMDIR)\\" . $file . " "; - $project{"WXCOMMONOBJS"} .= $obj; + #! $project{"WXCOMMONOBJS"} .= $obj; + #! have to split lib in 2 halves because otherwise it's too big + $project{$file =~ "^[a-o]" ? "WXCOMMONOBJS1" : "WXCOMMONOBJS2"} .= $obj; $project{"WXCOBJS"} .= $obj if $isCFile; } @@ -109,9 +111,13 @@ MSWDIR=. GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); -COMMONOBJS = \ +# we can't have all objects in one list because the library becomes too big +COMMONOBJS1 = \ $(COMMDIR)\y_tab.obj \ - #$ ExpandList("WXCOMMONOBJS"); + #$ ExpandList("WXCOMMONOBJS1"); + +COMMONOBJS2 = \ + #$ ExpandList("WXCOMMONOBJS2"); # we can't have all objects in one list because the library becomes too big MSWOBJS1 = #$ ExpandList("WXMSWOBJS1"); @@ -122,46 +128,56 @@ MSWOBJS2 = #$ ExpandList("WXMSWOBJS2"); # $(OLEDIR)\xpmhand \ # $(OLEDIR)\pnghand \ -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2) +OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2) # Normal, static library -all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib +all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib -$(WXDIR)\lib\wx1.lib: $(COMMONOBJS) $(PERIPH_LIBS) +$(WXDIR)\lib\wx1.lib: $(COMMONOBJS1) $(PERIPH_LIBS) -erase $(WXDIR)\lib\wx1.lib lib /PAGESIZE:128 @<< $(WXDIR)\lib\wx1.lib y -$(COMMONOBJS) $(PERIPH_LIBS) +$(COMMONOBJS1) $(PERIPH_LIBS) nul ; << -$(WXDIR)\lib\wx2.lib: $(GENERICOBJS) +$(WXDIR)\lib\wx2.lib: $(COMMONOBJS2) -erase $(WXDIR)\lib\wx2.lib lib /PAGESIZE:128 @<< $(WXDIR)\lib\wx2.lib y -$(GENERICOBJS) +$(COMMONOBJS2) nul ; << -$(WXDIR)\lib\wx3.lib: $(MSWOBJS1) +$(WXDIR)\lib\wx3.lib: $(GENERICOBJS) -erase $(WXDIR)\lib\wx3.lib lib /PAGESIZE:128 @<< $(WXDIR)\lib\wx3.lib y -$(MSWOBJS1) +$(GENERICOBJS) nul ; << -$(WXDIR)\lib\wx4.lib: $(MSWOBJS2) +$(WXDIR)\lib\wx4.lib: $(MSWOBJS1) -erase $(WXDIR)\lib\wx4.lib lib /PAGESIZE:128 @<< $(WXDIR)\lib\wx4.lib y +$(MSWOBJS1) +nul +; +<< + +$(WXDIR)\lib\wx5.lib: $(MSWOBJS2) + -erase $(WXDIR)\lib\wx5.lib + lib /PAGESIZE:128 @<< +$(WXDIR)\lib\wx5.lib +y $(MSWOBJS2) nul ; @@ -184,7 +200,7 @@ $(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF) << #${ - $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS"} . $project{"WXGENERICOBJS"}; + $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS1"} . $project{"WXCOMMONOBJS2"} . $project{"WXGENERICOBJS"}; my @objs = split; foreach (@objs) { if ( $project{"WXCOBJS"} =~ / \Q$_\E / ) {