se BLI_snprintf() for msvc compat, cleanup CMake file, some bad comments left in.
also on only try build RPM's on linux.
This commit is contained in:
@@ -33,14 +33,16 @@ set(BUILD_REV ${MY_WC_REVISION})
|
||||
# Force Package Name
|
||||
set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CPACK_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
|
||||
|
||||
# RPM packages
|
||||
include(build_files/cmake/RpmBuild.cmake)
|
||||
if(RPMBUILD_FOUND AND NOT WIN32)
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
# RPM packages
|
||||
include(build_files/cmake/RpmBuild.cmake)
|
||||
if(RPMBUILD_FOUND AND NOT WIN32)
|
||||
set(CPACK_GENERATOR "RPM")
|
||||
set(CPACK_SET_DESTDIR TRUE)
|
||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
|
||||
set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
|
||||
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Graphics")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Mac Bundle
|
||||
|
@@ -258,16 +258,13 @@ static void GPU_print_framebuffer_error(GLenum status, char err_out[256])
|
||||
}
|
||||
|
||||
if(err_out) {
|
||||
snprintf(err_out, 256, "GPUFrameBuffer: framebuffer incomplete error %d '%s'",
|
||||
(int)status,
|
||||
err);
|
||||
BLI_snprintf(err_out, 256, "GPUFrameBuffer: framebuffer incomplete error %d '%s'",
|
||||
(int)status, err);
|
||||
}
|
||||
else {
|
||||
fprintf(stderr, "GPUFrameBuffer: framebuffer incomplete error %d '%s'\n",
|
||||
(int)status,
|
||||
err);
|
||||
(int)status, err);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* GPUTexture */
|
||||
@@ -349,7 +346,7 @@ static GPUTexture *GPU_texture_create_nD(int w, int h, int n, float *fpixels, in
|
||||
|
||||
if (!tex->bindcode) {
|
||||
if(err_out) {
|
||||
snprintf(err_out, 256, "GPUTexture: texture create failed: %d",
|
||||
BLI_snprintf(err_out, 256, "GPUTexture: texture create failed: %d",
|
||||
(int)glGetError());
|
||||
}
|
||||
else {
|
||||
|
@@ -356,6 +356,11 @@ if(WITH_INSTALL)
|
||||
PATTERN ".svn" EXCLUDE
|
||||
)
|
||||
|
||||
install(
|
||||
FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
|
||||
DESTINATION ${TARGETDIR}/
|
||||
)
|
||||
|
||||
if(NOT CMAKE_CL_64)
|
||||
install(
|
||||
FILES ${LIBDIR}/iconv/lib/iconv.dll
|
||||
@@ -427,8 +432,6 @@ if(WITH_INSTALL)
|
||||
"
|
||||
)
|
||||
|
||||
# TODO, debug
|
||||
|
||||
# doesnt work, todo
|
||||
# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
|
||||
endif()
|
||||
@@ -443,7 +446,6 @@ if(WITH_INSTALL)
|
||||
else()
|
||||
install(
|
||||
FILES
|
||||
${LIBDIR}/gettext/lib/gnu_gettext.dll # TODO INTERNATIONAL ONLY!
|
||||
${LIBDIR}/png/lib/libpng.dll
|
||||
${LIBDIR}/zlib/lib/zlib.dll
|
||||
DESTINATION ${TARGETDIR}/
|
||||
|
Reference in New Issue
Block a user