Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
45,960 Commits 2 Branches 0 Tags
5105ddae74d47c883dfef2a76ac43d6bac4e74da
Commit Graph

675 Commits

Author SHA1 Message Date
Sergey Sharybin
9947f70f19 Localization should not depend on debug locale library 
Linking happens fine, but blender crashes on startup -- crash with familiar
backtrace happens with i18n disabled (in that case it's something to do with OIIO).
 2012-11-19 13:15:11 +00:00
Jens Verwiebe
45f75df1ce OSX/cmake: py 3.3 migration 2012-11-19 11:45:25 +00:00
Bastien Montagne
67031c1712 Fix when statically linking with distro's boost: in this case, we most likely also need to statically link against icu, as most boost packages are built with it. Without that, you get a bunch of errors at link time (when using boost_locale, or, in freestyle branch, boost_regex). 
So when you enable Boost_USE_STATIC_LIBS, you should also set Boost_USE_ICU to True. Will add a note about that in build doc too.
 2012-11-19 08:51:35 +00:00
Bastien Montagne
a996a42526 CMakeList: Better handling of llvm under linux (now you can try to force usage of a specific version of llvm before using default one). 
Also cleared LIBDIR var from linux code, as we have no more those svn folders!
 2012-11-18 17:26:23 +00:00
Thomas Dinges
4cb3aba762 Windows / Cmake: 
* Another place where "psapi" was missing, caused OIIO errors.
 2012-11-17 14:35:35 +00:00
Thomas Dinges
dc4ffd8a86 * Fix typo in cmake, own fault. 2012-11-15 20:21:33 +00:00
Thomas Dinges
c408d41fc8 Windows / CMake: 
* Disable Debug Boost detection in cmake. Debug libs for boost will be removed, they are quite huge in svn. 
Keeping the lines here though, so devs with own debug libs can compile with it.
 2012-11-15 19:45:37 +00:00
Bastien Montagne
7d6417bbb3 Another nuch of fixes/improvements to install_deps script, among which: 
*New $INST variable to easily change the installation root dir of compiled libs.
*Better handling of versions for debian (DEB) too (and fix a bug for fedora (RPM) ones).
*Enhancements/fixes to compile_FOO funcs:
**Most notable, we now can force a recompile when we change something into these funcs, so user will always have latest-instructions compiled libs (else, he would have have to manually remove lib dirs under $INST...)
*General naming cleanup inside script (still wip).

Also adding boost date_time lib to linux in cmake file (why wasn't it there???).
 2012-11-15 17:31:18 +00:00
Brecht Van Lommel
2324c80f50 Cycles OSL: windows build system changes to support static OSL/OIIO. 2012-11-15 17:16:27 +00:00
Brecht Van Lommel
71389d4d74 Cycles OSL: windows build fixes. 2012-11-14 17:18:47 +00:00
Jens Verwiebe
5993a10f94 OSX/cmake: revert a testchange back for kaito 2012-11-12 10:51:29 +00:00
Campbell Barton
97b7154142 replace BM_edge_face_count with BM_edge_is_manifold/BM_edge_is_wire/BM_edge_is_boundary 2012-11-12 04:50:45 +00:00
Antony Riakiotakis
929e88fd95 Fix CMake boost locale lib names for MinGW64. 2012-11-11 22:50:28 +00:00
Jens Verwiebe
fbc1cc712f OSX: fix linking with new boost_locale 2012-11-11 20:41:28 +00:00
Jens Verwiebe
6f32bece7f revert muddle in changing jack in msvc instead apple 2012-11-11 18:28:45 +00:00
Jens Verwiebe
7165c352be Restore my work overwritten by 52106 and some further reordering for cmake 2.8.10, todo: take into account missing symlinks for Library and /usr/local in newest xcode, affects ndof and jack 2012-11-11 18:06:10 +00:00
Jens Verwiebe
70080d005b OSX/cmake-2.8-10: just reorder, now sdk must be set before deployment target 2012-11-11 17:04:12 +00:00
Bastien Montagne
5ff3017900 Replacing gettext i18n backend by boost::locale one. 
This commit adds a small and simplistic C wrapper around boost's locale library as intern/locale, and heavily simplifies/reduces Blender's own i18n code (under blenfont/ dir). And it adds back UI translation on windows' official builds (with msvc)!

Note to platform maintainers: iconv and gettext (libintl) can now be removed from precompiled libs (not gettext binaries, under windows, of course ;) ).

Note to MinGW32/64 users: boost_locale lib has not yet been uploaded for those build env, please disable WITH_INTERNATIONAL for now (hopefully will be fixed very soon, have contacted psy-fy).
 2012-11-11 16:54:26 +00:00
Jens Verwiebe
56cee81656 OSX/cmake: actualize message for xcode specifics 2012-11-11 14:33:06 +00:00
Jens Verwiebe
cb2f91b9d2 OSX/cmake: rework the optional frameworks handling more osx-like, make jack weak-linked 2012-11-10 13:50:28 +00:00
Campbell Barton
d25b13d13f code cleanup: double promotion warnings, also allow cmake to build SDL without audaspace. 2012-11-09 16:15:00 +00:00
Campbell Barton
11a5c909f8 code cleanup: move shrinkwrap's benchmark macro into PIL_time.h & some minor style edits. 2012-11-09 04:01:19 +00:00
Brecht Van Lommel
41deb7b021 CMake: LLVM configuration tweak to check if llvm-config actually exists before 
using it (patch by IRIE Shinsuke). Also search for any library instead of just
static ones.
 2012-11-09 03:10:29 +00:00
Jens Verwiebe
b537758192 OSX/cmake: fix jack compile 2012-11-08 19:50:25 +00:00
Jens Verwiebe
2e52bdbbee OSX/cmake: workaround for getting right LC_VERSION_MIN_MACOSX with makefiles 2012-11-08 12:57:01 +00:00
Mitchell Stokes
cb41fbef8e CMake: Since Audaspace now requires Boost, auto enable Boost if WITH_AUDASPACE is enabled. 2012-11-08 05:50:02 +00:00
Jens Verwiebe
552c0e74f4 Fix a typo and more descriptve commet 2012-11-07 10:52:07 +00:00
Jens Verwiebe
a68416e681 OSX: some more version target cleanups and corrections 2012-11-07 10:43:31 +00:00
Campbell Barton
ff014a3077 code cleanup: cmake - add missing headers, remove directories from source listing. 
also remove logImageLib.c - empty file.
 2012-11-03 15:49:38 +00:00
Brecht Van Lommel
615fe0295f Cycles OSL: refactoring and fixes 
* Moved kernel/osl/nodes to kernel/shaders
* Renamed standard attributes to use geom:, particle:, object: prefixes
* Update stdosl.h to properly reflect the closures we support
* Fix the wrong stdosl.h being used for building shaders
* Add geom:numpolyvertices, geom:trianglevertices, geom:polyvertices attributes
 2012-11-03 14:32:13 +00:00
Campbell Barton
eb69d1c1ae style cleanup: also quiet harmless compiler warning. 2012-10-29 15:43:54 +00:00
Lukas Toenne
3b3ad5bba6 Fix for cmake syntax error: LLVM_VERSION string was not configurable, causing linker errors for people not using the default LLVM version (3.0 on Linux, 3.1 on OSX). 2012-10-25 14:31:52 +00:00
Campbell Barton
226a5ee834 remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used. 2012-10-22 02:39:26 +00:00
Campbell Barton
f3ece5a108 style cleanup: trailing tabs & expand some non prefix tabs into spaces. 2012-10-21 05:46:41 +00:00
Bastien Montagne
c1b39d3461 Fix for r51447 (my CMake 2.8.9 did not like it, looks like with quotes it suites it...). 2012-10-20 19:36:08 +00:00
Campbell Barton
a9e2e22797 dont ise -Wuninitialized on gcc 4.2 and older, it gives annoying warnings. 2012-10-20 13:29:07 +00:00
Campbell Barton
cf7dec94fe switch order cmake includes warning flags so its possible to disable them 2012-10-20 13:08:51 +00:00
Brecht Van Lommel
3abef3a2e6 Cycles OSL: some build system tweaks to avoid global includes and definitions, 
which ensures there is no conflict with other libraries, and avoids full rebuild
when toggling OSL on/off.
 2012-10-20 12:17:45 +00:00
Jens Verwiebe
1e448fa3e2 OSX/cmake: after osl librenew with globals patch, forcing oiio is not longer needed 2012-10-11 10:15:37 +00:00
Campbell Barton
aa1e50be94 add option to build without blenders default avi codec. 2012-10-08 02:51:42 +00:00
Jens Verwiebe
e7db06ad9d Force USE_QTKIT for osx 64bit 2012-10-06 18:53:57 +00:00
Lukas Toenne
868df3525e Fix for WITH_LLVM cmake option: When using WITH_CYCLES_OSL this option is forced ON, but this change was not cached yet. Thanks to Jens Verwiebe for providing this fix. 2012-10-06 18:40:05 +00:00
Lukas Toenne
2ecb4781a7 Fix for incomplete loading of liboslexec static library. This is needed in order to provide the osl_allocate_closure_component function for LLVM. 2012-10-06 14:35:48 +00:00
Lukas Toenne
a2d8cf333f Better support for LLVM linking, needed for static OSL library. 
This adds cmake code for LLVM on linux and updates the cmake code used for OSX.
LLVM is linked like other external libraries now, by using the setup_liblinks and setup_libdirs macros instead of the PLATFORM_LINKFLAGS variable.
The use of llvm-config for getting a list of libraries can also be simplified quite a bit.

Caching the LLVM_DIRECTORY and LLVM_VERSION strings could be nicer though.
 2012-10-06 11:00:45 +00:00
Jens Verwiebe
7be70c746c OSX/cmake: fix warning: go back to initial state, not the right way to get rid of this 2012-10-04 11:37:17 +00:00
Jens Verwiebe
ae3c28481b OSX/cmake: fix warning: second try 2012-10-04 11:26:02 +00:00
Jens Verwiebe
a273d45a5d OSX/cmake: fix warning: -Wuninitialized is not supported without -O, in debug-mode 2012-10-04 10:48:17 +00:00
Campbell Barton
9e0a1b613f fix for cmake constructing an invalid include path. 2012-10-03 05:49:22 +00:00
Brecht Van Lommel
e5faa314f2 CMake: disable some warnings on mac that cause prints in nearly every file, and 
remove duplicate -Wundef entries.
 2012-10-01 16:45:50 +00:00
Jens Verwiebe
77b90a94c9 OSX/cmake: simplificate compile conditions and silence lot of CLANG warnings 2012-10-01 14:03:02 +00:00