Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix build for MinGW without opencollada (updated libs coming soon), MinGW64 now builds with opencollada

Browse Source
This commit is contained in:
Antony Riakiotakis
2013-04-02 02:05:03 +00:00
parent 07d027b102
commit d067ba9cbc
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -1289,17 +1289,17 @@ elseif(WIN32)
if(WITH_OPENCOLLADA) if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/opencollada) set(OPENCOLLADA ${LIBDIR}/opencollada)
set(OPENCOLLADA_INCLUDE_DIRS set(OPENCOLLADA_INCLUDE_DIRS
${OPENCOLLADA}/include/COLLADAStreamWriter ${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
${OPENCOLLADA}/include/COLLADABaseUtils ${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
${OPENCOLLADA}/include/COLLADAFramework ${OPENCOLLADA}/include/opencollada/COLLADAFramework
${OPENCOLLADA}/include/COLLADASaxFrameworkLoader ${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
${OPENCOLLADA}/include/GeneratedSaxParser ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
) )
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
if(WITH_MINGW64) if(WITH_MINGW64)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml) set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa xml)
else() else()
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa) set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat buffer ftoa)
endif() endif()
set(PCRE_LIBRARIES pcre) set(PCRE_LIBRARIES pcre)
endif() endif()

1
intern/opencolorio/CMakeLists.txt
View File

@@ -44,6 +44,7 @@ set(SRC
if(WITH_OPENCOLORIO) if(WITH_OPENCOLORIO)
add_definitions( add_definitions(
-DWITH_OCIO -DWITH_OCIO
-DGLEW_STATIC
) )
list(APPEND INC_SYS list(APPEND INC_SYS

2
intern/opencolorio/SConscript
View File

@@ -30,7 +30,7 @@ Import('env')
sources = env.Glob('*.cc') sources = env.Glob('*.cc')
incs = '. ../guardedalloc ../../source/blender/blenlib' incs = '. ../guardedalloc ../../source/blender/blenlib'
defs = [] defs = [ 'GLEW_STATIC' ]
if env['WITH_BF_OCIO']: if env['WITH_BF_OCIO']:
defs.append('WITH_OCIO') defs.append('WITH_OCIO')