From: Robin Dunn Date: Thu, 30 Sep 1999 21:28:29 +0000 (+0000) Subject: fixed the rule for the DLL so it doesn't build the .lib file twice X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a9221a950894036f6ae5d79af8fab694a5504eed fixed the rule for the DLL so it doesn't build the .lib file twice git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 77d2f637c9..6f4fa4377d 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -246,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 diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 1daf224332..0168fcb35d 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:03, 1999/09/29 +# This file was automatically generated by tmake at 14:12, 1999/09/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -156,6 +156,7 @@ COMMONOBJS = \ ..\common\$D\hash.obj \ ..\common\$D\helpbase.obj \ ..\common\$D\http.obj \ + ..\common\$D\imagall.obj \ ..\common\$D\imagbmp.obj \ ..\common\$D\image.obj \ ..\common\$D\imaggif.obj \ @@ -411,7 +412,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