[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12074] branches/cloth/blender: Fix: No GAMEENGINE=1 needed anymore, only WITH_BF_BULLET=1.

[Daniel Genrich]

Revision: 12074
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12074
Author:   genscher
Date:     2007-09-17 23:03:45 +0200 (Mon, 17 Sep 2007)

Log Message:
-----------
Fix: No GAMEENGINE=1 needed anymore, only WITH_BF_BULLET=1.
Fix: (Hopefully) some fix for linking openmp

Modified Paths:
--------------
    branches/cloth/blender/SConstruct
    branches/cloth/blender/extern/SConscript

Modified: branches/cloth/blender/SConstruct
===================================================================
--- branches/cloth/blender/SConstruct	2007-09-17 19:57:47 UTC (rev 12073)
+++ branches/cloth/blender/SConstruct	2007-09-17 21:03:45 UTC (rev 12074)
@@ -178,12 +178,12 @@
 
 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')

Modified: branches/cloth/blender/extern/SConscript
===================================================================
--- branches/cloth/blender/extern/SConscript	2007-09-17 19:57:47 UTC (rev 12073)
+++ branches/cloth/blender/extern/SConscript	2007-09-17 21:03:45 UTC (rev 12074)
@@ -5,9 +5,10 @@
 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'])