Makefile.vc: add DLL configs

(release|debug)-dynamic
These configurations will produce a dll in bin/ and an import lib under
lib/.
Currently the -noasm switch in the examples will be disabled for these
builds due to a dependency on VP8EncGetCPUInfo.

Change-Id: I2cbac0064f0e500698d14ffc03200791ca837090
This commit is contained in:
James Zern
2011-07-15 14:53:03 -07:00
parent 998754a734
commit b4d0ef8f58
3 changed files with 52 additions and 12 deletions

View File

@ -53,7 +53,9 @@ DEFINE_GUID(GUID_WICPixelFormat32bppRGBA,
#include "webp/encode.h"
#include "stopwatch.h"
#ifndef WEBP_DLL
extern void* VP8EncGetCPUInfo; // opaque forward declaration.
#endif
//-----------------------------------------------------------------------------
@ -689,7 +691,9 @@ static void HelpLong(void) {
printf(" -short ................. condense printed message\n");
printf(" -quiet ................. don't print anything.\n");
printf(" -version ............... print version number and exit.\n");
#ifndef WEBP_DLL
printf(" -noasm ................. disable all assembly optimizations.\n");
#endif
printf(" -v ..................... verbose, e.g. print encoding/decoding "
"times\n");
printf("\n");
@ -808,8 +812,10 @@ int main(int argc, const char *argv[]) {
} else if (!strcmp(argv[c], "-resize") && c < argc - 2) {
resize_w = strtol(argv[++c], NULL, 0);
resize_h = strtol(argv[++c], NULL, 0);
#ifndef WEBP_DLL
} else if (!strcmp(argv[c], "-noasm")) {
VP8EncGetCPUInfo = NULL;
#endif
} else if (!strcmp(argv[c], "-version")) {
const int version = WebPGetEncoderVersion();
printf("%d.%d.%d\n",

View File

@ -45,7 +45,9 @@ extern "C" {
#endif
static int verbose = 0;
#ifndef WEBP_DLL
extern void* VP8DecGetCPUInfo; // opaque forward declaration.
#endif
//-----------------------------------------------------------------------------
@ -323,7 +325,9 @@ static void Help(void) {
#endif
" -h ....... this help message.\n"
" -v ....... verbose (e.g. print encoding/decoding times)\n"
#ifndef WEBP_DLL
" -noasm ....... disable all assembly optimizations.\n"
#endif
);
}
@ -380,8 +384,10 @@ int main(int argc, const char *argv[]) {
config.options.scaled_height = strtol(argv[++c], NULL, 0);
} else if (!strcmp(argv[c], "-v")) {
verbose = 1;
#ifndef WEBP_DLL
} else if (!strcmp(argv[c], "-noasm")) {
VP8DecGetCPUInfo = NULL;
#endif
} else if (argv[c][0] == '-') {
printf("Unknown option '%s'\n", argv[c]);
Help();