[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50667] trunk/blender: Enable OpenColorIO for MinGW64 build targets
Antony Riakiotakis
kalast at gmail.com
Sun Sep 16 20:05:32 CEST 2012
Revision: 50667
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50667
Author: psy-fi
Date: 2012-09-16 18:05:32 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
Enable OpenColorIO for MinGW64 build targets
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/build_files/scons/config/win64-mingw-config.py
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-09-16 17:39:23 UTC (rev 50666)
+++ trunk/blender/SConstruct 2012-09-16 18:05:32 UTC (rev 50667)
@@ -871,9 +871,13 @@
if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
- if env['WITH_BF_OCIO'] and env['OURPLATFORM'] != 'win32-mingw':
- dllsources.append('${LCGDIR}/opencolorio/bin/OpenColorIO.dll')
+ if env['WITH_BF_OCIO']:
+ if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
+ dllsources.append('${LCGDIR}/opencolorio/bin/OpenColorIO.dll')
+ else:
+ dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
+
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
@@ -903,6 +907,9 @@
if(env['WITH_BF_OPENMP']):
dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
+
+ if env['WITH_BF_OCIO']:
+ dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')
Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py 2012-09-16 17:39:23 UTC (rev 50666)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py 2012-09-16 18:05:32 UTC (rev 50667)
@@ -159,7 +159,7 @@
BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-WITH_BF_OCIO = False
+WITH_BF_OCIO = True
BF_OCIO = LIBDIR + '/opencolorio'
BF_OCIO_INC = '${BF_OCIO}/include'
BF_OCIO_LIB = 'OpenColorIO'
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2012-09-16 17:39:23 UTC (rev 50666)
+++ trunk/blender/source/creator/CMakeLists.txt 2012-09-16 18:05:32 UTC (rev 50667)
@@ -646,13 +646,19 @@
endif()
if(WITH_OPENCOLORIO)
+ set_lib_path(OCIOBIN "opencolorio/bin")
if(NOT MINGW)
- set_lib_path(OCIOBIN "opencolorio/bin")
install(
FILES
${OCIOBIN}/OpenColorIO.dll
DESTINATION ${TARGETDIR}
)
+ else()
+ install(
+ FILES
+ ${OCIOBIN}/libOpenColorIO.dll
+ DESTINATION ${TARGETDIR}
+ )
endif()
endif()
More information about the Bf-blender-cvs
mailing list