Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 377479
Collapse All | Expand All

(-)intern/ghost/SConscript (-2 / +2 lines)
Lines 26-32 Link Here
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')
(-)source/blender/render/SConscript (-1 / +1 lines)
Lines 31-37 Link Here
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']
(-)source/blender/blenpluginapi/SConscript (-1 / +1 lines)
Lines 11-17 Link Here
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
(-)source/blender/makesrna/intern/SConscript (-2 / +2 lines)
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'])
(-)source/blender/makesrna/SConscript (-1 / +1 lines)
Lines 54-60 Link Here
54
if env['WITH_BF_COLLADA']:
54
if env['WITH_BF_COLLADA']:
55
    defs.append('WITH_COLLADA')
55
    defs.append('WITH_COLLADA')
56
56
57
if env['OURPLATFORM'] == 'linux2':
57
if env['OURPLATFORM'] == 'linux':
58
    cflags='-pthread'
58
    cflags='-pthread'
59
    incs += ' ../../../extern/binreloc/include'
59
    incs += ' ../../../extern/binreloc/include'
60
60
(-)source/blender/windowmanager/SConscript (-1 / +1 lines)
Lines 26-32 Link Here
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
(-)source/blender/nodes/SConscript (-1 / +1 lines)
Lines 26-32 Link Here
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
(-)source/blender/editors/screen/SConscript (-1 / +1 lines)
Lines 10-16 Link Here
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
(-)source/blender/editors/physics/SConscript (-1 / +1 lines)
Lines 10-16 Link Here
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
(-)source/blender/editors/sculpt_paint/SConscript (-1 / +1 lines)
Lines 10-16 Link Here
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
(-)source/blender/editors/render/SConscript (-1 / +1 lines)
Lines 9-15 Link Here
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
(-)source/blender/editors/armature/SConscript (-1 / +1 lines)
Lines 7-13 Link Here
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
(-)source/blender/editors/space_file/SConscript (-1 / +1 lines)
Lines 19-25 Link Here
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
(-)source/blender/editors/mesh/SConscript (-1 / +1 lines)
Lines 8-14 Link Here
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
(-)source/blender/editors/space_node/SConscript (-1 / +1 lines)
Lines 15-21 Link Here
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
(-)source/blender/editors/object/SConscript (-1 / +1 lines)
Lines 10-16 Link Here
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
(-)build_files/scons/tools/Blender.py (-3 / +3 lines)
Lines 206-212 Link Here
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 775-781 Link Here
775
        if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
775
        if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
776
            if lenv['BF_DEBUG']:
776
            if lenv['BF_DEBUG']:
777
                lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
777
                lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
778
        if  lenv['OURPLATFORM']=='linux2':
778
        if  lenv['OURPLATFORM']=='linux':
779
            if lenv['WITH_BF_PYTHON']:
779
            if lenv['WITH_BF_PYTHON']:
780
                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
780
                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
781
        if  lenv['OURPLATFORM']=='sunos5':
781
        if  lenv['OURPLATFORM']=='sunos5':
(-)build_files/scons/tools/btools.py (-1 / +1 lines)
Lines 568-574 Link Here
568
        extension = '.tar.bz2'
568
        extension = '.tar.bz2'
569
569
570
    platform = env['OURPLATFORM'].split('-')[0]
570
    platform = env['OURPLATFORM'].split('-')[0]
571
    if platform == 'linux2':
571
    if platform == 'linux':
572
        import platform
572
        import platform
573
573
574
        bitness = platform.architecture()[0]
574
        bitness = platform.architecture()[0]
(-)build_files/scons/config/linux2-config.py (-249 lines)
Lines 1-249 Link Here
1
LCGDIR = '../lib/linux2'
2
LIBDIR = "${LCGDIR}"
3
4
BF_PYTHON_ABI_FLAGS = 'm'  # Most common for linux distros
5
BF_PYTHON = '/usr'
6
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
7
BF_PYTHON_VERSION = '3.2'
8
WITH_BF_STATICPYTHON = False
9
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
10
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
11
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'  # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
12
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
13
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
14
15
WITH_BF_OPENAL = True
16
WITH_BF_STATICOPENAL = False
17
BF_OPENAL = '/usr'
18
BF_OPENAL_INC = '${BF_OPENAL}/include'
19
BF_OPENAL_LIB = 'openal'
20
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
21
22
BF_CXX = '/usr'
23
WITH_BF_STATICCXX = False
24
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
25
26
BF_LIBSAMPLERATE = '/usr'
27
WITH_BF_STATICLIBSAMPLERATE = False
28
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
29
BF_LIBSAMPLERATE_LIB = 'samplerate'
30
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
31
BF_LIBSAMPLERATE_LIB_STATIC = '${BF_LIBSAMPLERATE}/lib/libsamplerate.a'
32
33
WITH_BF_JACK = False
34
BF_JACK = '/usr'
35
BF_JACK_INC = '${BF_JACK}/include/jack'
36
BF_JACK_LIB = 'jack'
37
BF_JACK_LIBPATH = '${BF_JACK}/lib'
38
39
WITH_BF_SNDFILE = False
40
WITH_BF_STATICSNDFILE = False
41
BF_SNDFILE = '/usr'
42
BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
43
BF_SNDFILE_LIB = 'sndfile'
44
BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
45
BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
46
47
WITH_BF_SDL = True
48
BF_SDL = '/usr' #$(shell sdl-config --prefix)
49
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
50
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
51
52
WITH_BF_OPENEXR = True
53
WITH_BF_STATICOPENEXR = False
54
BF_OPENEXR = '/usr'
55
# when compiling with your own openexr lib you might need to set...
56
# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
57
58
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
59
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
60
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
61
# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
62
63
64
WITH_BF_DDS = True
65
66
WITH_BF_JPEG = True
67
BF_JPEG = '/usr'
68
BF_JPEG_INC = '${BF_JPEG}/include'
69
BF_JPEG_LIB = 'jpeg'
70
71
WITH_BF_PNG = True
72
BF_PNG = '/usr'
73
BF_PNG_INC = '${BF_PNG}/include'
74
BF_PNG_LIB = 'png'
75
76
WITH_BF_TIFF = True
77
BF_TIFF = '/usr'
78
BF_TIFF_INC = '${BF_TIFF}/include'
79
BF_TIFF_LIB = 'tiff'
80
81
WITH_BF_ZLIB = True
82
BF_ZLIB = '/usr'
83
BF_ZLIB_INC = '${BF_ZLIB}/include'
84
BF_ZLIB_LIB = 'z'
85
86
WITH_BF_INTERNATIONAL = True
87
88
BF_GETTEXT = '/usr'
89
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
90
BF_GETTEXT_LIB = 'gettextlib'
91
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
92
#WITH_BF_GETTEXT_STATIC = True
93
#BF_GETTEXT_LIB_STATIC = '${BF_GETTEXT}/lib/libgettextlib.a'
94
95
WITH_BF_GAMEENGINE = True
96
WITH_BF_PLAYER = True
97
98
WITH_BF_BULLET = True
99
BF_BULLET = '#extern/bullet2/src'
100
BF_BULLET_INC = '${BF_BULLET}'
101
BF_BULLET_LIB = 'extern_bullet'
102
103
# enable freetype2 support for text objects
104
BF_FREETYPE = '/usr'
105
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
106
BF_FREETYPE_LIB = 'freetype'
107
#WITH_BF_FREETYPE_STATIC = True
108
#BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a'
109
110
WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
111
BF_QUICKTIME = '/usr/local'
112
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
113
114
WITH_BF_ICONV = False
115
BF_ICONV = LIBDIR + "/iconv"
116
BF_ICONV_INC = '${BF_ICONV}/include'
117
BF_ICONV_LIB = 'iconv'
118
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
119
120
WITH_BF_BINRELOC = True
121
122
# enable ffmpeg  support
123
WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
124
BF_FFMPEG = '/usr'
125
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
126
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
127
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
128
#WITH_BF_STATICFFMPEG = True
129
#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a'
130
131
# enable ogg, vorbis and theora in ffmpeg
132
WITH_BF_OGG = False  # -DWITH_OGG 
133
BF_OGG = '/usr'
134
BF_OGG_INC = '${BF_OGG}/include'
135
BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
136
137
WITH_BF_OPENJPEG = True 
138
BF_OPENJPEG = '#extern/libopenjpeg'
139
BF_OPENJPEG_LIB = ''
140
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
141
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
142
143
WITH_BF_FFTW3 = False
144
WITH_BF_STATICFFTW3 = False
145
BF_FFTW3 = '/usr'
146
BF_FFTW3_INC = '${BF_FFTW3}/include'
147
BF_FFTW3_LIB = 'fftw3'
148
BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
149
BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a'
150
151
WITH_BF_REDCODE = False  
152
BF_REDCODE = '#extern/libredcode'
153
BF_REDCODE_LIB = ''
154
# BF_REDCODE_INC = '${BF_REDCODE}/include'
155
BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
156
BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
157
158
# Mesa Libs should go here if your using them as well....
159
WITH_BF_STATICOPENGL = False
160
BF_OPENGL = '/usr'
161
BF_OPENGL_INC = '${BF_OPENGL}/include'
162
BF_OPENGL_LIB = 'GL GLU X11 Xi'
163
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
164
BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
165
166
WITH_BF_COLLADA = False
167
BF_COLLADA = '#source/blender/collada'
168
BF_COLLADA_INC = '${BF_COLLADA}'
169
BF_COLLADA_LIB = 'bf_collada'
170
BF_OPENCOLLADA = '/usr'
171
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
172
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
173
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
174
BF_PCRE = ''
175
BF_PCRE_LIB = 'pcre'
176
BF_PCRE_LIBPATH = '/usr/lib'
177
BF_EXPAT = '/usr'
178
BF_EXPAT_LIB = 'expat'
179
BF_EXPAT_LIBPATH = '/usr/lib'
180
181
WITH_BF_JEMALLOC = False
182
WITH_BF_STATICJEMALLOC = False
183
BF_JEMALLOC = '/usr'
184
BF_JEMALLOC_INC = '${BF_JEMALLOC}/include'
185
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
186
BF_JEMALLOC_LIB = 'jemalloc'
187
BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
188
189
WITH_BF_OPENMP = True
190
191
#Ray trace optimization
192
WITH_BF_RAYOPTIMIZATION = True
193
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
194
195
#SpaceNavigator and friends
196
WITH_BF_3DMOUSE = True
197
BF_3DMOUSE = '/usr'
198
BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'
199
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
200
BF_3DMOUSE_LIB = 'spnav'
201
BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
202
203
##
204
CC = 'gcc'
205
CXX = 'g++'
206
##ifeq ($CPU),alpha)
207
##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
208
209
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
210
211
CPPFLAGS = []
212
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
213
# g++ 4.6, only needed for bullet
214
CXXFLAGS += ['-fpermissive']
215
if WITH_BF_FFMPEG:
216
  # libavutil needs UINT64_C()
217
  CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
218
REL_CFLAGS = ['-DNDEBUG', '-O2']
219
REL_CCFLAGS = ['-DNDEBUG', '-O2']
220
##BF_DEPEND = True
221
##
222
##AR = ar
223
##ARFLAGS = ruv
224
##ARFLAGSQUIET = ru
225
##
226
C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-parameter', '-Wstrict-prototypes', '-Werror=declaration-after-statement', '-Werror=implicit-function-declaration', '-Werror=return-type']
227
CC_WARN = ['-Wall']
228
CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
229
230
231
##FIX_STUBS_WARNINGS = -Wno-unused
232
233
LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
234
##LOPTS = --dynamic
235
##DYNLDFLAGS = -shared $(LDFLAGS)
236
237
BF_PROFILE = False
238
BF_PROFILE_CCFLAGS = ['-pg','-g']
239
BF_PROFILE_LINKFLAGS = ['-pg']
240
241
BF_DEBUG = False
242
BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
243
244
BF_BUILDDIR = '../build/linux2'
245
BF_INSTALLDIR='../install/linux2'
246
247
#Link against pthread
248
PLATFORM_LINKFLAGS = ['-pthread']
249
(-)build_files/scons/config/linux-config.py (+249 lines)
Line 0 Link Here
1
LCGDIR = '../lib/linux'
2
LIBDIR = "${LCGDIR}"
3
4
BF_PYTHON_ABI_FLAGS = 'm'  # Most common for linux distros
5
BF_PYTHON = '/usr'
6
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
7
BF_PYTHON_VERSION = '3.2'
8
WITH_BF_STATICPYTHON = False
9
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
10
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
11
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'  # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
12
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
13
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
14
15
WITH_BF_OPENAL = True
16
WITH_BF_STATICOPENAL = False
17
BF_OPENAL = '/usr'
18
BF_OPENAL_INC = '${BF_OPENAL}/include'
19
BF_OPENAL_LIB = 'openal'
20
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
21
22
BF_CXX = '/usr'
23
WITH_BF_STATICCXX = False
24
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
25
26
BF_LIBSAMPLERATE = '/usr'
27
WITH_BF_STATICLIBSAMPLERATE = False
28
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
29
BF_LIBSAMPLERATE_LIB = 'samplerate'
30
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
31
BF_LIBSAMPLERATE_LIB_STATIC = '${BF_LIBSAMPLERATE}/lib/libsamplerate.a'
32
33
WITH_BF_JACK = False
34
BF_JACK = '/usr'
35
BF_JACK_INC = '${BF_JACK}/include/jack'
36
BF_JACK_LIB = 'jack'
37
BF_JACK_LIBPATH = '${BF_JACK}/lib'
38
39
WITH_BF_SNDFILE = False
40
WITH_BF_STATICSNDFILE = False
41
BF_SNDFILE = '/usr'
42
BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
43
BF_SNDFILE_LIB = 'sndfile'
44
BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
45
BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
46
47
WITH_BF_SDL = True
48
BF_SDL = '/usr' #$(shell sdl-config --prefix)
49
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
50
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
51
52
WITH_BF_OPENEXR = True
53
WITH_BF_STATICOPENEXR = False
54
BF_OPENEXR = '/usr'
55
# when compiling with your own openexr lib you might need to set...
56
# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
57
58
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
59
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
60
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
61
# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
62
63
64
WITH_BF_DDS = True
65
66
WITH_BF_JPEG = True
67
BF_JPEG = '/usr'
68
BF_JPEG_INC = '${BF_JPEG}/include'
69
BF_JPEG_LIB = 'jpeg'
70
71
WITH_BF_PNG = True
72
BF_PNG = '/usr'
73
BF_PNG_INC = '${BF_PNG}/include'
74
BF_PNG_LIB = 'png'
75
76
WITH_BF_TIFF = True
77
BF_TIFF = '/usr'
78
BF_TIFF_INC = '${BF_TIFF}/include'
79
BF_TIFF_LIB = 'tiff'
80
81
WITH_BF_ZLIB = True
82
BF_ZLIB = '/usr'
83
BF_ZLIB_INC = '${BF_ZLIB}/include'
84
BF_ZLIB_LIB = 'z'
85
86
WITH_BF_INTERNATIONAL = True
87
88
BF_GETTEXT = '/usr'
89
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
90
BF_GETTEXT_LIB = 'gettextlib'
91
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
92
#WITH_BF_GETTEXT_STATIC = True
93
#BF_GETTEXT_LIB_STATIC = '${BF_GETTEXT}/lib/libgettextlib.a'
94
95
WITH_BF_GAMEENGINE = True
96
WITH_BF_PLAYER = True
97
98
WITH_BF_BULLET = True
99
BF_BULLET = '#extern/bullet2/src'
100
BF_BULLET_INC = '${BF_BULLET}'
101
BF_BULLET_LIB = 'extern_bullet'
102
103
# enable freetype2 support for text objects
104
BF_FREETYPE = '/usr'
105
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
106
BF_FREETYPE_LIB = 'freetype'
107
#WITH_BF_FREETYPE_STATIC = True
108
#BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a'
109
110
WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
111
BF_QUICKTIME = '/usr/local'
112
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
113
114
WITH_BF_ICONV = False
115
BF_ICONV = LIBDIR + "/iconv"
116
BF_ICONV_INC = '${BF_ICONV}/include'
117
BF_ICONV_LIB = 'iconv'
118
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
119
120
WITH_BF_BINRELOC = True
121
122
# enable ffmpeg  support
123
WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
124
BF_FFMPEG = '/usr'
125
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
126
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
127
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
128
#WITH_BF_STATICFFMPEG = True
129
#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a'
130
131
# enable ogg, vorbis and theora in ffmpeg
132
WITH_BF_OGG = False  # -DWITH_OGG 
133
BF_OGG = '/usr'
134
BF_OGG_INC = '${BF_OGG}/include'
135
BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
136
137
WITH_BF_OPENJPEG = True 
138
BF_OPENJPEG = '#extern/libopenjpeg'
139
BF_OPENJPEG_LIB = ''
140
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
141
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
142
143
WITH_BF_FFTW3 = False
144
WITH_BF_STATICFFTW3 = False
145
BF_FFTW3 = '/usr'
146
BF_FFTW3_INC = '${BF_FFTW3}/include'
147
BF_FFTW3_LIB = 'fftw3'
148
BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
149
BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a'
150
151
WITH_BF_REDCODE = False  
152
BF_REDCODE = '#extern/libredcode'
153
BF_REDCODE_LIB = ''
154
# BF_REDCODE_INC = '${BF_REDCODE}/include'
155
BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
156
BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
157
158
# Mesa Libs should go here if your using them as well....
159
WITH_BF_STATICOPENGL = False
160
BF_OPENGL = '/usr'
161
BF_OPENGL_INC = '${BF_OPENGL}/include'
162
BF_OPENGL_LIB = 'GL GLU X11 Xi'
163
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
164
BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
165
166
WITH_BF_COLLADA = False
167
BF_COLLADA = '#source/blender/collada'
168
BF_COLLADA_INC = '${BF_COLLADA}'
169
BF_COLLADA_LIB = 'bf_collada'
170
BF_OPENCOLLADA = '/usr'
171
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
172
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
173
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
174
BF_PCRE = ''
175
BF_PCRE_LIB = 'pcre'
176
BF_PCRE_LIBPATH = '/usr/lib'
177
BF_EXPAT = '/usr'
178
BF_EXPAT_LIB = 'expat'
179
BF_EXPAT_LIBPATH = '/usr/lib'
180
181
WITH_BF_JEMALLOC = False
182
WITH_BF_STATICJEMALLOC = False
183
BF_JEMALLOC = '/usr'
184
BF_JEMALLOC_INC = '${BF_JEMALLOC}/include'
185
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
186
BF_JEMALLOC_LIB = 'jemalloc'
187
BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
188
189
WITH_BF_OPENMP = True
190
191
#Ray trace optimization
192
WITH_BF_RAYOPTIMIZATION = True
193
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
194
195
#SpaceNavigator and friends
196
WITH_BF_3DMOUSE = True
197
BF_3DMOUSE = '/usr'
198
BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'
199
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
200
BF_3DMOUSE_LIB = 'spnav'
201
BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
202
203
##
204
CC = 'gcc'
205
CXX = 'g++'
206
##ifeq ($CPU),alpha)
207
##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
208
209
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
210
211
CPPFLAGS = []
212
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
213
# g++ 4.6, only needed for bullet
214
CXXFLAGS += ['-fpermissive']
215
if WITH_BF_FFMPEG:
216
  # libavutil needs UINT64_C()
217
  CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
218
REL_CFLAGS = ['-DNDEBUG', '-O2']
219
REL_CCFLAGS = ['-DNDEBUG', '-O2']
220
##BF_DEPEND = True
221
##
222
##AR = ar
223
##ARFLAGS = ruv
224
##ARFLAGSQUIET = ru
225
##
226
C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-parameter', '-Wstrict-prototypes', '-Werror=declaration-after-statement', '-Werror=implicit-function-declaration', '-Werror=return-type']
227
CC_WARN = ['-Wall']
228
CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
229
230
231
##FIX_STUBS_WARNINGS = -Wno-unused
232
233
LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
234
##LOPTS = --dynamic
235
##DYNLDFLAGS = -shared $(LDFLAGS)
236
237
BF_PROFILE = False
238
BF_PROFILE_CCFLAGS = ['-pg','-g']
239
BF_PROFILE_LINKFLAGS = ['-pg']
240
241
BF_DEBUG = False
242
BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
243
244
BF_BUILDDIR = '../build/linux'
245
BF_INSTALLDIR='../install/linux'
246
247
#Link against pthread
248
PLATFORM_LINKFLAGS = ['-pthread']
249
0
  + native
250
  + native
1
  + Author Date Id Revision
251
  + Author Date Id Revision
(-)doc/build_systems/scons-dev.txt (-1 / +1 lines)
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
(-)doc/build_systems/scons.txt (-1 / +1 lines)
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
(-)extern/eltopo/SConscript (-2 / +2 lines)
Lines 11-20 Link Here
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':
(-)extern/bullet2/src/SConscript (-2 / +2 lines)
Lines 11-20 Link Here
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':
(-)SConstruct (-2 / +9 lines)
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 551-557 Link Here
551
                    scriptinstall.append(env.Install(dir=dir,source=source))
558
                    scriptinstall.append(env.Install(dir=dir,source=source))
552
559
553
#-- icons
560
#-- icons
554
if env['OURPLATFORM']=='linux2':
561
if env['OURPLATFORM']=='linux':
555
    iconlist = []
562
    iconlist = []
556
    icontargetlist = []
563
    icontargetlist = []
557
564
Lines 630-636 Link Here
630
637
631
if  env['OURPLATFORM']=='darwin':
638
if  env['OURPLATFORM']=='darwin':
632
        allinstall = [blenderinstall, plugininstall, textinstall]
639
        allinstall = [blenderinstall, plugininstall, textinstall]
633
elif env['OURPLATFORM']=='linux2':
640
elif env['OURPLATFORM']=='linux':
634
        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
641
        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
635
else:
642
else:
636
        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
643
        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]

Return to bug 377479