file I modified for the other patch. So I'm being bad and combining them together. First one is added -lXi to LLIBS for solaris. (Makes it so it compiles again with the tablet stuff added) Second one is the real commit its an expansion of patch #4458 This adds optional ICONV lining to support international fonts in the file selector. Thanks to wisit venita (dripstone) I mostly just cleaned it up a little and made it optional via defines. Its currently turned off for all platforms except for solaris on scons. For scons see your config/(platform).py file look for WITH_BF_ICONV For the Makefiles look at source/nan_definitions.mk look for WITH_ICONV (basically you'll want to export WITH_ICONV=true and possibly set some other stuff) Let me know if there are any problems. Kent -- mein@cs.umn.edu
61 lines
2.0 KiB
Python
61 lines
2.0 KiB
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
# TODO: src_env.Append (CCFLAGS = user_options_dict['SDL_CFLAGS'])
|
|
|
|
sources = env.Glob('*.c')
|
|
|
|
incs = ' #/intern/guardedalloc #/intern/memutil'
|
|
incs += ' ../blenlib ../makesdna ../blenkernel'
|
|
incs += ' ../include #/intern/bmfont ../imbuf ../render/extern/include'
|
|
incs += ' #/intern/bsp/extern ../radiosity/extern/include'
|
|
incs += ' #/intern/decimation/extern ../blenloader ../python'
|
|
incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue'
|
|
incs += ' ../quicktime #/intern/elbeem/extern'
|
|
incs += ' #/intern/ghost #/intern/opennl/extern'
|
|
|
|
incs += ' ' + env['BF_PYTHON_INC']
|
|
incs += ' ' + env['BF_SDL_INC']
|
|
incs += ' ' + env['BF_OPENGL_INC']
|
|
|
|
defs = []
|
|
|
|
if env['WITH_BF_YAFRAY'] == 0:
|
|
defs.append('DISABLE_YAFRAY')
|
|
|
|
if env['WITH_BF_INTERNATIONAL'] == 1:
|
|
incs += ' ../ftfont'
|
|
defs.append('INTERNATIONAL')
|
|
defs.append('FTGL_STATIC_LIBRARY')
|
|
|
|
if env['WITH_BF_OPENEXR'] == 1:
|
|
defs.append('WITH_OPENEXR')
|
|
|
|
if env['WITH_BF_QUICKTIME']==1:
|
|
incs += ' ' + env['BF_QUICKTIME_INC']
|
|
defs.append('WITH_QUICKTIME')
|
|
|
|
if env['WITH_BF_ICONV'] == 1:
|
|
incs += ' ' + env['BF_ICONV_INC']
|
|
defs.append('WITH_ICONV')
|
|
|
|
if env['WITH_BF_FFMPEG'] == 1:
|
|
defs.append('WITH_FFMPEG')
|
|
incs += ' ' + env['BF_FFMPEG_INC']
|
|
|
|
if env['WITH_BF_VERSE']:
|
|
defs.append('WITH_VERSE')
|
|
incs += ' ' + env['BF_VERSE_INCLUDE']
|
|
|
|
# TODO buildinfo
|
|
if env['BF_BUILDINFO'] == 1:
|
|
defs.append('NAN_BUILDINFO')
|
|
|
|
if env['OURPLATFORM'] == 'win32-mingw':
|
|
s1 = sources[:len(sources)/2]
|
|
s2 = sources[len(sources)/2:len(sources)]
|
|
env.BlenderLib ( libname = 'src1', sources = s1, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] )
|
|
env.BlenderLib ( libname = 'src2', sources = s2, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [6, 26] )
|
|
else:
|
|
env.BlenderLib ( libname = 'src', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] )
|