LCMS code removed, was an experiment but never finished.

5 files changed, 0 insertions, 35 deletions

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 8a1f6875b6f..14bed8874fa 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -88,9 +88,6 @@ macro(SETUP_LIBDIRS)
 	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
 		link_directories(${OPENJPEG_LIBPATH})
 	endif()
-	if(WITH_LCMS)
-		link_directories(${LCMS_LIBPATH})
-	endif()
 	if(WITH_CODEC_QUICKTIME)
 		link_directories(${QUICKTIME_LIBPATH})
 	endif()
@@ -193,9 +190,6 @@ macro(setup_liblinks
 	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
 		target_link_libraries(${target} ${OPENJPEG_LIB})
 	endif()
-	if(WITH_LCMS)
-		target_link_libraries(${target} ${LCMS_LIBRARY})
-	endif()
 	if(WITH_CODEC_FFMPEG)
 		target_link_libraries(${target} ${FFMPEG_LIB})
 	endif()
@@ -217,12 +211,6 @@ macro(setup_liblinks
 			target_link_libraries(${target} ${EXPAT_LIB})
 		endif()
 	endif()
-	if(WITH_LCMS)
-		if(WIN32 AND NOT UNIX)
-			target_link_libraries(${target} debug ${LCMS_LIB}_d)
-			target_link_libraries(${target} optimized ${LCMS_LIB})
-		endif()
-	endif()
 	if(WITH_MEM_JEMALLOC)
 		target_link_libraries(${target} ${JEMALLOC_LIBRARY})
 	endif()
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index eeb50a9ca65..65076be85ed 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -149,12 +149,6 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
-WITH_BF_LCMS = False
-BF_LCMS = LIBDIR + '/lcms'
-BF_LCMS_INC = '${BF_LCMS}/include'
-BF_LCMS_LIB = 'lcms'
-BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
-
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index 2dcbe8aeb2e..2c990941764 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -151,12 +151,6 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
-WITH_BF_LCMS = False
-BF_LCMS = LIBDIR + '/lcms'
-BF_LCMS_INC = '${BF_LCMS}/include'
-BF_LCMS_LIB = 'lcms'
-BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
-
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 90c2c35bb98..4bfa1851acb 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -148,8 +148,6 @@ def setup_staticlibs(lenv):
         libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
         if lenv['WITH_BF_STATICOPENEXR']:
             statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
-    if lenv['WITH_BF_LCMS']:
-        libincs += Split(lenv['BF_LCMS_LIBPATH'])
     if lenv['WITH_BF_TIFF']:
         libincs += Split(lenv['BF_TIFF_LIBPATH'])
         if lenv['WITH_BF_STATICTIFF']:
@@ -258,8 +256,6 @@ def setup_syslibs(lenv):
         syslibs += Split(lenv['BF_OPENGL_LIB'])
     if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc'):
         syslibs += Split(lenv['BF_PTHREADS_LIB'])
-    if lenv['WITH_BF_LCMS']:
-        syslibs.append(lenv['BF_LCMS_LIB'])
     if lenv['WITH_BF_COLLADA']:
         syslibs.append(lenv['BF_PCRE_LIB'])
         syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index fda88d7d5a9..fe6b092598c 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -125,7 +125,6 @@ def validate_arguments(args, bc):
             'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
             'BF_X264_CONFIG',
             'BF_XVIDCORE_CONFIG',
-            'WITH_BF_LCMS', 'BF_LCMS', 'BF_LCMS_INC', 'BF_LCMS_LIB', 'BF_LCMS_LIBPATH',
             'WITH_BF_DOCS',
             'BF_NUMJOBS',
             'BF_MSVS',
@@ -334,12 +333,6 @@ def read_opts(env, cfg, args):
         ('BF_TIFF_LIBPATH', 'TIFF library path', ''),
         ('BF_TIFF_LIB_STATIC', 'TIFF static library', ''),
 
-        (BoolVariable('WITH_BF_LCMS', 'Enable color correction with lcms', False)),
-        ('BF_LCMS', 'LCMS base path', ''),
-        ('BF_LCMS_INC', 'LCMS include path', ''),
-        ('BF_LCMS_LIB', 'LCMS library', ''),
-        ('BF_LCMS_LIBPATH', 'LCMS library path', ''),
-
         (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)),
         (BoolVariable('WITH_BF_STATICZLIB', 'Staticly link to ZLib', False)),
         ('BF_ZLIB', 'ZLib base path', ''),