From 5051245f3a9c0ddf613167017bfebbf655d6c7ca Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 5 Apr 2013 19:21:01 -0700 Subject: [PATCH] Makefile.vc: have 'all' target build everything default is still the core examples as makefile.unix Change-Id: Ica3fe6123f4359aefa130b39d2b0739b65e34c0b (cherry picked from commit 69d0f92658ae20017bf23240eaa06523a5f189bb) --- Makefile.vc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.vc b/Makefile.vc index f1fd9f7e..114d073b 100644 --- a/Makefile.vc +++ b/Makefile.vc @@ -130,7 +130,8 @@ CFGSET = TRUE !MESSAGE - clean - perform a clean for CFG !MESSAGE - experimental - build CFG with experimental !MESSAGE . features enabled. -!MESSAGE - (empty) or all - build all targets for CFG +!MESSAGE - (empty) - build libwebp-based targets for CFG +!MESSAGE - all - build (de)mux-based targets for CFG !MESSAGE !MESSAGE RTLIBCFG controls the runtime library linkage - 'static' or 'dynamic'. !MESSAGE OBJDIR is the path where you like to build (obj, bins, etc.), @@ -238,8 +239,10 @@ LIBWEBPDEMUX_OBJS = $(DEMUX_OBJS) $(LIBWEBPDEMUX_OBJS) OUT_LIBS = $(LIBWEBPDECODER) $(LIBWEBP) OUT_EXAMPLES = $(DIRBIN)\cwebp.exe $(DIRBIN)\dwebp.exe +EXTRA_EXAMPLES = $(DIRBIN)\vwebp.exe $(DIRBIN)\webpmux.exe -all: $(OUT_LIBS) $(OUT_EXAMPLES) +ex: $(OUT_LIBS) $(OUT_EXAMPLES) +all: ex $(EXTRA_EXAMPLES) $(DIRBIN)\cwebp.exe: $(DIROBJ)\examples\cwebp.obj $(EX_FORMAT_DEC_OBJS) $(DIRBIN)\dwebp.exe: $(DIROBJ)\examples\dwebp.obj $(DIRBIN)\vwebp.exe: $(DIROBJ)\examples\vwebp.obj @@ -247,6 +250,7 @@ $(DIRBIN)\vwebp.exe: $(EX_UTIL_OBJS) $(LIBWEBPDEMUX) $(LIBWEBP) $(DIRBIN)\webpmux.exe: $(DIROBJ)\examples\webpmux.obj $(LIBWEBPMUX) $(DIRBIN)\webpmux.exe: $(EX_UTIL_OBJS) $(LIBWEBP) $(OUT_EXAMPLES): $(EX_UTIL_OBJS) $(LIBWEBP) +$(EX_UTIL_OBJS) $(EX_FORMAT_DEC_OBJS): $(OUTPUT_DIRS) experimental: $(MAKE) /f Makefile.vc \