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:
authorCampbell Barton <ideasman42@gmail.com>2011-01-27 03:02:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-01-27 03:02:25 +0300
commit6a2e5ad59913a486752699095a8bcd1713b0ad60 (patch)
tree50ad8de4a756e3025fd9894e129aa231bd6cf12d /build_files/scons/config
parent340e411889d85f183ede4be6442436d7d2c83103 (diff)
[#25815] Patch gcc 4.6
with minor edits, made sure it works in CMake too.
Diffstat (limited to 'build_files/scons/config')
-rw-r--r--build_files/scons/config/linux2-config.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux2-config.py
index 07ff30763c0..5afc2234c7b 100644
--- a/build_files/scons/config/linux2-config.py
+++ b/build_files/scons/config/linux2-config.py
@@ -193,6 +193,8 @@ CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFIL
CPPFLAGS = []
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
+# g++ 4.6, only needed for bullet
+CXXFLAGS += ['-fpermissive']
if WITH_BF_FFMPEG:
# libavutil needs UINT64_C()
CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]