Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't install LICENSE-bmonofont-i18n.ttf.txt unless international fonts are enabled.

Browse Source
This commit is contained in:
Irie Shinsuke
2013-09-25 19:18:28 +00:00
parent c4bad6868f
commit e9859bb0e5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@@ -907,9 +907,9 @@ for tp, tn, tf in os.walk('release/text'):
textlist.append(tp+os.sep+f) textlist.append(tp+os.sep+f)
# Font licenses # Font licenses
textlist += ['release/datafiles/LICENSE-bfont.ttf.txt', 'release/datafiles/LICENSE-bmonofont-i18n.ttf.txt'] textlist.append('release/datafiles/LICENSE-bfont.ttf.txt')
if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_INTERNATIONAL']:
textlist.append('release/datafiles/LICENSE-droidsans.ttf.txt') textlist += ['release/datafiles/LICENSE-droidsans.ttf.txt', 'release/datafiles/LICENSE-bmonofont-i18n.ttf.txt']
textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist) textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)

2
source/creator/CMakeLists.txt
View File

@@ -235,12 +235,12 @@ set(BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/copyright.txt ${CMAKE_SOURCE_DIR}/release/text/copyright.txt
${CMAKE_SOURCE_DIR}/release/text/readme.html ${CMAKE_SOURCE_DIR}/release/text/readme.html
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
) )
if(WITH_INTERNATIONAL) if(WITH_INTERNATIONAL)
list(APPEND BLENDER_TEXT_FILES list(APPEND BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
) )
endif() endif()