Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 3961e153cea..cc7561ff9b1 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -115,6 +115,7 @@ endif
export WITH_OPENEXR ?= true
export WITH_DDS ?= true
+ export WITH_OPENJPEG ?= true
ifeq ($(OS),windows)
export NAN_WINTAB ?= $(LCGDIR)/wintab
@@ -139,9 +140,9 @@ endif
else
ifeq ($(OS),linux)
ifeq ($(WITH_OPENEXR), true)
- NAN_OPENEXR?=$(shell pkg-config --variable=prefix OpenEXR )
- NAN_OPENEXR_INC?=$(shell pkg-config --cflags OpenEXR )
- NAN_OPENEXR_LIBS?=$(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs-only-l OpenEXR | sed -s "s/-l//g" )))
+ export NAN_OPENEXR?=$(shell pkg-config --variable=prefix OpenEXR )
+ export NAN_OPENEXR_INC?=$(shell pkg-config --cflags OpenEXR )
+ export NAN_OPENEXR_LIBS?=$(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs-only-l OpenEXR | sed -s "s/-l//g" )))
endif
else
ifeq ($(OS), solaris)