Attachment #287121 for bug #382097

Lines 1-5 Link Here

(-)SConstruct (-11 / +29 lines)
1	#!/usr/bin/env python	1	#!/usr/bin/env python
2	# $Id: SConstruct 39307 2011-08-11 15:59:19Z nazgul $	2	# $Id: SConstruct 40341 2011-09-19 08:02:17Z campbellbarton $
3	# *** BEGIN GPL LICENSE BLOCK ***	3	# *** BEGIN GPL LICENSE BLOCK ***
4	#	4	#
5	# This program is free software; you can redistribute it and/or	5	# This program is free software; you can redistribute it and/or
Lines 166-171 Link Here
166		166
167	env.SConscriptChdir(0)	167	env.SConscriptChdir(0)
168		168
		169	# Remove major kernel version from linux platform.
		170	# After Linus switched kernel to new version model this major version
		171	# shouldn't take much sense for building rules.
		172
		173	if re.match('linux[0-9]+', platform):
		174	platform = 'linux'
		175
169	crossbuild = B.arguments.get('BF_CROSS', None)	176	crossbuild = B.arguments.get('BF_CROSS', None)
170	if crossbuild and platform not in ('win32-vc', 'win64-vc'):	177	if crossbuild and platform not in ('win32-vc', 'win64-vc'):
171	platform = 'linuxcross'	178	platform = 'linuxcross'
Lines 262-276 Link Here
262	else:	269	else:
263	print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"	270	print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
264		271
265	# for now, Mac builders must download and install the driver framework from 3Dconnexion	272	# for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
266	# necessary header file lives here when installed:	273	# necessary header file lives here when installed:
267	# /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h	274	# /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
268	if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):	275	if env['WITH_BF_3DMOUSE'] == 1:
269	print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !	276	if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
270	env['WITH_BF_3DMOUSE'] = 0	277	print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
271	else:	278	env['WITH_BF_3DMOUSE'] = 0
272	env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])	279	else:
273		280	env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
274		281
275	if env['WITH_BF_OPENMP'] == 1:	282	if env['WITH_BF_OPENMP'] == 1:
276	if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):	283	if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
Lines 330-335 Link Here
330	env['CXXFLAGS'].append('-DDISABLE_ELBEEM')	337	env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
331	env['CCFLAGS'].append('-DDISABLE_ELBEEM')	338	env['CCFLAGS'].append('-DDISABLE_ELBEEM')
332		339
		340
		341	if btools.ENDIAN == "big":
		342	env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
		343	env['CXXFLAGS'].append('-D__BIG_ENDIAN__')
		344	env['CCFLAGS'].append('-D__BIG_ENDIAN__')
		345	else:
		346	env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
		347	env['CXXFLAGS'].append('-D__LITTLE_ENDIAN__')
		348	env['CCFLAGS'].append('-D__LITTLE_ENDIAN__')
		349
		350
333	# TODO, make optional	351	# TODO, make optional
334	env['CPPFLAGS'].append('-DWITH_AUDASPACE')	352	env['CPPFLAGS'].append('-DWITH_AUDASPACE')
335	env['CXXFLAGS'].append('-DWITH_AUDASPACE')	353	env['CXXFLAGS'].append('-DWITH_AUDASPACE')
Lines 551-557 Link Here
551	scriptinstall.append(env.Install(dir=dir,source=source))	569	scriptinstall.append(env.Install(dir=dir,source=source))
552		570
553	#-- icons	571	#-- icons
554	if env['OURPLATFORM']=='linux2':	572	if env['OURPLATFORM']=='linux':
555	iconlist = []	573	iconlist = []
556	icontargetlist = []	574	icontargetlist = []
557		575
Lines 630-636 Link Here
630		648
631	if env['OURPLATFORM']=='darwin':	649	if env['OURPLATFORM']=='darwin':
632	allinstall = [blenderinstall, plugininstall, textinstall]	650	allinstall = [blenderinstall, plugininstall, textinstall]
633	elif env['OURPLATFORM']=='linux2':	651	elif env['OURPLATFORM']=='linux':
634	allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]	652	allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
635	else:	653	else:
636	allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]	654	allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
Lines 638-644 Link Here
638	if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):	656	if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
639	dllsources = []	657	dllsources = []
640		658
641	if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):	659	if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
642	# For MinGW and linuxcross static linking will be used	660	# For MinGW and linuxcross static linking will be used
643	dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']	661	dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
644		662

Lines 1-4 Link Here

(-)build_files/scons/config/linux2-config.py (-3 / +3 lines)
1	LCGDIR = '../lib/linux2'	1	LCGDIR = '../lib/linux'
2	LIBDIR = "${LCGDIR}"	2	LIBDIR = "${LCGDIR}"
3		3
4	BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros	4	BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros
Lines 241-248 Link Here
241	BF_DEBUG = False	241	BF_DEBUG = False
242	BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']	242	BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
243		243
244	BF_BUILDDIR = '../build/linux2'	244	BF_BUILDDIR = '../build/linux'
245	BF_INSTALLDIR='../install/linux2'	245	BF_INSTALLDIR='../install/linux'
246		246
247	#Link against pthread	247	#Link against pthread
248	PLATFORM_LINKFLAGS = ['-pthread']	248	PLATFORM_LINKFLAGS = ['-pthread']




        if lenv['WITH_BF_STATICJEMALLOC']:
            statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC'])

    if lenv['OURPLATFORM']=='linux':
        if lenv['WITH_BF_3DMOUSE']:
            libincs += Split(lenv['BF_3DMOUSE_LIBPATH'])
            if lenv['WITH_BF_STATIC3DMOUSE']:

        if not lenv['WITH_BF_STATICJEMALLOC']:
            syslibs += Split(lenv['BF_JEMALLOC_LIB'])

    if lenv['OURPLATFORM']=='linux':
        if lenv['WITH_BF_3DMOUSE']:
            if not lenv['WITH_BF_STATIC3DMOUSE']:
                syslibs += Split(lenv['BF_3DMOUSE_LIB'])


    obj = []
    if lenv['BF_BUILDINFO']:
        lenv.Append (CPPDEFINES = ['BUILD_TIME=\\"%s\\"'%(build_time),
                                    'BUILD_DATE=\\"%s\\"'%(build_date),
                                    'BUILD_TYPE=\\"%s\\"'%(build_type),
                                    'BUILD_REV=\\"%s\\"'%(build_rev),
                                    'WITH_BUILDINFO',
                                    'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
                                    'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
                                    'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
                                    'BUILD_LINKFLAGS=\\"%s\\"'%(build_linkflags),
                                    'BUILD_SYSTEM=\\"SCons\\"'
                    ])

        lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])

    print("Installing to %s"%(installdir))
    # TODO, use tar.
    python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
    if env['WITH_OSX_STATICPYTHON']:
        print("unzipping to app-bundle: %s"%(python_zip))
    else:
        print("dynamic build - make sure to have python3.x-framework installed")
    bldroot = env.Dir('.').abspath
    binary = env['BINARYKIND']
     

    commands.getoutput(cmd)
    cmd = 'cp %s/release/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
    commands.getoutput(cmd)
    if env['WITH_OSX_STATICPYTHON']:
        cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
        commands.getoutput(cmd)
        cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
        commands.getoutput(cmd) 

    if binary == 'blender':#not copy everything for blenderplayer
        cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)

        if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
            if lenv['BF_DEBUG']:
                lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
        if  lenv['OURPLATFORM']=='linux':
            if lenv['WITH_BF_PYTHON']:
                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
        if  lenv['OURPLATFORM']=='sunos5':





    return 'r' + build_rev


# copied from: http://www.scons.org/wiki/AutoconfRecipes
def checkEndian():
    import struct
    array = struct.pack('cccc', '\x01', '\x02', '\x03', '\x04')
    i = struct.unpack('i', array)
    # Little Endian
    if i == struct.unpack('<i', array):
        return "little"
    # Big Endian
    elif i == struct.unpack('>i', array):
        return "big"
    else:
        raise Exception("cant find endian")


# This is used in creating the local config directories
VERSION, VERSION_DISPLAY = get_version()
REVISION = get_revision()
ENDIAN = checkEndian()


def print_arguments(args, bc):
    if len(args):


def validate_arguments(args, bc):
    opts_list = [
            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 
            'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
            'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
            'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH', 'WITH_BF_STATICLIBSAMPLERATE', 'BF_LIBSAMPLERATE_LIB_STATIC',

        ('BF_PYTHON_LIBPATH', 'Library path', ''),
        ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),
        (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
        (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
        ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),

        (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),

        extension = '.tar.bz2'

    platform = env['OURPLATFORM'].split('-')[0]
    if platform == 'linux':
        import platform

        bitness = platform.architecture()[0]

Lines 1-4 Link Here

(-)doc/build_systems/scons-dev.txt (-2 / +2 lines)
1	$Id: scons-dev.txt 32452 2010-10-13 14:44:22Z mindrones $	1	$Id: scons-dev.txt 39584 2011-08-21 13:31:46Z nazgul $
2		2
3		3
4	Internals of Blenders SCons scripts	4	Internals of Blenders SCons scripts
Lines 27-33 Link Here
27	filenames have the form (platform)-config.py, where platform one of:	27	filenames have the form (platform)-config.py, where platform one of:
28		28
29	* darwin	29	* darwin
30	* linux2	30	* linux
31	* win32-mingw	31	* win32-mingw
32	* win32-vc	32	* win32-vc
33		33

Lines 1-4 Link Here

(-)doc/build_systems/scons.txt (-2 / +2 lines)
1	$Id: scons.txt 32452 2010-10-13 14:44:22Z mindrones $	1	$Id: scons.txt 39584 2011-08-21 13:31:46Z nazgul $
2		2
3	Blenders SCons build scripts	3	Blenders SCons build scripts
4	============================	4	============================
Lines 76-82 Link Here
76	$BLENDERHOME/config. Your platform specific defaults are in	76	$BLENDERHOME/config. Your platform specific defaults are in
77	(platform)-config.py, where platform is one of:	77	(platform)-config.py, where platform is one of:
78		78
79	- linux2, for machines running Linux	79	- linux, for machines running Linux
80	- win32-vc, for Windows machines, compiling with a Microsoft compiler	80	- win32-vc, for Windows machines, compiling with a Microsoft compiler
81	- win32-mingw, for Windows machines, compiling with the MingW compiler	81	- win32-mingw, for Windows machines, compiling with the MingW compiler
82	- darwin, for OS X machines	82	- darwin, for OS X machines

Lines 11-20 Link Here

(-)extern/bullet2/src/SConscript (-2 / +2 lines)
11	defs += ' WIN32 NDEBUG _WINDOWS'	11	defs += ' WIN32 NDEBUG _WINDOWS'
12	#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']	12	#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
13	cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']	13	cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
14	elif env['OURPLATFORM']=='win32-mingw':	14	elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
15	defs += ' NDEBUG'	15	defs += ' NDEBUG'
16	cflags += ['-O2']	16	cflags += ['-O2']
17	elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':	17	elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'):
18	defs += ' NDEBUG'	18	defs += ' NDEBUG'
19	cflags += ['-O2']	19	cflags += ['-O2']
20	elif sys.platform=='darwin':	20	elif sys.platform=='darwin':

Lines 11-20 Link Here

(-)extern/eltopo/SConscript (-2 / +2 lines)
11	defs += ' WIN32 NDEBUG _WINDOWS'	11	defs += ' WIN32 NDEBUG _WINDOWS'
12	#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']	12	#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
13	cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']	13	cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
14	elif env['OURPLATFORM']=='win32-mingw':	14	elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
15	defs += ' NDEBUG'	15	defs += ' NDEBUG'
16	cflags += ['-O2']	16	cflags += ['-O2']
17	elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':	17	elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'):
18	defs += ' NDEBUG'	18	defs += ' NDEBUG'
19	cflags += ['-O2']	19	cflags += ['-O2']
20	elif sys.platform=='darwin':	20	elif sys.platform=='darwin':

Lines 26-32 Link Here

(-)intern/ghost/SConscript (-2 / +2 lines)
26	pass	26	pass
27	incs += ' ' + env['BF_SDL_INC']	27	incs += ' ' + env['BF_SDL_INC']
28	defs += ['WITH_GHOST_SDL']	28	defs += ['WITH_GHOST_SDL']
29	elif window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'):	29	elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'):
30	for f in pf:	30	for f in pf:
31	try:	31	try:
32	sources.remove('intern' + os.sep + f + 'Win32.cpp')	32	sources.remove('intern' + os.sep + f + 'Win32.cpp')
Lines 81-87 Link Here
81	if env['WITH_BF_3DMOUSE']:	81	if env['WITH_BF_3DMOUSE']:
82	defs.append('WITH_INPUT_NDOF')	82	defs.append('WITH_INPUT_NDOF')
83		83
84	if env['OURPLATFORM']=='linux2':	84	if env['OURPLATFORM']=='linux':
85	incs += ' ' + env['BF_3DMOUSE_INC']	85	incs += ' ' + env['BF_3DMOUSE_INC']
86	else:	86	else:
87	sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp')	87	sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp')

Lines 11-17 Link Here

(-)source/blender/blenpluginapi/SConscript (-1 / +1 lines)
11	defs.append('WITH_QUICKTIME')	11	defs.append('WITH_QUICKTIME')
12	incs += ' ' + env['BF_QUICKTIME_INC']	12	incs += ' ' + env['BF_QUICKTIME_INC']
13		13
14	if env['OURPLATFORM'] == 'linux2':	14	if env['OURPLATFORM'] == 'linux':
15	cflags='-pthread'	15	cflags='-pthread'
16	incs += ' ../../../extern/binreloc/include'	16	incs += ' ../../../extern/binreloc/include'
17		17

Lines 7-13 Link Here

(-)source/blender/editors/armature/SConscript (-1 / +1 lines)
7	incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'	7	incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
8	incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'	8	incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
9		9
10	if env['OURPLATFORM'] == 'linux2':	10	if env['OURPLATFORM'] == 'linux':
11	cflags='-pthread'	11	cflags='-pthread'
12	incs += ' ../../../extern/binreloc/include'	12	incs += ' ../../../extern/binreloc/include'
13		13

Lines 8-14 Link Here

(-)source/blender/editors/mesh/SConscript (-1 / +1 lines)
8	incs += ' ../../gpu ../../blenloader'	8	incs += ' ../../gpu ../../blenloader'
9	incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'	9	incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
10		10
11	if env['OURPLATFORM'] == 'linux2':	11	if env['OURPLATFORM'] == 'linux':
12	cflags='-pthread'	12	cflags='-pthread'
13	incs += ' ../../../extern/binreloc/include'	13	incs += ' ../../../extern/binreloc/include'
14		14




#!/usr/bin/python
Import ('env')

sources = env.Glob('*.c') + env.Glob('*.cpp')

incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc ../../blenloader'
incs += ' ../../makesrna ../../python ../../ikplugin'
incs += ' ../../render/extern/include ../../gpu' # for object_bake.c
incs += ' #extern/recastnavigation/Recast/Include'

defs = []

if env['OURPLATFORM'] == 'linux':
    cflags='-pthread'
    incs += ' ../../../extern/binreloc/include'



if env['WITH_BF_PYTHON']:
    defs.append('WITH_PYTHON')
  
if env['WITH_BF_GAMEENGINE']:
    defs.append('WITH_GAMEENGINE')

env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] )

Lines 10-16 Link Here

(-)source/blender/editors/physics/SConscript (-1 / +1 lines)
10		10
11	defs = ''	11	defs = ''
12		12
13	if env['OURPLATFORM'] == 'linux2':	13	if env['OURPLATFORM'] == 'linux':
14	cflags='-pthread'	14	cflags='-pthread'
15	incs += ' ../../../extern/binreloc/include'	15	incs += ' ../../../extern/binreloc/include'
16		16

Lines 9-15 Link Here

(-)source/blender/editors/render/SConscript (-1 / +1 lines)
9	incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'	9	incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
10	incs += ' ../../blenloader'	10	incs += ' ../../blenloader'
11		11
12	if env['OURPLATFORM'] == 'linux2':	12	if env['OURPLATFORM'] == 'linux':
13	cflags='-pthread'	13	cflags='-pthread'
14	incs += ' ../../../extern/binreloc/include'	14	incs += ' ../../../extern/binreloc/include'
15		15

Lines 10-16 Link Here

(-)source/blender/editors/screen/SConscript (-1 / +1 lines)
10		10
11	defs = ''	11	defs = ''
12		12
13	if env['OURPLATFORM'] == 'linux2':	13	if env['OURPLATFORM'] == 'linux':
14	cflags='-pthread'	14	cflags='-pthread'
15	incs += ' ../../../extern/binreloc/include'	15	incs += ' ../../../extern/binreloc/include'
16		16

Lines 10-16 Link Here

(-)source/blender/editors/sculpt_paint/SConscript (-1 / +1 lines)
10	incs += ' ../../render/extern/include'	10	incs += ' ../../render/extern/include'
11	incs += ' ../../gpu ../../makesrna ../../blenloader'	11	incs += ' ../../gpu ../../makesrna ../../blenloader'
12		12
13	if env['OURPLATFORM'] == 'linux2':	13	if env['OURPLATFORM'] == 'linux':
14	cflags='-pthread'	14	cflags='-pthread'
15	incs += ' ../../../extern/binreloc/include'	15	incs += ' ../../../extern/binreloc/include'
16		16

Lines 19-25 Link Here

(-)source/blender/editors/space_file/SConscript (-1 / +1 lines)
19	if env['WITH_BF_TIFF']:	19	if env['WITH_BF_TIFF']:
20	defs.append('WITH_TIFF')	20	defs.append('WITH_TIFF')
21		21
22	if env['OURPLATFORM'] == 'linux2':	22	if env['OURPLATFORM'] == 'linux':
23	cflags='-pthread'	23	cflags='-pthread'
24	incs += ' ../../../extern/binreloc/include'	24	incs += ' ../../../extern/binreloc/include'
25		25

Lines 15-21 Link Here

(-)source/blender/editors/space_node/SConscript (-1 / +1 lines)
15	#cf.append('-Werror')	15	#cf.append('-Werror')
16	pass	16	pass
17		17
18	if env['OURPLATFORM'] == 'linux2':	18	if env['OURPLATFORM'] == 'linux':
19	cflags='-pthread'	19	cflags='-pthread'
20	incs += ' ../../../extern/binreloc/include'	20	incs += ' ../../../extern/binreloc/include'
21		21

Lines 9-14 Link Here

(-)source/blender/makesrna/SConscript (-1 / +2 lines)
9	incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'	9	incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
10	incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'	10	incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
11	incs += ' ../render/extern/include'	11	incs += ' ../render/extern/include'
		12	incs += ' ../nodes'
12	incs += ' #/extern/glew/include'	13	incs += ' #/extern/glew/include'
13		14
14	defs = []	15	defs = []
Lines 54-60 Link Here
54	if env['WITH_BF_COLLADA']:	55	if env['WITH_BF_COLLADA']:
55	defs.append('WITH_COLLADA')	56	defs.append('WITH_COLLADA')
56		57
57	if env['OURPLATFORM'] == 'linux2':	58	if env['OURPLATFORM'] == 'linux':
58	cflags='-pthread'	59	cflags='-pthread'
59	incs += ' ../../../extern/binreloc/include'	60	incs += ' ../../../extern/binreloc/include'
60		61




    defs.append('WITH_GAMEENGINE')
    
if env['WITH_BF_FFTW3']:
    defs.append('WITH_FFTW3')

if env['WITH_BF_SDL']:
    defs.append('WITH_SDL')

if env['WITH_BF_COLLADA']:
    defs.append('WITH_COLLADA')

if env['OURPLATFORM'] == 'linux':
    cflags='-pthread'
    incs += ' ../../../extern/binreloc/include'


if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
    targetpath = '#' + targetpath

if env['OURPLATFORM'] == 'linux' and root_build_dir[0]==os.sep:
    makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
else:
    makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])

Lines 26-32 Link Here

(-)source/blender/nodes/SConscript (-1 / +1 lines)
26	if env['BF_DEBUG']:	26	if env['BF_DEBUG']:
27	defs.append('_DEBUG')	27	defs.append('_DEBUG')
28		28
29	if env['OURPLATFORM'] == 'linux2':	29	if env['OURPLATFORM'] == 'linux':
30	cflags='-pthread'	30	cflags='-pthread'
31	incs += ' ../../../extern/binreloc/include'	31	incs += ' ../../../extern/binreloc/include'
32		32

Lines 31-37 Link Here

(-)source/blender/render/SConscript (-1 / +1 lines)
31	cflags_raytrace = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']	31	cflags_raytrace = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
32	cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']	32	cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
33		33
34	if env['OURPLATFORM'] == 'linux2':	34	if env['OURPLATFORM'] == 'linux':
35	if env['WITH_BF_RAYOPTIMIZATION']:	35	if env['WITH_BF_RAYOPTIMIZATION']:
36	cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']	36	cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
37	cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']	37	cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']

Lines 26-32 Link Here

(-)source/blender/windowmanager/SConscript (-2 / +2 lines)
26	if env['WITH_BF_COLLADA']:	26	if env['WITH_BF_COLLADA']:
27	defs.append('WITH_COLLADA')	27	defs.append('WITH_COLLADA')
28		28
29	if env['OURPLATFORM'] == 'linux2':	29	if env['OURPLATFORM'] == 'linux':
30	cflags='-pthread'	30	cflags='-pthread'
31	incs += ' ../../../extern/binreloc/include'	31	incs += ' ../../../extern/binreloc/include'
32		32
Lines 37-42 Link Here
37	sources.remove('intern' + os.sep + 'wm_apple.c')	37	sources.remove('intern' + os.sep + 'wm_apple.c')
38		38
39	if env['BF_BUILDINFO']:	39	if env['BF_BUILDINFO']:
40	defs.append('NAN_BUILDINFO')	40	defs.append('WITH_BUILDINFO')
41		41
42	env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] )	42	env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] )

Return to bug 382097

Lines 206-212 Link Here

(-)build_files/scons/tools/Blender.py (-15 / +19 lines)
206	if lenv['WITH_BF_STATICJEMALLOC']:	206	if lenv['WITH_BF_STATICJEMALLOC']:
207	statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC'])	207	statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC'])
208		208
209	if lenv['OURPLATFORM']=='linux2':	209	if lenv['OURPLATFORM']=='linux':
210	if lenv['WITH_BF_3DMOUSE']:	210	if lenv['WITH_BF_3DMOUSE']:
211	libincs += Split(lenv['BF_3DMOUSE_LIBPATH'])	211	libincs += Split(lenv['BF_3DMOUSE_LIBPATH'])
212	if lenv['WITH_BF_STATIC3DMOUSE']:	212	if lenv['WITH_BF_STATIC3DMOUSE']:
Lines 277-283 Link Here
277	if not lenv['WITH_BF_STATICJEMALLOC']:	277	if not lenv['WITH_BF_STATICJEMALLOC']:
278	syslibs += Split(lenv['BF_JEMALLOC_LIB'])	278	syslibs += Split(lenv['BF_JEMALLOC_LIB'])
279		279
280	if lenv['OURPLATFORM']=='linux2':	280	if lenv['OURPLATFORM']=='linux':
281	if lenv['WITH_BF_3DMOUSE']:	281	if lenv['WITH_BF_3DMOUSE']:
282	if not lenv['WITH_BF_STATIC3DMOUSE']:	282	if not lenv['WITH_BF_STATIC3DMOUSE']:
283	syslibs += Split(lenv['BF_3DMOUSE_LIB'])	283	syslibs += Split(lenv['BF_3DMOUSE_LIB'])
Lines 364-379 Link Here
364		364
365	obj = []	365	obj = []
366	if lenv['BF_BUILDINFO']:	366	if lenv['BF_BUILDINFO']:
367	lenv.Append (CPPDEFINES = ['BUILD_TIME="%s"'%(build_time),	367	lenv.Append (CPPDEFINES = ['BUILD_TIME=\\"%s\\"'%(build_time),
368	'BUILD_DATE="%s"'%(build_date),	368	'BUILD_DATE=\\"%s\\"'%(build_date),
369	'BUILD_TYPE="%s"'%(build_type),	369	'BUILD_TYPE=\\"%s\\"'%(build_type),
370	'BUILD_REV="%s"'%(build_rev),	370	'BUILD_REV=\\"%s\\"'%(build_rev),
371	'NAN_BUILDINFO',	371	'WITH_BUILDINFO',
372	'BUILD_PLATFORM="%s:%s"'%(platform.system(), platform.architecture()[0]),	372	'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
373	'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),	373	'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
374	'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),	374	'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
375	'BUILD_LINKFLAGS=\\"%s\\"'%(build_linkflags),	375	'BUILD_LINKFLAGS=\\"%s\\"'%(build_linkflags),
376	'BUILD_SYSTEM="SCons"'	376	'BUILD_SYSTEM=\\"SCons\\"'
377	])	377	])
378		378
379	lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])	379	lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])
Lines 536-542 Link Here
536	print("Installing to %s"%(installdir))	536	print("Installing to %s"%(installdir))
537	# TODO, use tar.	537	# TODO, use tar.
538	python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip	538	python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
539	print("unzipping to app-bundle: %s"%(python_zip))	539	if env['WITH_OSX_STATICPYTHON']:
		540	print("unzipping to app-bundle: %s"%(python_zip))
		541	else:
		542	print("dynamic build - make sure to have python3.x-framework installed")
540	bldroot = env.Dir('.').abspath	543	bldroot = env.Dir('.').abspath
541	binary = env['BINARYKIND']	544	binary = env['BINARYKIND']
542		545
Lines 569-578 Link Here
569	commands.getoutput(cmd)	572	commands.getoutput(cmd)
570	cmd = 'cp %s/release/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)	573	cmd = 'cp %s/release/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
571	commands.getoutput(cmd)	574	commands.getoutput(cmd)
572	cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)	575	if env['WITH_OSX_STATICPYTHON']:
573	commands.getoutput(cmd)	576	cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
574	cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)	577	commands.getoutput(cmd)
575	commands.getoutput(cmd)	578	cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
		579	commands.getoutput(cmd)
576		580
577	if binary == 'blender':#not copy everything for blenderplayer	581	if binary == 'blender':#not copy everything for blenderplayer
578	cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)	582	cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
Lines 775-781 Link Here
775	if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):	779	if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
776	if lenv['BF_DEBUG']:	780	if lenv['BF_DEBUG']:
777	lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])	781	lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
778	if lenv['OURPLATFORM']=='linux2':	782	if lenv['OURPLATFORM']=='linux':
779	if lenv['WITH_BF_PYTHON']:	783	if lenv['WITH_BF_PYTHON']:
780	lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])	784	lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
781	if lenv['OURPLATFORM']=='sunos5':	785	if lenv['OURPLATFORM']=='sunos5':

Lines 63-71 Link Here

(-)build_files/scons/tools/btools.py (-2 / +21 lines)
63		63
64	return 'r' + build_rev	64	return 'r' + build_rev
65		65
		66
		67	# copied from: http://www.scons.org/wiki/AutoconfRecipes
		68	def checkEndian():
		69	import struct
		70	array = struct.pack('cccc', '\x01', '\x02', '\x03', '\x04')
		71	i = struct.unpack('i', array)
		72	# Little Endian
		73	if i == struct.unpack('<i', array):
		74	return "little"
		75	# Big Endian
		76	elif i == struct.unpack('>i', array):
		77	return "big"
		78	else:
		79	raise Exception("cant find endian")
		80
		81
66	# This is used in creating the local config directories	82	# This is used in creating the local config directories
67	VERSION, VERSION_DISPLAY = get_version()	83	VERSION, VERSION_DISPLAY = get_version()
68	REVISION = get_revision()	84	REVISION = get_revision()
		85	ENDIAN = checkEndian()
		86
69		87
70	def print_arguments(args, bc):	88	def print_arguments(args, bc):
71	if len(args):	89	if len(args):
Lines 78-84 Link Here
78		96
79	def validate_arguments(args, bc):	97	def validate_arguments(args, bc):
80	opts_list = [	98	opts_list = [
81	'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',	99	'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
82	'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',	100	'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
83	'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',	101	'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
84	'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH', 'WITH_BF_STATICLIBSAMPLERATE', 'BF_LIBSAMPLERATE_LIB_STATIC',	102	'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH', 'WITH_BF_STATICLIBSAMPLERATE', 'BF_LIBSAMPLERATE_LIB_STATIC',
Lines 230-235 Link Here
230	('BF_PYTHON_LIBPATH', 'Library path', ''),	248	('BF_PYTHON_LIBPATH', 'Library path', ''),
231	('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),	249	('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),
232	(BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),	250	(BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
		251	(BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
233	('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),	252	('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
234		253
235	(BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),	254	(BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),
Lines 568-574 Link Here
568	extension = '.tar.bz2'	587	extension = '.tar.bz2'
569		588
570	platform = env['OURPLATFORM'].split('-')[0]	589	platform = env['OURPLATFORM'].split('-')[0]
571	if platform == 'linux2':	590	if platform == 'linux':
572	import platform	591	import platform
573		592
574	bitness = platform.architecture()[0]	593	bitness = platform.architecture()[0]

Lines 1-16 Link Here

(-)source/blender/editors/object/SConscript (-2 / +6 lines)
1	#!/usr/bin/python	1	#!/usr/bin/python
2	Import ('env')	2	Import ('env')
3		3
4	sources = env.Glob('*.c')	4	sources = env.Glob('.c') + env.Glob('.cpp')
5		5
6	incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'	6	incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
7	incs += ' ../../windowmanager #/intern/guardedalloc ../../blenloader'	7	incs += ' ../../windowmanager #/intern/guardedalloc ../../blenloader'
8	incs += ' ../../makesrna ../../python ../../ikplugin'	8	incs += ' ../../makesrna ../../python ../../ikplugin'
9	incs += ' ../../render/extern/include ../../gpu' # for object_bake.c	9	incs += ' ../../render/extern/include ../../gpu' # for object_bake.c
		10	incs += ' #extern/recastnavigation/Recast/Include'
10		11
11	defs = []	12	defs = []
12		13
13	if env['OURPLATFORM'] == 'linux2':	14	if env['OURPLATFORM'] == 'linux':
14	cflags='-pthread'	15	cflags='-pthread'
15	incs += ' ../../../extern/binreloc/include'	16	incs += ' ../../../extern/binreloc/include'
16		17
Lines 19-23 Link Here
19		20
20	if env['WITH_BF_PYTHON']:	21	if env['WITH_BF_PYTHON']:
21	defs.append('WITH_PYTHON')	22	defs.append('WITH_PYTHON')
		23
		24	if env['WITH_BF_GAMEENGINE']:
		25	defs.append('WITH_GAMEENGINE')
22		26
23	env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] )	27	env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] )

Lines 71-77 Link Here

(-)source/blender/makesrna/intern/SConscript (-3 / +3 lines)
71	defs.append('WITH_GAMEENGINE')	71	defs.append('WITH_GAMEENGINE')
72		72
73	if env['WITH_BF_FFTW3']:	73	if env['WITH_BF_FFTW3']:
74	defs.append('FFTW3=1')	74	defs.append('WITH_FFTW3')
75		75
76	if env['WITH_BF_SDL']:	76	if env['WITH_BF_SDL']:
77	defs.append('WITH_SDL')	77	defs.append('WITH_SDL')
Lines 91-97 Link Here
91	if env['WITH_BF_COLLADA']:	91	if env['WITH_BF_COLLADA']:
92	defs.append('WITH_COLLADA')	92	defs.append('WITH_COLLADA')
93		93
94	if env['OURPLATFORM'] == 'linux2':	94	if env['OURPLATFORM'] == 'linux':
95	cflags='-pthread'	95	cflags='-pthread'
96	incs += ' ../../../extern/binreloc/include'	96	incs += ' ../../../extern/binreloc/include'
97		97
Lines 140-146 Link Here
140	if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):	140	if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
141	targetpath = '#' + targetpath	141	targetpath = '#' + targetpath
142		142
143	if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep:	143	if env['OURPLATFORM'] == 'linux' and root_build_dir[0]==os.sep:
144	makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])	144	makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
145	else:	145	else:
146	makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])	146	makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])