diff options
| author | Kent Mein <mein@cs.umn.edu> | 2006-01-09 05:18:11 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2006-01-09 05:18:11 +0300 |
| commit | c693e01b8d9bd9af629b0fc8abab0a42a810c177 (patch) | |
| tree | 454029a54ec5ff4eb5138f9ccf8f04795b8c4a1c /source | |
| parent | 014aa7261e29810b35b3d65c759f9d255bf8a277 (diff) | |
Ton forgot a few modifications to the Scons and Makefile build systems.
These should make it so that other people can compile with OpenEXR support.
(I also added the OPENAL fix erwin commited to bf-blender since I
need it for my machine, and this syncs up the file)
Kent
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 5 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 8 | ||||
| -rw-r--r-- | source/nan_link.mk | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/source/Makefile b/source/Makefile index 732d7fd97f6..7b073259c8b 100644 --- a/source/Makefile +++ b/source/Makefile @@ -110,6 +110,8 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a + COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a + COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a COMLIB += $(NAN_SOLID)/lib/libsolid.a COMLIB += $(NAN_SOLID)/lib/libsolid_broad.a COMLIB += $(NAN_SOLID)/lib/libsolid_complex.a @@ -157,6 +159,9 @@ endif ifeq ($(WITH_QUICKTIME), true) COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a endif + ifeq ($(WITH_OPENEXR), true) + COMLIB += $(OCGDIR)/blender/imbuf/openexr/$(DEBUG_DIR)libopenexr.a + endif ifeq ($(WITH_FREETYPE2), true) ifeq ($(OS), windows) ifeq ($(FREE_WINDOWS), true) diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 71d59acc8db..db3d27bcb19 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -46,7 +46,6 @@ all debug:: # First generic defaults for all platforms which should be constant. # Note: ?= lets these defaults be overruled by environment variables, - export SRCHOME ?= $(NANBLENDERHOME)/source export CONFIG_GUESS := $(shell ${SRCHOME}/tools/guess/guessconfig) export OS := $(shell echo ${CONFIG_GUESS} | sed -e 's/-.*//') @@ -94,6 +93,11 @@ endif export NAN_FTGL ?= $(LCGDIR)/ftgl endif + export WITH_OPENEXR ?= true + export NAN_OPENEXR ?= /usr/local + export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR + export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a + # Platform Dependent settings go below: ifeq ($(OS),beos) @@ -415,7 +419,7 @@ endif export ID = $(LOGNAME) export NAN_PYTHON ?= $(LCGDIR)/python export NAN_ICONV ?= $(LCGDIR)/iconv - export NAN_PYTHON_VERSION ?= 2.3 + export NAN_PYTHON_VERSION ?= 2.4 ifeq ($(FREE_WINDOWS), true) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype diff --git a/source/nan_link.mk b/source/nan_link.mk index e8f852c94aa..1156bf383dc 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -157,3 +157,7 @@ endif ifneq ($(OS), irix) LLIBS += $(NAN_SDLLIBS) endif + +ifeq ($(WITH_OPENEXR), true) + LLIBS += $(NAN_OPENEXR_LIBS) +endif |