From 63690b6b45aaad4f5add19ae0c4b2d8628728d21 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sat, 12 May 2012 21:37:01 +0000 Subject: Enable setting of CUDA kernels to compile on command-line: python scons/scons.py BF_CYCLES_CUDA_BINARIES_ARCH=sm_20,sm21 --- build_files/scons/tools/btools.py | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files') diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 65593d559ed..1ad0b886cc4 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -177,6 +177,7 @@ def validate_arguments(args, bc): 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS', 'C_WARN', 'CC_WARN', 'CXX_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 'MACOSX_SDK_CHECK', 'XCODE_CUR_VER', + 'BF_CYCLES_CUDA_BINARIES_ARCH', ] -- cgit v1.2.3 From a88f910b9a21e284a2d742213f7c01ed13ddd751 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sat, 12 May 2012 22:00:32 +0000 Subject: Disable sm_13 CUDA kernel building for now, as the build fails with out of memory. --- build_files/scons/config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index d7af0eb549d..5d52f0e34b6 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -165,7 +165,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib' #CUDA WITH_BF_CYCLES_CUDA_BINARIES = False #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler -BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21'] +BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :) #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True -- cgit v1.2.3 From e5963aae1de14c4aaf2953b1cb91b4119415c565 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Sun, 13 May 2012 17:26:07 +0000 Subject: Change the scons configuration for MinGW-w64 to be more in-line with cmake. Also deactivate openmp as it causes crashes when rendering with subsurf or multires modifiers --- build_files/scons/config/win64-mingw-config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build_files') diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index 541574e0f63..37e4bcd77a8 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -169,7 +169,8 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib' WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2', '-ftree-vectorize'] -WITH_BF_OPENMP = True +#Produces errors while rendering with subsurf/multires, +WITH_BF_OPENMP = False ## CC = 'gcc' @@ -178,10 +179,10 @@ CXX = 'g++' CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] CXXFLAGS = [ '-fpermissive' ] -CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-D_SSIZE_T_'] +CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC'] REL_CFLAGS = [] REL_CXXFLAGS = [] -REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize', '-mmmx', '-msse', '-msse2'] +REL_CCFLAGS = ['-DNDEBUG', '-O2', '-mmmx', '-msse', '-msse2', '-ftree-vectorize'] C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes'] -- cgit v1.2.3 From 232980eef01a0a6d5ef5b80ad9f9dfbc6ec584a0 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Mon, 14 May 2012 23:36:07 +0000 Subject: Cleanup optimization compile flags for mingw-w64. After testing it seems that for safe debug sessions, debug build optimizations need to be off. Also removed sse flags from release flags since they are included in ray optimization flags which are on by default. --- build_files/scons/config/win64-mingw-config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files') diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index 37e4bcd77a8..cecf91e48a8 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -167,7 +167,7 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib' #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True -BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2', '-ftree-vectorize'] +BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2'] #Produces errors while rendering with subsurf/multires, WITH_BF_OPENMP = False @@ -182,7 +182,7 @@ CXXFLAGS = [ '-fpermissive' ] CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC'] REL_CFLAGS = [] REL_CXXFLAGS = [] -REL_CCFLAGS = ['-DNDEBUG', '-O2', '-mmmx', '-msse', '-msse2', '-ftree-vectorize'] +REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize'] C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes'] -- cgit v1.2.3 From 7f92b5f79ab81ee5ab3f1ee4630064b90859df71 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Tue, 15 May 2012 11:35:01 +0000 Subject: Fix El Topo: - Library compile errors - 2 Bugs (have been reported to lib owner) - LAPACK for cmake TODO: - Scons is still missing LAPACK lib define - Do other platforms got LAPACK lib? --- build_files/cmake/macros.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index eeefcf730c8..fbd28cc2398 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -214,7 +214,8 @@ macro(setup_liblinks ${OPENGL_glu_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} - ${FREETYPE_LIBRARY}) + ${FREETYPE_LIBRARY} + ${LAPACK_LIBRARIES}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs -- cgit v1.2.3 From e6ddad51463ad4634e6c2bd89b7733637572b629 Mon Sep 17 00:00:00 2001 From: Dan Eicher Date: Wed, 16 May 2012 02:51:58 +0000 Subject: CPack rpm cleanup -- package name and .spec->Version match -- use find_lang macro for locales -- Requires & Provides (mostly) match the fedora .spec -- fix unpackaged file error for blender-thumbnailer.py TODO: figure out how persuade CPack to make multiple rpms to also package blenderplayer --- build_files/cmake/packaging.cmake | 4 ++-- build_files/package_spec/rpm/blender.spec.in | 34 ++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 11 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index c0124fe8199..8a534bc530e 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -1,5 +1,5 @@ set(PROJECT_DESCRIPTION "Blender is a very fast and versatile 3D modeller/renderer.") -set(PROJECT_COPYRIGHT "Copyright (C) 2001-2011 Blender Foundation") +set(PROJECT_COPYRIGHT "Copyright (C) 2001-2012 Blender Foundation") set(PROJECT_CONTACT "foundation@blender.org") set(PROJECT_VENDOR "Blender Foundation") set(ORG_WEBSITE "www.blender.org") @@ -31,7 +31,7 @@ set(BUILD_REV ${MY_WC_REVISION}) # Force Package Name -set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR}) +set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-1.r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR}) if(CMAKE_SYSTEM_NAME MATCHES "Linux") # RPM packages diff --git a/build_files/package_spec/rpm/blender.spec.in b/build_files/package_spec/rpm/blender.spec.in index 25ad5344721..85a689031a3 100644 --- a/build_files/package_spec/rpm/blender.spec.in +++ b/build_files/package_spec/rpm/blender.spec.in @@ -1,5 +1,11 @@ # -*- rpm-spec -*- %global __python %{__python3} +%global blender_api @CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@ + +%define _rpmdir @CPACK_RPM_DIRECTORY@ +%define _rpmfilename @CPACK_RPM_FILE_NAME@ +%define _unpackaged_files_terminate_build 0 +%define _topdir @CPACK_RPM_DIRECTORY@ BuildRoot: @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@ Summary: @CPACK_RPM_PACKAGE_SUMMARY@ @@ -9,12 +15,17 @@ Release: @CPACK_RPM_PACKAGE_RELEASE@%{?dist} License: @CPACK_RPM_PACKAGE_LICENSE@ Group: @CPACK_RPM_PACKAGE_GROUP@ Vendor: @CPACK_RPM_PACKAGE_VENDOR@ -Epoch: 1 +Epoch: 1 -%define _rpmdir @CPACK_RPM_DIRECTORY@ -%define _rpmfilename @CPACK_RPM_FILE_NAME@ -%define _unpackaged_files_terminate_build 0 -%define _topdir @CPACK_RPM_DIRECTORY@ +Requires(post): desktop-file-utils +Requires(post): shared-mime-info +Requires(postun): desktop-file-utils +Requires(postun): shared-mime-info + +Provides: blender(ABI) = %{blender_api} +Provides: blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: blender-fonts <= 2.49a-9 %description Blender is an integrated 3d suite for modelling, animation, rendering, @@ -40,6 +51,10 @@ then fi mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT} +rm -f ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py + +%find_lang %{name} + %clean rm -rf ${RPM_BUILD_ROOT} @@ -57,14 +72,15 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi || : -%files +%files -f blender.lang %defattr(-,root,root,-) %{_bindir}/%{name} -%{_datadir}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@ +%{_datadir}/%{name}/%{blender_api}/datafiles/fonts +%{_datadir}/%{name}/%{blender_api}/scripts %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/applications/%{name}.desktop -%{_datadir}/doc/blender -%{_mandir}/man1/blender.* +%{_datadir}/doc/%{name} +%{_mandir}/man1/%{name}.* %changelog @CPACK_RPM_SPEC_CHANGELOG@ -- cgit v1.2.3