diff options
| -rw-r--r-- | apps/Jamfile | 15 | ||||
| -rw-r--r-- | apps/pdfapp.c (renamed from apps/common/pdfapp.c) | 0 | ||||
| -rw-r--r-- | apps/pdftool.c (renamed from apps/common/pdftool.c) | 0 | ||||
| -rw-r--r-- | apps/win_icon_app.ico (renamed from apps/windows/gsapp.ico) | bin | 25214 -> 25214 bytes | |||
| -rw-r--r-- | apps/win_icon_doc.ico (renamed from apps/windows/gsdoc.ico) | bin | 2238 -> 2238 bytes | |||
| -rw-r--r-- | apps/win_main.c (renamed from apps/windows/winmain.c) | 0 | ||||
| -rw-r--r-- | apps/win_res.rc (renamed from apps/windows/winres.rc) | 4 | ||||
| -rw-r--r-- | apps/x11_icon.xbm (renamed from apps/unix/gs_l.xbm) | 0 | ||||
| -rw-r--r-- | apps/x11_image.c (renamed from apps/unix/ximage.c) | 0 | ||||
| -rw-r--r-- | apps/x11_main.c (renamed from apps/unix/x11pdf.c) | 2 |
10 files changed, 8 insertions, 13 deletions
diff --git a/apps/Jamfile b/apps/Jamfile index c0c364d1..08d8bad5 100644 --- a/apps/Jamfile +++ b/apps/Jamfile @@ -4,6 +4,9 @@ FITZLIBS = libmupdf libfitz libfitzdraw libfonts libcmaps ; SubDir TOP apps ; +Library libpdfapp : pdfapp.c ; +Library libpdftool : pdftool.c ; + Main pdfshow : pdfshow.c ; LinkLibraries pdfshow : libpdftool $(FITZLIBS) ; @@ -19,24 +22,16 @@ LinkLibraries pdfinfo : libpdftool $(FITZLIBS) ; Main pdfextract : pdfextract.c ; LinkLibraries pdfextract : libpdftool $(FITZLIBS) ; -SubDir TOP apps common ; -Library libpdfapp : pdfapp.c ; - -SubDir TOP apps common ; -Library libpdftool : pdftool.c ; - if $(BUILD_WINAPP) { - SubDir TOP apps windows ; - Main mupdf : winmain.c winres.rc ; + Main mupdf : win_main.c win_res.rc ; LinkLibraries mupdf : libpdfapp $(FITZLIBS) ; LINKLIBS on mupdf$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ; } if $(BUILD_X11APP) { - SubDir TOP apps unix ; - Main mupdf : x11pdf.c ximage.c ; + Main mupdf : x11_main.c x11_image.c ; LinkLibraries mupdf : libpdfapp $(FITZLIBS) ; LINKLIBS on mupdf$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ; } diff --git a/apps/common/pdfapp.c b/apps/pdfapp.c index 137825ec..137825ec 100644 --- a/apps/common/pdfapp.c +++ b/apps/pdfapp.c diff --git a/apps/common/pdftool.c b/apps/pdftool.c index 97a95043..97a95043 100644 --- a/apps/common/pdftool.c +++ b/apps/pdftool.c diff --git a/apps/windows/gsapp.ico b/apps/win_icon_app.ico Binary files differindex d8b41fe2..d8b41fe2 100644 --- a/apps/windows/gsapp.ico +++ b/apps/win_icon_app.ico diff --git a/apps/windows/gsdoc.ico b/apps/win_icon_doc.ico Binary files differindex ecf22c4b..ecf22c4b 100644 --- a/apps/windows/gsdoc.ico +++ b/apps/win_icon_doc.ico diff --git a/apps/windows/winmain.c b/apps/win_main.c index a0d4e00e..a0d4e00e 100644 --- a/apps/windows/winmain.c +++ b/apps/win_main.c diff --git a/apps/windows/winres.rc b/apps/win_res.rc index cf094610..a77efb3c 100644 --- a/apps/windows/winres.rc +++ b/apps/win_res.rc @@ -1,5 +1,5 @@ -IDI_ICONAPP ICON "gsapp.ico" -IDI_ICONDOC ICON "gsdoc.ico" +IDI_ICONAPP ICON "win_icon_app.ico" +IDI_ICONDOC ICON "win_icon_doc.ico" IDD_DLOGPASS DIALOG 50, 50, 204, 60 //STYLE DS_MODALFRAME | WS_POPUP diff --git a/apps/unix/gs_l.xbm b/apps/x11_icon.xbm index 85014e43..85014e43 100644 --- a/apps/unix/gs_l.xbm +++ b/apps/x11_icon.xbm diff --git a/apps/unix/ximage.c b/apps/x11_image.c index 90116026..90116026 100644 --- a/apps/unix/ximage.c +++ b/apps/x11_image.c diff --git a/apps/unix/x11pdf.c b/apps/x11_main.c index fc069e26..1083dea9 100644 --- a/apps/unix/x11pdf.c +++ b/apps/x11_main.c @@ -2,7 +2,7 @@ #include "mupdf.h" #include "pdfapp.h" -#include "gs_l.xbm" +#include "x11_icon.xbm" #include <X11/Xlib.h> #include <X11/Xutil.h> |