diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 09:00:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 09:00:53 +0400 |
| commit | 77a7ec7c61965efa9e2e82894c821fe5c937b989 (patch) | |
| tree | 5761c94b242930c1e30d895b72dd3b228a4faff8 /source/creator | |
| parent | 0503a4f7a6fa2aba573ff4f8d4c6d7f387894952 (diff) | |
| parent | a35261cfee1e04bca3366e6967e046cdb00d3d44 (diff) | |
svn merge ^/trunk/blender -r41150:41175
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 27 | ||||
| -rw-r--r-- | source/creator/creator.c | 4 |
2 files changed, 9 insertions, 22 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index e8cc6e1877d..984a1844318 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -344,16 +344,11 @@ if(UNIX AND NOT APPLE) ) endif() - install( - FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf - DESTINATION ${TARGETDIR_VER} - ) - if(WITH_INTERNATIONAL) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) @@ -416,16 +411,11 @@ elseif(WIN32) DESTINATION ${TARGETDIR} ) - install( # same as linux!, deduplicate - FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf - DESTINATION ${TARGETDIR_VER} - ) - if(WITH_INTERNATIONAL) # same as linux!, deduplicate install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) @@ -639,17 +629,12 @@ elseif(APPLE) \${TARGETDIR}/blender.app/Contents/ ) - install( - FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf - DESTINATION ${TARGETDIR_VER} - ) - # localization if(WITH_INTERNATIONAL) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) diff --git a/source/creator/creator.c b/source/creator/creator.c index b357f7b48f2..d24e930e2c9 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -145,7 +145,8 @@ static int print_version(int argc, const char **argv, void *data); extern int pluginapi_force_ref(void); /* from blenpluginapi:pluginapi.c */ -char bprogname[FILE_MAX]; /* from blenpluginapi:pluginapi.c */ +char bprogname[FILE_MAX]; +char bprogdir[FILE_MAX]; char btempdir[FILE_MAX]; #define BLEND_VERSION_STRING_FMT "Blender %d.%02d (sub %d)\n", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION @@ -1187,6 +1188,7 @@ int main(int argc, const char **argv) // need this. BLI_where_am_i(bprogname, sizeof(bprogname), argv[0]); + BLI_split_dir_part(bprogname, bprogdir, sizeof(bprogdir)); BLI_threadapi_init(); |