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:
authorCampbell Barton <ideasman42@gmail.com>2010-08-03 15:25:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-03 15:25:34 +0400
commit957976882d084d9951760b154f414724d6ddb8be (patch)
tree9b81d50c17b64575949351ea1c733e90f6b118ae /source/Makefile
parent940d1dcd0a9f88ec5a7b1ec0cf12dc7a6ddddf0b (diff)
build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons. - renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile
index 12e47ba5863..e0c39bff368 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -204,7 +204,9 @@ ifeq ($(WITH_OPENJPEG), true)
endif
endif
-COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
+ifeq ($(WITH_CINEON), true)
+ COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
+endif
ifeq ($(WITH_DDS), true)
COMLIB += $(OCGDIR)/blender/imbuf/dds/$(DEBUG_DIR)libdds.a