Added BF_PROFILE_LINKFLAGS, Compiling with BF_PROFILE=1 was also throwing a python...

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 7c118b7886134413e9f771e5eb1b3c02ab943238..ee0cd6e2a875e0364a13d9fa7584961aed173df7 100644 (file)
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -261,6 +261,7 @@ CC_WARN = ['-Wall', '-Wno-long-double']
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
 BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE = False
 
 BF_DEBUG = False

diff --git a/config/linux2-config.py b/config/linux2-config.py
index 19b62dd2395ca63c018e077256e6366f9b53a7a4..70bb827a67c3595fd621b875bb54a62b6345e7a2 100644 (file)
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -199,6 +199,7 @@ LLIBS = 'util c m dl pthread stdc++'
 
 BF_PROFILE = False
 BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
 
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS = ['-g']

diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index f3ac6d905f7b2c0b3a85baccb789e6fe7f39d59b..5981c8b96e518e5d3fcfcdbd4947a5d4a2388732 100644 (file)
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -149,6 +149,10 @@ LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lw
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= []
 
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
 BF_BUILDDIR = '../build/linuxcross'
 BF_INSTALLDIR='../install/linuxcross'
 BF_DOCDIR='../install/doc'

diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index cd46d11867edd7ab7d57f239eb29ede4ec84b9ec..49a0c824cd7b84d712f84b33e26bec4db848f8c3 100644 (file)
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -155,8 +155,9 @@ LLIBS = 'm stdc++ pthread util'
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
 
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS = ['-g']

diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index 4e7e99bc88495bdf48079147faf36c8726ce94fc..3b76753399d0db7686cd078f9a8f040f69cefa59 100644 (file)
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -169,7 +169,8 @@ LLIBS = 'c m dl pthread stdc++'
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE = False
 
 BF_DEBUG = False

diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 22666851f289f552490f78c9f5d504f60425506c..6278672ca3df936baecf56863a846edf541a45ff 100644 (file)
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -164,7 +164,8 @@ LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= ['-g']
 
-BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE = False
 
 BF_BUILDDIR = '..\\build\\win32-mingw'

diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index fe51abe0a89300bbf1c0ee342c41bb6ebc6c1f38..f25d8e223085be18642e366626463150e993d638 100644 (file)
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -197,6 +197,11 @@ PLATFORM_LINKFLAGS = '''
                        /LARGEADDRESSAWARE
                    '''
 
+# # Todo
+# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+# BF_PROFILE_LINKFLAGS = ['-pg']
+# BF_PROFILE = False
+
 BF_BUILDDIR = '..\\build\\win32-vc'
 BF_INSTALLDIR='..\\install\\win32-vc'
 BF_DOCDIR='..\\install\\doc'

diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 7d4f6d2d76b375358321ff684cde58f933593b79..c8c8bd1ba68e51ebce1316a42025dceb7d659835 100644 (file)
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -36,7 +36,7 @@ if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
        targetdir = '#'+targetdir
 makesdna_tool.Append (LIBPATH = targetdir)
 if env['BF_PROFILE']:
-       makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])
+       makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_LINKFLAGS'])
 
 targetdir = root_build_dir + '/makesdna'
 

diff --git a/tools/Blender.py b/tools/Blender.py
index 3b5e33eda593854a9996c02e1c1070b783b292c3..97b855c630bbfd000b3004e6b64c7d2db9a52d75 100644 (file)
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -476,7 +476,7 @@ class BlenderEnvironment(SConsEnvironment):
                                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
                        lenv.Append(LINKFLAGS = lenv['BF_OPENGL_LINKFLAGS'])
                if lenv['BF_PROFILE']:
-                               lenv.Append(LINKFLAGS = lenv['BF_PROFILE_FLAGS'])
+                       lenv.Append(LINKFLAGS = lenv['BF_PROFILE_LINKFLAGS'])
                lenv.Append(CPPPATH=includes)
                if root_build_dir[0]==os.sep or root_build_dir[1]==':':
                        lenv.Append(LIBPATH=root_build_dir + '/lib')

diff --git a/tools/btools.py b/tools/btools.py
index 66d5ecc6b9a1c7638fb0f30769f450a91da23108..b86bb592970ffe9e89ecace8c8975a67907dc8f9 100755 (executable)
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -54,7 +54,7 @@ def validate_arguments(args, bc):
                        'WITH_BF_BINRELOC',
                        'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
                        'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
-                       'BF_PROFILE_FLAGS', 'BF_PROFILE_FLAGS', 'BF_PROFILE_CXXFLAGS',
+                       'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS', 'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS',
                        'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
                        'C_WARN', 'CC_WARN', 'CXX_WARN',
                        'LLIBS', 'PLATFORM_LINKFLAGS',
@@ -340,6 +340,7 @@ def read_opts(cfg, args):
                ('BF_PROFILE_CFLAGS', 'C only profiling flags', ''),
                ('BF_PROFILE_CCFLAGS', 'C and C++ profiling flags', ''),
                ('BF_PROFILE_CXXFLAGS', 'C++ only profiling flags', ''),
+               ('BF_PROFILE_LINKFLAGS', 'Profile linkflags', ''),
 
                (BoolVariable('BF_DEBUG', 'Add debug flags if true', False)),
                ('BF_DEBUG_CFLAGS', 'C only debug flags', ''),