diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-07-10 20:01:47 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-07-10 20:01:47 +0400 |
| commit | 1ce8f352bc5f86bf7d0015e80f3570e04768c9ce (patch) | |
| tree | 373d661fb2ad52564592ecc60c0254eb551b2846 /source/nan_definitions.mk | |
| parent | 1cd74bab9930fe91acd64eb73a98dd10d51e997f (diff) | |
Oops! Only OSX has the OpenEXR in cvs now, makefile did it for Linux too.
Diffstat (limited to 'source/nan_definitions.mk')
| -rw-r--r-- | source/nan_definitions.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 6371b24efd0..70ec992917c 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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 endif else - export NAN_OPENEXR ?= $(LCGDIR)/openexr - export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR - ifeq ($(OS),darwin) - ifeq ($(CPU),powerpc) + ifeq ($(OS),darwin) + export NAN_OPENEXR ?= $(LCGDIR)/openexr + ifeq ($(CPU),powerpc) 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 - 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 + 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 # Platform Dependent settings go below: |