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:
authorKent Mein <mein@cs.umn.edu>2006-08-03 14:48:20 +0400
committerKent Mein <mein@cs.umn.edu>2006-08-03 14:48:20 +0400
commit454fceb5f51809974be2ba3620c24d4eff7cf3a3 (patch)
tree0a15c781549c0523ba324769d9764a8adc88443f /source/nan_definitions.mk
parentf9fb0cf9b0ceea6c278b49ab91c8a7023be68574 (diff)
Solaris was still using compress for make release.
Everyone else was using gzip. On the latest downloads many of them are using bzip2, (I think everyone using scons) So I decided to update make release so that everyone is using gzip2. I don't mean to step on anyones toes, I know at least some of the platform maintainers do not use make though so feel free to change it back and or to something different for your platform. While I was at it I also changed default path of OPENEXR to /usr on linux. Was suggested on mailing list by Matt. (I'm pretty sure the linux maintainer is using scons) Kent
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 9920c2a509b..123b76d86b8 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -119,8 +119,13 @@ endif
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
+ ifeq ($(OS),linux)
+ export NAN_OPENEXR ?= /usr
+ export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
+ 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
endif
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR