==SCons==

* add -pthread compile switch for linux2 platforms to be on the safe side.
This commit is contained in:
Nathan Letwory
2006-02-19 22:21:45 +00:00
parent 21be45b66e
commit 29a5fbc6b7
2 changed files with 12 additions and 4 deletions

View File

@@ -3,6 +3,7 @@ Import ('env')
sources = env.Glob('intern/*.c')
cflags=''
incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../include'
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_ZLIB_INC']
@@ -12,4 +13,7 @@ defs = ''
if env['WITH_BF_INTERNATIONAL'] == 1:
defs = 'WITH_FREETYPE2'
env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195] )
if env['OURPLATFORM'] == 'linux2':
cflags='-pthread'
env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195], compileflags =cflags )

View File

@@ -1,6 +1,7 @@
#!/usr/bin/python
Import ('env')
cflags=''
sources = env.Glob('intern/source/*.c')
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
@@ -12,10 +13,13 @@ incs += ' ' + env['BF_SDL_INC']
defs = []
if env['WITH_BF_QUICKTIME'] == 1:
defs.append('WITH_QUICKTIME')
incs += ' ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME')
incs += ' ' + env['BF_QUICKTIME_INC']
if env['WITH_BF_FFMPEG'] == 1:
defs.append('WITH_FFMPEG')
env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45 )
if env['OURPLATFORM']=='linux2':
cflags='-pthread'
env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags )