mirror of
https://github.com/webmproject/libwebp.git
synced 2024-11-19 20:08:28 +01:00
Makefile.vc: rule maintenance
Remove the bulk of xcopys from the TARGET rule as things are built to the correct location. Allow the clean rule to be appended and only delete DLLINC for dll builds to avoid prompting by erase when it's undefined. Change-Id: If88b2c68090099777b8be9f3a5fbde2c25ed66a6
This commit is contained in:
parent
fc7815d692
commit
565a2cab22
12
Makefile.vc
12
Makefile.vc
@ -182,18 +182,13 @@ experimental:
|
||||
|
||||
$(DIRLIB)\$(TARGET): $(X_OBJS)
|
||||
$(LNK) $(LFLAGS) $(X_OBJS)
|
||||
-xcopy $(DIROBJ)\$(LIB_NAME).dll $(DIRBIN) /y
|
||||
-xcopy $(DIROBJ)\$(LIB_NAME).lib $(DIRLIB) /y
|
||||
-xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).dll $(DIRBIN) /y
|
||||
-xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).lib $(DIRLIB) /y
|
||||
-xcopy $(DIROBJ)\$(IMPLIB_NAME).lib $(DIRLIB) /y
|
||||
-xcopy $(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib $(DIRLIB) /y
|
||||
-xcopy $(DIROBJ)\*.exp $(DIRLIB) /y
|
||||
-xcopy $(DIROBJ)\*.pdb $(DIRLIB) /y
|
||||
|
||||
$(X_OBJS): $(DIROBJ)\enc $(DIROBJ)\dec $(DIRLIB) $(DIRINC) $(DIRBIN)
|
||||
!IF "$(DLLBUILD)" == "TRUE"
|
||||
$(X_OBJS): $(DIROBJ)\$(DLLINC)
|
||||
clean::
|
||||
@-erase /s $(DIROBJ)\$(DLLINC) 2> NUL
|
||||
!ENDIF
|
||||
|
||||
$(EXAMPLES_OBJS): $(DIROBJ)\examples $(DIRLIB)\$(TARGET)
|
||||
@ -236,7 +231,7 @@ $(DIROBJ)\$(DLLINC):
|
||||
$(MT) -manifest $@.manifest -outputresource:$@;1
|
||||
del $@.manifest
|
||||
|
||||
clean:
|
||||
clean::
|
||||
@-erase /s $(DIROBJ)\*.dll 2> NUL
|
||||
@-erase /s $(DIROBJ)\*.exp 2> NUL
|
||||
@-erase /s $(DIROBJ)\*.idb 2> NUL
|
||||
@ -245,6 +240,5 @@ clean:
|
||||
@-erase /s $(DIROBJ)\*.pch 2> NUL
|
||||
@-erase /s $(DIROBJ)\*.pdb 2> NUL
|
||||
@-erase /s $(DIROBJ)\*.res 2> NUL
|
||||
@-erase /s $(DIROBJ)\$(DLLINC) 2> NUL
|
||||
|
||||
!ENDIF # End of case where a config was provided.
|
||||
|
Loading…
Reference in New Issue
Block a user