X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ec2b48446fa4f17187dcd73c3a314e4030333f6..47f631042babbcf0f29722738aa9734eb01a5883:/distrib/msw/tmake/vc.t diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 83b63e6b54..6f4fa4377d 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -112,6 +112,11 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $< $(CPPFLAGS) /Fo$@ /c /Tp $< << +{..\msw}.c{..\msw\$D}.obj: + cl @<< +$(CPPFLAGS2) /Fo$@ /c /Tc $< +<< + {..\msw\ole}.cpp{..\msw\ole\$D}.obj: cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< @@ -156,7 +161,7 @@ HTMLOBJS = \ # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. # Add $(HTMLOBJS) if wanting wxHTML classes -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) +OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) # Normal, static library all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) @@ -241,7 +246,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) << # Update the dynamic link library -$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).lib +$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) -out:$(WXDIR)\lib\$(WXLIBNAME).dll