kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix: No GAMEENGINE=1 needed anymore, only WITH_BF_BULLET=1.

Browse Source 
Fix: (Hopefully) some fix for linking openmp
This commit is contained in:
Daniel Genrich 2007-09-17 21:03:45 +00:00
parent 969397ced2
commit f473f4ee79
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -178,12 +178,12 @@ if env['BF_NO_ELBEEM'] == 1:
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM']=='win32-vc':
env['PLATFORM_LINKFLAGS'].append('/openmp')
env.Append(LINKFLAGS=['/openmp'])
env['CCFLAGS'].append('/openmp')
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
else:
env['PLATFORM_LINKFLAGS'].append('-lgomp')
env.Append(LINKFLAGS=['-lgomp'])
env['CCFLAGS'].append('-fopenmp')
env['CPPFLAGS'].append('-fopenmp')
env['CXXFLAGS'].append('-fopenmp')

5
extern/SConscript vendored
View File

@ -5,8 +5,9 @@ Import('env')
if env['WITH_BF_GAMEENGINE']:
SConscript(['qhull/SConscript',
'solid/SConscript'])
if env['WITH_BF_BULLET']:
SConscript(['bullet2/src/SConscript'])
if env['WITH_BF_BULLET']:
SConscript(['bullet2/src/SConscript'])
if env['WITH_BF_INTERNATIONAL']:
SConscript(['bFTGL/SConscript'])