diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2013-04-02 17:07:01 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2013-04-02 17:07:01 +0400 |
commit | dbfadcad610c6ee10b57759db05f75d26dc18987 (patch) | |
tree | e8af25441b84ee5c1df96cd52fcaed525165f55e | |
parent | 5105ddae74d47c883dfef2a76ac43d6bac4e74da (diff) |
Fix compilation on MinGW(64/32)
Also, add appropriate lib paths for recent OpenCollada for mingw32 (coming soon to an svn server near you)
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-rw-r--r-- | source/blender/editors/util/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/util/SConscript | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf078fb2c9c..0224ef63715 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1296,11 +1296,7 @@ elseif(WIN32) ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser ) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada) - if(WITH_MINGW64) - 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 buffer ftoa) - endif() + set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa xml) set(PCRE_LIBRARIES pcre) endif() @@ -1413,8 +1409,8 @@ elseif(WIN32) LLVMX86Disassembler LLVMX86Info LLVMX86Utils LLVMipa LLVMipo LLVMCore) - #imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp") + #imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc + set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp") set(LLVM_STATIC YES) endif() diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 53c23a8f853..bcc55c4ea6e 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -90,6 +90,8 @@ set(SRC ../include/UI_view2d.h ) +add_definitions(-DGLEW_STATIC) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript index 1c1a8e46dd7..8460b307f0d 100644 --- a/source/blender/editors/util/SConscript +++ b/source/blender/editors/util/SConscript @@ -28,7 +28,7 @@ Import ('env') sources = env.Glob('*.c') -defs = [] +defs = [ 'GLEW_STATIC' ] incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' |