[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17479] trunk/blender: Added BF_PROFILE_LINKFLAGS, Compiling with BF_PROFILE= 1 was also throwing a python error.

Campbell Barton ideasman42 at gmail.com
Mon Nov 17 11:43:12 CET 2008 

Revision: 17479
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17479
Author:   campbellbarton
Date:     2008-11-17 11:43:12 +0100 (Mon, 17 Nov 2008)

Log Message:
-----------
Added BF_PROFILE_LINKFLAGS, Compiling with BF_PROFILE=1 was also throwing a python error.

Modified Paths:
--------------
    trunk/blender/config/darwin-config.py
    trunk/blender/config/linux2-config.py
    trunk/blender/config/linuxcross-config.py
    trunk/blender/config/openbsd3-config.py
    trunk/blender/config/sunos5-config.py
    trunk/blender/config/win32-mingw-config.py
    trunk/blender/config/win32-vc-config.py
    trunk/blender/source/blender/makesdna/intern/SConscript
    trunk/blender/tools/Blender.py
    trunk/blender/tools/btools.py

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/config/darwin-config.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -261,6 +261,7 @@
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
 BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE = False
 
 BF_DEBUG = False

Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/config/linux2-config.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -199,6 +199,7 @@
 
 BF_PROFILE = False
 BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
 
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS = ['-g']

Modified: trunk/blender/config/linuxcross-config.py
===================================================================
--- trunk/blender/config/linuxcross-config.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/config/linuxcross-config.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -149,6 +149,10 @@
 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'

Modified: trunk/blender/config/openbsd3-config.py
===================================================================
--- trunk/blender/config/openbsd3-config.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/config/openbsd3-config.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -155,8 +155,9 @@
 ##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']

Modified: trunk/blender/config/sunos5-config.py
===================================================================
--- trunk/blender/config/sunos5-config.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/config/sunos5-config.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -169,7 +169,8 @@
 ##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

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/config/win32-mingw-config.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -164,7 +164,8 @@
 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'

Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/config/win32-vc-config.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -197,6 +197,11 @@
                        /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'

Modified: trunk/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/intern/SConscript	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/source/blender/makesdna/intern/SConscript	2008-11-17 10:43:12 UTC (rev 17479)
@@ -36,7 +36,7 @@
 	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'
 

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/tools/Blender.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -476,7 +476,7 @@
 				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')

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2008-11-17 00:54:45 UTC (rev 17478)
+++ trunk/blender/tools/btools.py	2008-11-17 10:43:12 UTC (rev 17479)
@@ -54,7 +54,7 @@
 			'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 @@
 		('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', ''),

More information about the Bf-blender-cvs mailing list