diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2014-03-20 14:13:06 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2014-03-25 16:44:41 +0000 |
| commit | db6353067cf545f4ca6fd854c8e8b4c4145dc537 (patch) | |
| tree | c06d40f931c33ff335b474412392896a685657e6 /Makerules | |
| parent | 332fb2e7033f3376fcdcfe0762e15ce78d221fbc (diff) | |
| download | mupdf-db6353067cf545f4ca6fd854c8e8b4c4145dc537.tar.xz | |
Add MuJS submodule, implementation and build.
Adds simpler choice of Javascript library to makefiles.
Will prefer in order: MuJS, JavaScriptCore, V8, none based
on HAVE_MUJS, HAVE_JSCORE, and HAVE_V8.
For simplicity, we build mujstest even with no javascript implementation.
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -27,10 +27,12 @@ endif # Windows (MINGW) build doesn't use system libraries. ifeq "$(OS)" "MINGW" -NOX11 ?= yes # Mac OS X doesn't have pkg-config so we hard code paths. else ifeq "$(OS)" "MACOS" + +HAVE_X11 ?= yes + SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL SYS_OPENSSL_LIBS = -lcrypto @@ -54,6 +56,8 @@ RANLIB_CMD = xcrun ranlib $@ # Linux uses pkg-config for system libraries. else ifeq "$(OS)" "Linux" +HAVE_X11 ?= yes + ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes" SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto) SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto) @@ -138,6 +142,7 @@ RANLIB_CMD = xcrun ranlib $@ CROSSCOMPILE=yes endif +# TODO: If crosscompiling, why not just call "make libs" instead of this exception? ifeq "$(CROSSCOMPILE)" "yes" -NOX11 ?= yes +HAVE_X11 ?= no endif |