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
This commit is contained in:
parent
e0f83017f5
commit
a9221a9508
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user