Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
43,198 Commits 2 Branches 0 Tags
8af6721eb5c94f29c3d4d21c0b1431dda3b1cf84
Commit Graph

646 Commits

Author SHA1 Message Date
Jens Verwiebe
8af6721eb5 OSX: make cmake and scons both compile jack and ndof with newer sdk's 2012-12-12 19:54:14 +00:00
Jens Verwiebe
26ae649b01 OSX/cmake: fix ndof compile 2012-12-12 18:31:19 +00:00
Brecht Van Lommel
fe2907d6cb CMake: fix numpy install not getting properly disabled when numpy was not found. 2012-12-10 09:07:57 +00:00
Ton Roosendaal
b714d7fde6 Further refined the check for GCC 4.2 to not add the flag -Wuninitialized then. 
Now it checks for "Not less then 4.3" because it doesnt have >= 4.3.
 2012-12-09 11:31:34 +00:00
Antony Riakiotakis
0fb3ef7fd8 CMake: 
*Remove WITH_MINGW64 option, automatically test for presence of __MINGW64__ definition instead to determine presence of MinGW32/64.
*Placeholder for LLVM libraries (Compiled locally but still crashing on render due to thread issue).
 2012-12-09 01:42:26 +00:00
Brecht Van Lommel
2b962212c8 Fix #33411: crash baking smoke with FFT high resolution. 
CMake had FFTW disabled by default, and when FFTW was not enabled it lead to
uninitialized memory usage. Now it falls back to wavelet if there is no FFTW,
and I've enabled it by default in CMake. If it's not found on Linux it will get
disabled automatically.
 2012-12-05 15:46:31 +00:00
Campbell Barton
77fdf426d6 disable numpy warning with cmake, since we didnt end up bundling this with blender yet. 2012-12-04 17:54:32 +00:00
Dalai Felinto
df4e1953ac we need 2.8.8 for cmake on mac - patch by Jens Verwiebe 2012-11-29 10:28:06 +00:00
Brecht Van Lommel
5a6d695218 CMake: hide some unnecessary LLVM/OSL/EXR prints. 2012-11-27 17:30:46 +00:00
Campbell Barton
a7555a81c7 remove unmaintained eltopo, keeping scons/cmake entries, but commenting out user visible config to make branch merging less of a hassle. 2012-11-27 09:52:20 +00:00
Antony Riakiotakis
5393922d1d Remove non existent pthread include directory for MinGW, also slight message correction for 64 bit MinGW 2012-11-26 19:50:08 +00:00
Antony Riakiotakis
f9bed10d1f Enable python 3.3 for MinGW/CMake. 
MinGW32 python libs will be commited later in the day
 2012-11-26 14:47:34 +00:00
Campbell Barton
0a5d44588c switch verious references from py3.2 -> 3.3 or just 3. 2012-11-26 13:58:06 +00:00
Sergey Sharybin
2d6402c10c Switch windows to python 3.3 
Should affect on msvc2008 only, however scons with msvc2010 could still be broken.
 2012-11-26 12:38:40 +00:00
Brecht Van Lommel
629ea82a13 Fix 33149: LLVM caused startup crash on linux systems using Mesa llvmpipe. 
Now we hide the LLVM symbols with an ld version script to avoid conflicts.
 2012-11-21 22:28:15 +00:00
Bastien Montagne
28317feab1 More LLVM work (now always search llvm-config into LLVM_DIRECTORY when 
set!).
 2012-11-21 08:59:20 +00:00
Sergey Sharybin
6ea7bf2278 Seems extra hints are needed to find llvm-config on linux 2012-11-20 08:04:53 +00:00
Bastien Montagne
0e15537bf2 Adding a linux-only WITH_STATIC_LIBS option, which will try to link against static libs. This should help building more portable blender. Still experimental and WIP. 2012-11-19 19:43:03 +00:00
Jens Verwiebe
eebc9f4922 OSX/osl: link also boost_wave, cause we use its preprocessor now 2012-11-19 19:10:31 +00:00
Sergey Sharybin
1dcef34742 Bring back debug boost libs to cmake. Also use debug version of OIIO for debug builds. 
SO now blender could be debugged on windows again!

There'll likely be compilation error of debug version of blender using msvc2010, not
currently sure how to solve that in a good way.
 2012-11-19 18:07:55 +00:00
Brecht Van Lommel
1e98e96f7c Windows Libs: move OpenEXR headers to same directory structure as other platforms. 2012-11-19 16:02:29 +00:00
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