small fixes

diff --git a/installer/Makefile b/installer/Makefile
index d76f915..35a0008 100644 (file)
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -4,7 +4,7 @@ WINDRES=/opt/xmingw/bin/i386-mingw32msvc-windres
 
 LICENSE=gpl.c
 
-all: files1.exe files2.exe uninstall.exe mkarchive
+all: files1.exe uninstall.exe mkarchive
 
 LIBS=-lgdi32 -lshlwapi -lcomctl32 -lshell32 -lole32 -luuid
 
@@ -14,11 +14,11 @@ files1.c: ../win32/*.exe mkarchive uninstall.exe
        cd ../win32;../installer/mkarchive `find`
        mv ../win32/crnfiles.c ./files1.c
 
-files2.c: ../win32_gui/*.exe ../win32_gui/*.swf mkarchive uninstall.exe
-       cp uninstall.exe ../win32_gui/
-       CWD=`pwd`
-       cd ../win32_gui;../installer/mkarchive `find`
-       mv ../win32_gui/crnfiles.c ./files2.c
+#files2.c: ../win32_gui/*.exe ../win32_gui/*.swf mkarchive uninstall.exe
+#      cp uninstall.exe ../win32_gui/
+#      CWD=`pwd`
+#      cd ../win32_gui;../installer/mkarchive `find`
+#      mv ../win32_gui/crnfiles.c ./files2.c
 
 %.o: %.c
        $(CC) -c $<
@@ -27,7 +27,7 @@ mkarchive: mkarchive.c
        gcc mkarchive.c -o mkarchive -lz
 
 crnfiles1.o: crnfiles1.c
-crnfiles2.o: crnfiles2.c
+#crnfiles2.o: crnfiles2.c
 
 #depack.o: depack.c depack.h Makefile
 #      $(CC) -c depack.c -o depack.o

diff --git a/installer/installer.c b/installer/installer.c
index 85f91be..58c7765 100644 (file)
--- a/installer/installer.c
+++ b/installer/installer.c
@@ -44,6 +44,7 @@ static char path_programfiles[MAX_PATH] = "\0";
 static char pathBuf[MAX_PATH];
 static int do_abort = 0;
 
+static char* pdf2swf_dir;
 static char* pdf2swf_path;
 
 static char registry_path[1024];
@@ -557,7 +558,8 @@ static HRESULT (WINAPI *f_SHGetSpecialFolderPath)(HWND hwnd, LPTSTR lpszPath, in
 
 BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
     if(message == WM_INITDIALOG) {
-       pdf2swf_path = concatPaths(install_path, "pdf2swf_gui.exe");
+       pdf2swf_dir = concatPaths(install_path, "gpdf2swf");
+       pdf2swf_path = concatPaths(pdf2swf_dir, "gpdf2swf.exe");
        FILE*fi = fopen(pdf2swf_path, "rb");
        if(fi) {
            printf("a GUI program exists, creating desktop/startmenu links\n");
@@ -623,7 +625,7 @@ BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM
            if(config_createDesktop && path_desktop[0]) {
                char* linkName = concatPaths(path_desktop, "pdf2swf.lnk");
                 printf("Creating desktop link %s -> %s\n", linkName, pdf2swf_path);
-               if(!CreateShortcut(pdf2swf_path, "pdf2swf", linkName, 0, 0, 0, install_path)) {
+               if(!CreateShortcut(pdf2swf_path, "pdf2swf", linkName, 0, 0, 0, pdf2swf_dir)) {
                    MessageBox(0, "Couldn't create desktop shortcut", INSTALLER_NAME, MB_OK);
                    return 1;
                }
@@ -633,7 +635,7 @@ BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM
                CreateDirectory(group, 0);
                 addDir(group);
                char* linkName = concatPaths(group, "pdf2swf.lnk");
-               if(!CreateShortcut(pdf2swf_path, "pdf2swf", concatPaths(group, "pdf2swf.lnk"), 0, 0, 0, install_path) ||
+               if(!CreateShortcut(pdf2swf_path, "pdf2swf", concatPaths(group, "pdf2swf.lnk"), 0, 0, 0, pdf2swf_dir) ||
                   !CreateShortcut(uninstall_path, "uninstall", concatPaths(group, "uninstall.lnk"), 0, 0, 0, install_path)) {
                    MessageBox(0, "Couldn't create start menu entry", INSTALLER_NAME, MB_OK);
                    return 1;

diff --git a/lib/MD5.c b/lib/MD5.c
index f8dc3fe..42bd0a9 100644 (file)
--- a/lib/MD5.c
+++ b/lib/MD5.c
@@ -176,7 +176,7 @@ void hash_md5(const unsigned char*buf, int len, unsigned char*dest)
     MD5Final(dest, &ctx);
 }
 
-void* inititialize_md5()
+void* initialize_md5()
 {
     MD5_CTX* ctx = malloc(sizeof(MD5_CTX));
     memset(ctx, 0, sizeof(MD5_CTX));

diff --git a/release.in b/release.in
index ca3f18d..c75256b 100644 (file)
--- a/release.in
+++ b/release.in
@@ -8,12 +8,21 @@ ln -s ./ ${name}
 cd lib/action;make generated >/dev/null 2>&1;cd ../..
 
 SOURCES="${name}/src/swfcombine.1 \
-${name}/src/swfstrings.1 ${name}/src/swfdump.1 ${name}/src/swfextract.1 \
-${name}/src/jpeg2swf.1 ${name}/src/png2swf.1 ${name}/src/pdf2swf.1 \
-${name}/src/gif2swf.1 ${name}/src/wav2swf.1 ${name}/src/swfc.1 \
-${name}/src/swfbbox.1 ${name}/src/font2swf.1 ${name}/src/swfrender.1 \
+${name}/src/swfstrings.1 \
+${name}/src/swfdump.1 \
+${name}/src/swfextract.1 \
+${name}/src/jpeg2swf.1 \
+${name}/src/png2swf.1 \
+${name}/src/pdf2swf.1 \
+${name}/src/gif2swf.1 \
+${name}/src/wav2swf.1 \
+${name}/src/swfc.1 \
+${name}/src/swfbbox.1 \
+${name}/src/font2swf.1 \
+${name}/src/swfrender.1 \
 ${name}/src/as3compile.1 \
 ${name}/src/swfbytes.1 \
+${name}/src/pdf2pdf.1 \
 ${name}/src/swfcombine.c \
 ${name}/src/swfstrings.c \
 ${name}/src/swfdump.c \
@@ -25,6 +34,7 @@ ${name}/src/png2swf.c \
 ${name}/src/gif2swf.c \
 ${name}/src/wav2swf.c \
 ${name}/src/pdf2swf.c \
+${name}/src/pdf2pdf.c \
 ${name}/src/swfc.c \
 ${name}/src/swfc-feedback.c \
 ${name}/src/swfc-history.c \
@@ -216,6 +226,8 @@ ${name}/lib/devices/render.c \
 ${name}/lib/devices/render.h \
 ${name}/lib/devices/text.c \
 ${name}/lib/devices/text.h \
+${name}/lib/devices/pdf.c \
+${name}/lib/devices/pdf.h \
 ${name}/lib/devices/polyops.c \
 ${name}/lib/devices/polyops.h \
 ${name}/lib/devices/record.c \
@@ -409,9 +421,10 @@ ${name}/lib/python/tagmap.c \
 ${name}/lib/python/tagmap.h \
 ${name}/setup.py"
 
-WXPDF2SWF=" \
-${name}/wx/pdf2swf.py \
-${name}/wx/images.py"
+WXPDF2SWF="" #TODO
+#WXPDF2SWF=" \
+#${name}/wx/pdf2swf.py \
+#${name}/wx/images.py"
 
 CONFIGURE="${name}/configure.in \
 ${name}/configure \
@@ -433,8 +446,7 @@ ${name}/missing \
 ${name}/ltmain.sh"
 
 DOC="${name}/doc/fileformat.sc \
-${name}/ChangeLog \
-${name}/FAQ"
+${name}/ChangeLog"
 
 tar -chf ${name}.tar \
 ${SOURCES} ${AVI2SWF} ${MAKEFILES} ${DOC} ${LIB} ${PYTHON} ${WXPDF2SWF} ${CONFIGURE} \