diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-06-27 00:51:41 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-06-27 00:54:12 +0100 |
| commit | c88b0849511b970abe9864993c011af89e0daccc (patch) | |
| tree | a1df509a2afa47913dd73b4e4da114b8e3f9f1b5 /Makethird | |
| parent | 8de9bfd5c1e62fc9cdcd720303c15edd251a7c2c (diff) | |
| download | mupdf-c88b0849511b970abe9864993c011af89e0daccc.tar.xz | |
Makefile tweaks
Add an all-nojs target to make all the non-js dependent targets;
I envisage the cluster using this for normal runs so that having
a broken v8 library won't stop normal tests working.
Add macosx detection for the choice of v8 library to use.
Diffstat (limited to 'Makethird')
| -rw-r--r-- | Makethird | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -25,9 +25,16 @@ V8LIB_CHOICE := debug endif # If you are building for 32bit linux use V8_ARCH=ia32 +# MacOSX has a 64bit kernel, but a 32 bit userspace. +ifeq "$(OS)" "Darwin" +V8_ARCH ?= ia32 +V8_DIR ?= out-mac +else V8_ARCH ?= x64 +V8_DIR ?= out +endif -V8LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp +V8LIBS = -L$(V8_DIR)/$(V8_DIR)/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp V8_PRESENT := 1 else |