Skip to content

Commit

Permalink
port 278 - version 01 - Changed the app name from Blender to Bforartists
Browse files Browse the repository at this point in the history
  • Loading branch information
ReinerBforartists committed Jan 20, 2017
1 parent 40ffc50 commit a009724
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -1690,7 +1690,7 @@ include(build_files/cmake/packaging.cmake)
#-----------------------------------------------------------------------------
# Use dynamic loading for OpenMP
if(WITH_BLENDER)
openmp_delayload(blender)
openmp_delayload(bforartists)
endif(WITH_BLENDER)
if(WITH_PLAYER)
openmp_delayload(blenderplayer)
Expand Down
Binary file added release/windows/icons/winblender.aps
Binary file not shown.
2 changes: 1 addition & 1 deletion source/blender/blenlib/intern/winstuff.c
Expand Up @@ -103,7 +103,7 @@ void RegisterBlendExtension(void)
/* Replace the actual app name with the wrapper. */
blender_app = strstr(BlPath, "blender-app.exe");
if (blender_app != NULL) {
strcpy(blender_app, "blender.exe");
strcpy(blender_app, "bforartists.exe");
}

/* root is HKLM by default */
Expand Down
42 changes: 21 additions & 21 deletions source/creator/CMakeLists.txt
Expand Up @@ -234,7 +234,7 @@ if(WITH_PYTHON_MODULE)
# but not OSX which _must_ be 'MODULE'
add_library(blender MODULE ${SRC})
set_target_properties(
blender
bforartists
PROPERTIES
PREFIX ""
OUTPUT_NAME bpy
Expand All @@ -244,7 +244,7 @@ if(WITH_PYTHON_MODULE)

if(APPLE)
set_target_properties(
blender
bforartists
PROPERTIES
MACOSX_BUNDLE TRUE
LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}"
Expand All @@ -255,20 +255,20 @@ if(WITH_PYTHON_MODULE)
if(WIN32)
# python modules use this
set_target_properties(
blender
bforartists
PROPERTIES
SUFFIX ".pyd"
)
endif()

else()
add_executable(blender ${EXETYPE} ${SRC})
WINDOWS_SIGN_TARGET(blender)
add_executable(bforartists ${EXETYPE} ${SRC})
WINDOWS_SIGN_TARGET(bforartists)
endif()

if(WITH_BUILDINFO)
# explicitly say that the executable depends on the buildinfo
add_dependencies(blender buildinfo)
add_dependencies(bforartists buildinfo)
endif()


Expand Down Expand Up @@ -454,19 +454,19 @@ if(UNIX AND NOT APPLE)
if(WITH_PYTHON_MODULE)
if(WITH_INSTALL_PORTABLE)
install(
TARGETS blender
TARGETS bforartists
DESTINATION "."
)
else()
install(
TARGETS blender
TARGETS bforartists
LIBRARY DESTINATION ${PYTHON_SITE_PACKAGES}
)
endif()
# none of the other files are needed currently
elseif(WITH_INSTALL_PORTABLE)
install(
TARGETS blender
TARGETS bforartists
DESTINATION "."
)

Expand All @@ -493,7 +493,7 @@ if(UNIX AND NOT APPLE)
else()
# main blender binary
install(
TARGETS blender
TARGETS bforartists
DESTINATION bin
)
if(WITH_DOC_MANPAGE)
Expand Down Expand Up @@ -937,7 +937,7 @@ elseif(APPLE)
)
endmacro()

set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app)
set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/bforartists.app)

# setup Info.plist
execute_process(COMMAND date "+%Y-%m-%d"
Expand All @@ -956,10 +956,10 @@ elseif(APPLE)

# Give the bundle actual creation/modification date
execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE}
${EXECUTABLE_OUTPUT_PATH}/blender.app)
${EXECUTABLE_OUTPUT_PATH}/bforartists.app)

install(
TARGETS blender
TARGETS bforartists
DESTINATION "."
)

Expand All @@ -968,18 +968,18 @@ elseif(APPLE)

install(
FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
DESTINATION blender.app/Contents
DESTINATION bforartists.app/Contents
)

install_dir(
${OSX_APP_SOURCEDIR}/Contents/Resources
blender.app/Contents/
bforartists.app/Contents/
)

if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
install(
FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
DESTINATION blender.app/Contents/Resources/lib/
DESTINATION bforartists.app/Contents/Resources/lib/
)
install(
FILES ${LIBDIR}/openmp/LICENSE.txt
Expand All @@ -991,7 +991,7 @@ elseif(APPLE)
if(WITH_LLVM AND NOT LLVM_STATIC)
install(
FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib
DESTINATION blender.app/Contents/MacOS
DESTINATION bforartists.app/Contents/MacOS
)
endif()

Expand Down Expand Up @@ -1135,19 +1135,19 @@ unset(BLENDER_TEXT_FILES_DESTINATION)
# -----------------------------------------------------------------------------
# Setup link libs

add_dependencies(blender makesdna)
add_dependencies(bforartists makesdna)

setup_blender_sorted_libs()
target_link_libraries(blender ${BLENDER_SORTED_LIBS})
target_link_libraries(bforartists ${BLENDER_SORTED_LIBS})

setup_liblinks(blender)
setup_liblinks(bforartists)

# -----------------------------------------------------------------------------
# Setup launcher

if(WIN32 AND NOT WITH_PYTHON_MODULE)
install(
TARGETS blender
TARGETS bforartists
COMPONENT Blender
DESTINATION "."
)
Expand Down

0 comments on commit a009724

Please sign in to comment.