diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-06-29 12:56:28 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-06-29 18:31:10 +0100 |
| commit | 570f0cb8c4f467279ff1f6141ef052b4617fe68b (patch) | |
| tree | 4b17ef08ebf8527c21bb25c15200b1e5ab6a00bc /Makethird | |
| parent | d03b9b3ce5726f9479c35ed2b9c2bee670850a26 (diff) | |
| download | mupdf-570f0cb8c4f467279ff1f6141ef052b4617fe68b.tar.xz | |
Mujstest Makefile tweaks
No idea how this was ever working before. Correct locations for
finding libraries. Use C++ to compile the appropriate v8 interface
file.
Add v8_base and v8_snapshot to the library lists. Also add pthreads
for linux, as it seems to be required. No idea why...
Diffstat (limited to 'Makethird')
| -rw-r--r-- | Makethird | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -9,7 +9,7 @@ JBIG2DEC_DIR := $(wildcard thirdparty/jbig2dec*) JPEG_DIR := $(wildcard thirdparty/jpeg*) OPENJPEG_DIR := $(wildcard thirdparty/openjpeg*/libopenjpeg) ZLIB_DIR := $(wildcard thirdparty/zlib*) -V8_DIR := $(wildcard thirdparty/v8*/) +V8_DIR := $(wildcard thirdparty/v8*) # --- V8 --- @@ -28,14 +28,12 @@ endif # MacOSX has a 64bit kernel, but a 32 bit userspace. ifeq "$(OS)" "Darwin" V8_ARCH ?= ia32 -V8_DIR ?= out-mac +V8LIBS = -L$(V8_DIR)/out-mac/$(V8_ARCH).$(V8LIB_CHOICE)/ -lv8_base -lv8_snapshot else V8_ARCH ?= x64 -V8_DIR ?= out +V8LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread endif -V8LIBS = -L$(V8_DIR)/$(V8_DIR)/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp - V8_PRESENT := 1 else V8_PRESENT := 0 |