From 88446eeca4b6f9d31928a538e3a39d04f1d06976 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 18 Oct 2006 05:45:47 +0000 Subject: Patch 5105 by Joshua Leung (Aligorith), slightly modified by me * Add WITH_BF_YAFRAY, which per default is 'true', so no visible changes for developers (and users). Set WITH_BF_YAFRAY to 'false', and you'll save some major compile time :) Also handy if you're strapped for memory and compilation fails on yafray compilation due to this. - this commit also has a few whitespace changes and - made BF_NO_ELBEEM a proper BoolOption. This will be renamed to WITH_BF_ELBEEM in the near future... --- config/darwin-config.py | 2 ++ config/linux2-config.py | 2 ++ config/linuxcross-config.py | 2 ++ config/openbsd3-config.py | 2 ++ config/sunos5-config.py | 2 ++ config/win32-mingw-config.py | 2 ++ config/win32-vc-config.py | 2 ++ 7 files changed, 14 insertions(+) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 7257485d8c7..0d4bc5c0be0 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -82,6 +82,8 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +WITH_BF_YAFRAY = 'true' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr diff --git a/config/linux2-config.py b/config/linux2-config.py index f77ffe47b22..f7d84d228f3 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -75,6 +75,8 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +WITH_BF_YAFRAY = 'true' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index fba10bbb089..2d833d2fcfc 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -4,6 +4,8 @@ LIBDIR = '${LCGDIR}' WITH_BF_VERSE = 'false' BF_VERSE_INCLUDE = "#extern/verse/dist" +WITH_BF_YAFRAY = 'true' + BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '2.4' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index abeb9186bb8..b44e79eb2a6 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -76,6 +76,8 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +WITH_BF_YAFRAY = 'true' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 436217c1be1..de342c40158 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -78,6 +78,8 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +WITH_BF_YAFRAY = 'true' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 6208c266b5b..e23e6436c59 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -91,6 +91,8 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +WITH_BF_YAFRAY = 'true' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index b3edcab7e2b..cbed1ccbc5e 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -92,6 +92,8 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +WITH_BF_YAFRAY = 'true' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr -- cgit v1.2.3