Merge "Makefile.vc: add experimental target"

This commit is contained in:
James Zern 2011-06-17 18:34:29 -07:00 committed by Code Review
commit 0e1d1fdfe0

View File

@ -92,6 +92,8 @@ CFGSET = TRUE
!MESSAGE - debug-static - debug static library !MESSAGE - debug-static - debug static library
!MESSAGE <target> may be: !MESSAGE <target> may be:
!MESSAGE - clean - perform a clean for CFG !MESSAGE - clean - perform a clean for CFG
!MESSAGE - experimental - build CFG with experimental
!MESSAGE . features enabled. Requires zlib.
!MESSAGE !MESSAGE
!MESSAGE <rtlibcfg> controls the runtime library linkage - can be 'static' or 'dynamic'. !MESSAGE <rtlibcfg> controls the runtime library linkage - can be 'static' or 'dynamic'.
!MESSAGE <target> can be left blank in which case all is assumed !MESSAGE <target> can be left blank in which case all is assumed
@ -148,6 +150,15 @@ EXAMPLES_OBJS = \
all: $(DIRLIB)\$(TARGET) $(DIRBIN)\dwebp.exe $(DIRBIN)\cwebp.exe all: $(DIRLIB)\$(TARGET) $(DIRBIN)\dwebp.exe $(DIRBIN)\cwebp.exe
# Additional include and library paths (for zlib) can be passed via the CL and
# LINK environment variables respectively:
# > set CL=/I\zlib\include
# > set LINK=\zlib\zlib.lib
# > nmake /f Makefile.vc CFG=release-static experimental
experimental:
$(MAKE) /f Makefile.vc \
CFG=$(CFG) CFLAGS="$(CFLAGS) /DWEBP_EXPERIMENTAL_FEATURES" /$(MAKEFLAGS)
$(DIRLIB)\$(TARGET): $(X_OBJS) $(DIRLIB)\$(TARGET): $(X_OBJS)
$(LNK) $(LFLAGS) $(X_OBJS) $(LNK) $(LFLAGS) $(X_OBJS)
-xcopy $(DIROBJ)\$(LIB_NAME).dll $(DIRBIN) /y -xcopy $(DIROBJ)\$(LIB_NAME).dll $(DIRBIN) /y