Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIrie Shinsuke <irieshinsuke@yahoo.co.jp>2013-09-25 23:18:28 +0400
committerIrie Shinsuke <irieshinsuke@yahoo.co.jp>2013-09-25 23:18:28 +0400
commite9859bb0e59cd54a5d682a0fc484e2366d5e54fe (patch)
treea46cfe179ab318f8676658c4b9a7097f42f62995
parentc4bad6868fb5a7b9d64a91787d94c58abf663b9a (diff)
Don't install LICENSE-bmonofont-i18n.ttf.txt unless international fonts are enabled.
-rw-r--r--SConstruct4
-rw-r--r--source/creator/CMakeLists.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index 5c81e8b2b7a..862063499a9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -907,9 +907,9 @@ for tp, tn, tf in os.walk('release/text'):
textlist.append(tp+os.sep+f)
# 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']:
- 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)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 53dc7710198..b24339cff1b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -235,12 +235,12 @@ set(BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/copyright.txt
${CMAKE_SOURCE_DIR}/release/text/readme.html
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
- ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
)
if(WITH_INTERNATIONAL)
list(APPEND BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt
+ ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
)
endif()