X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=10735fdd03371c04583545767bd52580956c56b8;hb=9abb073e374a6ed00605e4e77d5aa6e6184520a7;hp=6763b7fc76866841717d392bc2c260e191b231bc;hpb=045aa1a089fc49ab5b947d48c3a0d4c8b01452bc;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index 6763b7f..10735fd 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -37,7 +37,7 @@ int systemf(const char* format, ...)
     vsprintf(buf, format, arglist);
     va_end(arglist);
 
-    printf("%s:\n\n", buf);
+    printf("%s:\n", buf);
     fflush(stdout);
     return system(buf);
 }
@@ -251,14 +251,19 @@ int main(int argn, char *argv[])
 
     pdfswf_close();
 
+    if(!viewer && preloader)
+	logf("<warning> --preloader option without --viewer option doesn't make very much sense.");
+    if(viewer || preloader)
+	printf("\n");
+
     if(viewer) {
-	systemf("swfcombine %s viewport=%s -o %s",
-		viewer, outputname, outputname);
+	systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s",
+		outputname, viewer, outputname, outputname);
 	printf("\n");
     }
     if(preloader) {
-	systemf("swfcombine %s/swfs/PreLoaderTemplate.swf loader=%s movie=%s -o %s",
-		DATADIR, preloader, outputname, outputname);
+	systemf("swfcombine `swfdump -r %s` %s/swfs/PreLoaderTemplate.swf loader=%s movie=%s -o %s",
+		preloader, DATADIR, preloader, outputname, outputname);
 	printf("\n");
     }