diff options
author | Kent Mein <mein@cs.umn.edu> | 2005-03-14 17:56:40 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2005-03-14 17:56:40 +0300 |
commit | ecf6de151c5c2a4794a6c0f700dcc47568d3b78b (patch) | |
tree | 8b89e296b52987ef56751f9e390acaf8a596b531 /source/nan_definitions.mk | |
parent | cce74ab4d02bb793c199b7dfdb193e30cc590092 (diff) |
This commit reverses the OpenEXR specific stuff in the OpenEXR commit I
did last friday. A patch will be available in the patches tracker
that will have the current stuff there until everything is working.
Kent
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r-- | source/nan_definitions.mk | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 1ed4fe2ebae..3b89a425b07 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -102,9 +102,6 @@ endif export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_PNG ?= $(LCGDIR)/png -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 @@ -156,9 +153,6 @@ endif export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= /sw export NAN_PNG ?= /sw -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 @@ -203,9 +197,6 @@ endif export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= /usr/local export NAN_PNG ?= /usr/local -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 @@ -249,9 +240,6 @@ endif export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_PNG ?= $(LCGDIR)/png -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 @@ -293,9 +281,6 @@ endif export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= /usr export NAN_PNG ?= /usr -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr @@ -338,9 +323,6 @@ endif export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_PNG ?= $(LCGDIR)/png -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 @@ -382,9 +364,6 @@ endif export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= /usr/local export NAN_PNG ?= /usr/local -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= export NAN_MESA ?= /usr/src/Mesa-3.1 @@ -424,9 +403,6 @@ endif ifeq ($(FREE_WINDOWS), true) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/gcc/ode ifeq ($(NAN_SDL),) export NAN_SDL ?= $(LCGDIR)/gcc/sdl @@ -435,9 +411,6 @@ endif else export NAN_PYTHON_BINARY ?= python export NAN_FREETYPE ?= $(LCGDIR)/freetype -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode ifeq ($(NAN_SDL),) export NAN_SDL ?= $(LCGDIR)/sdl @@ -485,9 +458,6 @@ endif export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_PNG ?= $(LCGDIR)/png export NAN_SDL ?= $(LCGDIR)/sdl -# Commented out by default -# export WITH_OPENEXR ?= true - export NAN_OPENEXR ?= $(LCGDIR)/OpenEXR export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 |