diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-04-02 06:05:03 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-04-02 06:05:03 +0400 |
| commit | d067ba9cbc2663fe3d56e055a8cc9fe80e07a4c6 (patch) | |
| tree | 5d4a4c97e28b85c0f03087bbac29439f2ed77de2 | |
| parent | 07d027b1023de26fa2dba45c281612f0bbb29f0a (diff) | |
Fix build for MinGW without opencollada (updated libs coming soon), MinGW64 now builds with opencollada
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | intern/opencolorio/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/opencolorio/SConscript | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cd320c2f31..cf078fb2c9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1289,17 +1289,17 @@ elseif(WIN32) if(WITH_OPENCOLLADA) set(OPENCOLLADA ${LIBDIR}/opencollada) set(OPENCOLLADA_INCLUDE_DIRS - ${OPENCOLLADA}/include/COLLADAStreamWriter - ${OPENCOLLADA}/include/COLLADABaseUtils - ${OPENCOLLADA}/include/COLLADAFramework - ${OPENCOLLADA}/include/COLLADASaxFrameworkLoader - ${OPENCOLLADA}/include/GeneratedSaxParser + ${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter + ${OPENCOLLADA}/include/opencollada/COLLADABaseUtils + ${OPENCOLLADA}/include/opencollada/COLLADAFramework + ${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader + ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser ) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada) 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() - 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() set(PCRE_LIBRARIES pcre) endif() diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt index 5680ce79762..30a74baa646 100644 --- a/intern/opencolorio/CMakeLists.txt +++ b/intern/opencolorio/CMakeLists.txt @@ -44,6 +44,7 @@ set(SRC if(WITH_OPENCOLORIO) add_definitions( -DWITH_OCIO + -DGLEW_STATIC ) list(APPEND INC_SYS diff --git a/intern/opencolorio/SConscript b/intern/opencolorio/SConscript index 73a8fd7a2e0..7f050f25cae 100644 --- a/intern/opencolorio/SConscript +++ b/intern/opencolorio/SConscript @@ -30,7 +30,7 @@ Import('env') sources = env.Glob('*.cc') incs = '. ../guardedalloc ../../source/blender/blenlib' -defs = [] +defs = [ 'GLEW_STATIC' ] if env['WITH_BF_OCIO']: defs.append('WITH_OCIO') |