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

10 files changed, 21 insertions, 6 deletions

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 7c118b78861..ee0cd6e2a87 100644
--- 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 19b62dd2395..70bb827a67c 100644
--- 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 f3ac6d905f7..5981c8b96e5 100644
--- 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 cd46d11867e..49a0c824cd7 100644
--- 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 4e7e99bc884..3b76753399d 100644
--- 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 22666851f28..6278672ca3d 100644
--- 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 fe51abe0a89..f25d8e22308 100644
--- 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 7d4f6d2d76b..c8c8bd1ba68 100644
--- 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 3b5e33eda59..97b855c630b 100644
--- 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 66d5ecc6b9a..b86bb592970 100755
--- 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', ''),