Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-11-07 22:14:50 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-11-07 22:14:50 +0400
commitae06ebcd95a63f44501b4ee30e120162f53e940a (patch)
tree0d03b38dd2d248fa848fe2ad491598a155f26da6 /extern/libmv/SConscript
parentf3407e7d60d8000d71c66192d760bd5700345b21 (diff)
Hopefully compilation with MinGW will work again.
Tested with official MinGW and SCons, not sure how ti check it when using CMake.
Diffstat (limited to 'extern/libmv/SConscript')
-rw-r--r--extern/libmv/SConscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index 1ffc6233c1d..60705e913f7 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -30,7 +30,9 @@ incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_ZLIB_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog ./third_party/msinttypes'
+ incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ incs += ' ./third_party/msinttypes'
src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc']
src += ['./third_party/glog/src/windows/port.cc']