diff options
| author | Tor Andersson <tor@ghostscript.com> | 2008-09-05 17:13:28 +0200 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2008-09-05 17:13:28 +0200 |
| commit | d861716137c216dee26b69b606d1189949d97f8d (patch) | |
| tree | f94a61ae8cbdba35de800e07eb6d6376fa988d38 /apps | |
| parent | 226884fcd1c15e1320f2c7677b1356a41870f73f (diff) | |
| download | mupdf-d861716137c216dee26b69b606d1189949d97f8d.tar.xz | |
Simplify sysdep stuff to support only c99 and msvc.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Jamfile | 12 | ||||
| -rw-r--r-- | apps/windows/winmain.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/Jamfile b/apps/Jamfile index 9c9af761..e8a9f333 100644 --- a/apps/Jamfile +++ b/apps/Jamfile @@ -9,28 +9,28 @@ LinkLibraries pdftool : $(FITZLIBS) ; SubDir TOP apps common ; Library libpdfapp : pdfapp.c ; -if $(BUILD_WINAPP) = yes +if $(BUILD_WINAPP) { SubDir TOP apps windows ; Main pdfview : winmain.c winres.rc ; LinkLibraries pdfview : libpdfapp $(FITZLIBS) ; - LINKLIBS on pdfview$(SUFEXE) = $(LINKLIBS) $(WINLIBS) ; + LINKLIBS on pdfview$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ; } -if $(BUILD_X11APP) = yes +if $(BUILD_X11APP) { SubDir TOP apps unix ; Main pdfview : x11pdf.c ximage.c ; LinkLibraries pdfview : libpdfapp $(FITZLIBS) ; - LINKLIBS on pdfview$(SUFEXE) = $(LINKLIBS) $(X11LIBS) ; + LINKLIBS on pdfview$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ; } -if $(BUILD_PLUGIN) = yes +if $(BUILD_PLUGIN) { SubDir TOP apps mozilla ; SUFEXE on npmupdf.dll = ; LINKFLAGS on npmupdf.dll = $(LINKFLAGS) -shared -Wl,--kill-at ; - LINKLIBS on npmupdf.dll = $(LINKLIBS) -lgdi32 ; + LINKLIBS on npmupdf.dll = $(LINKLIBS) $(APPLINKLIBS) ; Main npmupdf.dll : npwin.c moz_winres.rc moz_main.c ; LinkLibraries npmupdf.dll : $(FITZLIBS) ; } diff --git a/apps/windows/winmain.c b/apps/windows/winmain.c index b5fd2a67..cc7f3bdb 100644 --- a/apps/windows/winmain.c +++ b/apps/windows/winmain.c @@ -787,7 +787,7 @@ int main(int argc, char **argv) winopen(); if (argc == 2) - filename = strdup(argv[1]); + filename = fz_strdup(argv[1]); else { if (!winfilename(buf, sizeof buf)) |