@@ -14,7 +14,12 @@ cat >config.h <<END

 END

 # Change if your VS 2015 path differs.

-VS_PATH='C:\Program Files\Microsoft Visual Studio 14.0\VC'

+if [ $(uname -m) == 'x86_64' ]; then

+	VS_PATH='C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC'

+else

+	VS_PATH='C:\Program Files\Microsoft Visual Studio 14.0\VC'

+fi

+

 # Do not change anything below unless you know what you're doing.

 LIBMS_PATH=`pwd`

@@ -36,28 +41,37 @@ compile_for () {

     cp mspack/mspack.lib "C:\\clamdeps\\win$2\\mspack\\lib"

 }

-copy_lib () {

+copy_headers () {

     echo 'Copying headers and source files ...'

     cd ${LIBMS_PATH}

-    cp *.c "C:\\clamdeps\\win$1\\mspack\\include"

     cp *.h "C:\\clamdeps\\win$1\\mspack\\include"

 }

-if [[ -d 'C:\clamdeps\win32\mspack\include' && -d 'C:\clamdeps\win32\mspack\lib' && -d 'C:\clamdeps\win64\mspack\include' && -d 'C:\clamdeps\win64\mspack\lib' ]]; then

+if ! [ -d 'C:\clamdeps\win32\mspack\include' ]; then

+	mkdir -p 'C:\clamdeps\win32\mspack\include'

+fi

-    copy_lib 32

-    copy_lib 64

+if ! [ -d 'C:\clamdeps\win32\mspack\lib' ]; then

+	mkdir -p 'C:\clamdeps\win32\mspack\lib'

+fi

-    if [ $(uname -m) == 'x86_64' ]; then

-        compile_for 'amd64_x86' 32

-        compile_for 'amd64' 64

-    else

-        compile_for 'x86' 32

-        compile_for 'x86_amd64' 64

+if ! [ -d 'C:\clamdeps\win64\mspack\include' ]; then

+	mkdir -p 'C:\clamdeps\win64\mspack\include'

+fi

-    fi

-else

-    echo 'ERROR: mspack include and/or lib clamdep dirs not found'

+if ! [ -d 'C:\clamdeps\win64\mspack\lib' ]; then

+	mkdir -p 'C:\clamdeps\win64\mspack\lib'

 fi

+copy_headers 32

+copy_headers 64

+

+if [ $(uname -m) == 'x86_64' ]; then

+    compile_for 'amd64_x86' 32

+    compile_for 'amd64' 64

+else

+    compile_for 'x86' 32

+    compile_for 'x86_amd64' 64

+

+fi

@@ -908,18 +908,18 @@ int pdf_extract_obj(struct pdf_struct *pdf, struct pdf_obj *obj, uint32_t flags)

                     if (length < 0)

                         length = 0;

-                    cli_dbgmsg("cli_pdf: calculated length %jd\n", (intmax_t)length);

+                    cli_dbgmsg("cli_pdf: calculated length %jd\n", length);

                 } else {

                     if (size > (size_t)length+2) {

                         cli_dbgmsg("cli_pdf: calculated length %jd < %jd\n",

-                                   (intmax_t)length, (intmax_t)size);

+                                   length, size);

                         length = size;

                     }

                 }

                 if (orig_length && size > (size_t)orig_length + 20) {

                     cli_dbgmsg("cli_pdf: orig length: %jd, length: %jd, size: %jd\n",

-                               (intmax_t)orig_length, (intmax_t)length, (intmax_t)size);

+                               orig_length, length, size);

                     pdfobj_flag(pdf, obj, BAD_STREAMLEN);

                 }

@@ -1055,7 +1055,7 @@ int pdf_extract_obj(struct pdf_struct *pdf, struct pdf_obj *obj, uint32_t flags)

         }

     } while (0);

-    cli_dbgmsg("cli_pdf: extracted %jd bytes %u %u obj\n", (intmax_t)sum, obj->id>>8, obj->id&0xff);

+    cli_dbgmsg("cli_pdf: extracted %jd bytes %u %u obj\n", sum, obj->id>>8, obj->id&0xff);

     cli_dbgmsg("         ... to %s\n", fullname);

     if (flags & PDF_EXTRACT_OBJ_SCAN && sum) {

@@ -2320,7 +2320,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)

     if (pdfver != start || offset) {

         pdf.flags |= 1 << BAD_PDF_HEADERPOS;

-        cli_dbgmsg("cli_pdf: PDF header is not at position 0: %jd\n",(intmax_t)(pdfver-start+offset));

+        cli_dbgmsg("cli_pdf: PDF header is not at position 0: %jd\n",(pdfver-start+offset));

 #if HAVE_JSON

         if (pdfobj)

             cli_jsonbool(pdfobj, "BadVersionLocation", 1);

@@ -2429,7 +2429,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)

     while ((rc = pdf_findobj(&pdf)) > 0) {

         struct pdf_obj *obj = &pdf.objs[pdf.nobjs-1];

-        cli_dbgmsg("cli_pdf: found %d %d obj @%jd\n", obj->id >> 8, obj->id&0xff, (intmax_t)(obj->start + offset));

+        cli_dbgmsg("cli_pdf: found %d %d obj @%jd\n", obj->id >> 8, obj->id&0xff, (obj->start + offset));

     }

     if (pdf.nobjs)