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:
-rw-r--r--config/darwin-config.py4
-rw-r--r--config/linux2-config.py2
-rw-r--r--config/linuxcross-config.py2
-rw-r--r--config/openbsd3-config.py4
-rw-r--r--config/sunos5-config.py4
-rw-r--r--config/win32-mingw-config.py2
-rw-r--r--tools/Blender.py6
7 files changed, 12 insertions, 12 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 547d655b531..53e45f5233c 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -260,11 +260,11 @@ CC_WARN = ['-Wall', '-Wno-long-double']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
-BF_PROFILE_FLAGS = ' -pg -g '
+BF_PROFILE_FLAGS = ['-pg', '-g ']
BF_PROFILE = False
BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_FLAGS = ['-g']
BF_BUILDDIR='../build/darwin'
BF_INSTALLDIR='../install/darwin'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index ca07bf10ab8..e890d264682 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -201,7 +201,7 @@ BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = False
BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_FLAGS = ['-g']
BF_BUILDDIR = '../build/linux2'
BF_INSTALLDIR='../install/linux2'
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index c10e9d76cb5..251f53a90e2 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -144,7 +144,7 @@ CC_WARN = [ '-Wall' ]
LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
BF_DEBUG = False
-BF_DEBUG_FLAGS= ''
+BF_DEBUG_FLAGS= []
BF_BUILDDIR = '../build/linuxcross'
BF_INSTALLDIR='../install/linuxcross'
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index 0a4f75e3bcc..9313cbc211f 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -155,11 +155,11 @@ LLIBS = 'm stdc++ pthread util'
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
-BF_PROFILE_FLAGS = ' -pg -g '
+BF_PROFILE_FLAGS = ['-pg', '-g']
BF_PROFILE = False
BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_FLAGS = ['-g']
BF_BUILDDIR='../build/openbsd3'
BF_INSTALLDIR='../install/openbsd3'
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index 2343ce69060..7b1295da941 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -173,11 +173,11 @@ BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = False
BF_DEBUG = False
-BF_DEBUG_FLAGS = ''
+BF_DEBUG_FLAGS = []
BF_BUILDDIR = '../build/sunos5'
BF_INSTALLDIR='../install/sunos5'
BF_DOCDIR='../install/doc'
-PLATFORM_LINKFLAGS = ['']
+PLATFORM_LINKFLAGS = []
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index bdeca1ddc91..19e9d1918c6 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -160,7 +160,7 @@ CC_WARN = [ '-Wall' ]
LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
BF_DEBUG = False
-BF_DEBUG_FLAGS= '-g'
+BF_DEBUG_FLAGS= ['-g']
BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = False
diff --git a/tools/Blender.py b/tools/Blender.py
index 5d123100e3b..857d5c4d780 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -417,9 +417,9 @@ class BlenderEnvironment(SConsEnvironment):
if lenv['WITH_BF_BULLET']:
lenv.Append(CPPDEFINES=['WITH_BULLET=1'])
if lenv['BF_DEBUG'] or (libname in quickdebug):
- lenv.Append(CFLAGS = Split(lenv['BF_DEBUG_CFLAGS']))
- lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_CCFLAGS']))
- lenv.Append(CXXFLAGS = Split(lenv['BF_DEBUG_CXXFLAGS']))
+ lenv.Append(CFLAGS = lenv['BF_DEBUG_CFLAGS'])
+ lenv.Append(CCFLAGS = lenv['BF_DEBUG_CCFLAGS'])
+ lenv.Append(CXXFLAGS = lenv['BF_DEBUG_CXXFLAGS'])
else:
lenv.Append(CFLAGS = lenv['REL_CFLAGS'])
lenv.Append(CCFLAGS = lenv['REL_CCFLAGS'])