forked from bartvdbraak/blender
Oops! Only OSX has the OpenEXR in cvs now, makefile did it for Linux too.
This commit is contained in:
parent
1cd74bab99
commit
1ce8f352bc
@ -112,17 +112,19 @@ endif
|
|||||||
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/IlmImf -I$(NAN_OPENEXR)/include/Imath -I$(NAN_OPENEXR)/include/Iex
|
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/IlmImf -I$(NAN_OPENEXR)/include/Imath -I$(NAN_OPENEXR)/include/Iex
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
export NAN_OPENEXR ?= $(LCGDIR)/openexr
|
ifeq ($(OS),darwin)
|
||||||
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
|
export NAN_OPENEXR ?= $(LCGDIR)/openexr
|
||||||
ifeq ($(OS),darwin)
|
ifeq ($(CPU),powerpc)
|
||||||
ifeq ($(CPU),powerpc)
|
|
||||||
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
|
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
|
||||||
else
|
|
||||||
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a
|
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
|
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a
|
||||||
endif
|
endif
|
||||||
|
else
|
||||||
|
export NAN_OPENEXR ?= /usr/local
|
||||||
|
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
|
||||||
|
endif
|
||||||
|
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
|
||||||
|
|
||||||
endif
|
endif
|
||||||
# Platform Dependent settings go below:
|
# Platform Dependent settings go below:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user