Commit Graph

725 Commits

Author SHA1 Message Date
Campbell Barton
c4bad6868f cmake - cached LLVM values would be overwritten on every execution. 2013-09-25 17:04:01 +00:00
Campbell Barton
124f32a206 rename LLVM_LIB_DIR to LLVM_LIBPATH to match other cmake vars. 2013-09-25 16:31:54 +00:00
Dalai Felinto
a5c4faef62 CMake: BOOST is a dependency of OpenImageIO 2013-09-24 15:16:46 +00:00
Dalai Felinto
97cb65df52 typos on error messages in CMake 2013-09-23 13:21:27 +00:00
Jens Verwiebe
0c4e665c05 OSX/cmake: fix config by moving code back into xcode conditional, cmake/makefiles does not even have xcode_vesion lookup 2013-09-15 10:56:36 +00:00
Jens Verwiebe
809cb5e478 OSX/cmake: don't try get xcode path from xcode before 4.3, developer dir was not bundled in this case 2013-09-14 12:11:26 +00:00
Jens Verwiebe
7a47803053 OSX/cmake: move the new xcode-select-handing outside xcode conditional, to fix cmake/make compile 2013-09-13 21:13:57 +00:00
Jens Verwiebe
e59bc04aa7 OSX/cmake: allow for compiling with xcode develper previews by determing xcode-select 2013-09-13 14:57:57 +00:00
Campbell Barton
92d94ccb08 misc minor changes
- make cmake osx use of -ftemplate-depth match scons.
- use array size within sizeof(), more compact.
- replace AT with __func__ where the function is unique enough.
- BLI_box_pack_2D -> 2d to match other functions.
- rename new mesh normal calculation to mesh.calc_normals_split()
2013-09-10 19:23:39 +00:00
Jens Verwiebe
ba13c16065 OSX/cmake: assure finding jack framework 2013-09-10 18:56:33 +00:00
Brecht Van Lommel
d703f616db Fix libmv build error on OS X with Xcode 5. 2013-09-09 12:15:14 +00:00
Brecht Van Lommel
f634509dc2 CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth. 2013-09-06 12:43:27 +00:00
Campbell Barton
427317d8d8 use CMAKE_DL_LIBS rather then linking libdl directly.
added to cycles standalone too.
2013-08-30 20:26:57 +00:00
Thomas Dinges
a51f8e4353 Cycles / Standalone:
* Standalone can now be compiled without the GUI, making the glut dependency optional. 

Added WITH_CYCLES_STANDALONE_GUI cmake flag.
2013-08-30 17:34:27 +00:00
Campbell Barton
f75711db7f cmake: set python, llvm and osl libs as advanced. 2013-08-28 04:32:39 +00:00
Thomas Dinges
ff4e018753 Cycles / Standalone:
* Rename test to standalone.

Note: New CMAKE flag is WITH_CYCLES_STANDALONE.
2013-08-27 02:37:48 +00:00
Campbell Barton
26c0839220 disable cycles when building without python, also use const for function args in more places. 2013-08-07 22:40:03 +00:00
Mitchell Stokes
103ef7cacb Merged changes from trunk r58324-58419. 2013-07-19 22:10:11 +00:00
Campbell Barton
b7826c42df enable type limits warning when compiling with gcc. 2013-07-19 10:39:25 +00:00
Mitchell Stokes
eb21bdd249 Merging changes from trunk r58091-58323. 2013-07-17 01:40:26 +00:00
Campbell Barton
02ba328ca8 clang/cmake - quiet warnings for external libs and reference moto as a system include. 2013-07-15 08:26:16 +00:00
Mitchell Stokes
60812e0260 BGE cleanup: Removing the GamePlayer/xembed folder and associated build options. This code was very old and not used. For example web player code, look at Burster. 2013-07-09 01:24:51 +00:00
Brecht Van Lommel
8d6e5e2fee Cycles: update build configurations to include CUDA sm_35 architecture. When using
a compiler older than CUDA 5.0 it will give a warning and skip this architecture.
2013-06-20 13:10:47 +00:00
Campbell Barton
15016873ab dont use 'if(${WITH_STATIC_LIBS})', no need to expend the variable. 2013-06-19 11:26:11 +00:00
Campbell Barton
970e9123b4 cmake: remove set_lib_path macro 2013-06-17 18:15:56 +00:00
Thomas Dinges
91d7df12ee CMake / vc2010:
* Remove vc2010 support from cmake. 

There is some "if(MSVC10)" left in extern - ceres, but will leave that for Sergey. :)
2013-06-17 18:00:38 +00:00
Campbell Barton
412c043474 Python script auto-execution changes:
- script execution is off by default

- if a blend file attempts to execute a script
  this shows a message in the header with the action
  that was suppressed (script/driver/game-autostart) and 2 buttons to either reload the file trusted, or to ignore the message.

- the file selector will always default to use the trust setting in the user preferences,
  but reloading an open file will keep using the current setting (whatever was set before or set on the command-line).

- added SCons setting WITH_BF_PYTHON_SECURITY, this sets the default state for the user prefereces not to trust blend files on load.
  ... this option was in CMake before, but always off, now its enabled by default for SCons and CMake, and forced on in CMake for now.
2013-06-10 00:42:16 +00:00
Campbell Barton
bbb025214d issue warning when WITH_RAYOPTIMIZATION is used with MinGW-w32, since this is known to give crashes. 2013-06-05 19:33:19 +00:00
Sergey Sharybin
732c566f2f Fix #35587: Cycles: image movie to single image crashing
Crash was happening on windows platforms only and was caused
by some specifics about how CRT works.

Basically, blender and all of the .dll are compiled with /MT
flag, which means blender.exe and all .dll are using separate
environments. This makes it impossible to pass file descriptors
from blender to other dll, because it becomes invalid in the dll.

And this is exactly what was happening: OIIO was trying to open
movie file with all known plugins and one of them was zlib. And
the way OIIO was using zlib API is opening the file using Boost
and passing a file descriptor to zlib. And since zlib was a
dynamic library this lead to general issues using this descriptor
in zlib code.

Solved by linking to zlib statically. This allows to safely pass
file descriptor to zlib API. Alternative would be to compile all
the stuff with /MD flag, but that's much bigger and less robust
way to fix the issue.

Tested on windows using msvc2008, scons plus cmake both 32 and 64
bit versions. Seems to be working fine.

Further tweaks for mingw and msvc2012 could be needed tho.
2013-06-02 15:02:17 +00:00
Campbell Barton
22f170f487 fix for building on osx with recent freestyle bugfix. 2013-05-24 10:15:20 +00:00
Campbell Barton
bf9ddfe86a remove WITH_AVX_CPU, also used add_definitions incorrectly.
single cflags can be added manually and don't need their own options.
2013-05-19 16:47:41 +00:00
Jürgen Herrmann
7b9a321a79 Patch for CMakeLists.txt to build with new OpenAL libs on VS2012.
Because of crashing issue with old Creative Labs OpenAL on Windows 8 x64.
2013-05-15 11:26:57 +00:00
Jürgen Herrmann
44dfc76154 CMake build system update
- Extending CMakeLists.txt to support builds with VC2012.
- Fix some typo in CMakeLists.txt
- Introduces experimental WITH_AVX_CPU to build with /arch:AVX (VC11 only)
2013-05-14 16:16:25 +00:00
Campbell Barton
7d4eee2b18 add option to disable guardedalloc, helps for debugging memory errors
since guardedalloc confuses them.

The option cases a warning on build, since its ownly for experimental
use.
2013-05-08 12:55:23 +00:00
Campbell Barton
f239d2e751 minor adjustment to vertex color baking, tag the meshes directly, no need to do via the objects. 2013-04-29 00:49:44 +00:00
Campbell Barton
838a601a71 cmake - warn when an option is turned off because of boost being disabled. 2013-04-29 00:44:33 +00:00
Antony Riakiotakis
adfa7c8afa Don't use auto vectorization for MinGW-w64. It may be a source for
trouble. Also fixed a few harmless warnings.
2013-04-17 11:16:53 +00:00
Brecht Van Lommel
49649a3f7b CMake: add LLVM_STATIC as cmake build option, so linux distributions can link
LLVM dynamically. Patch by Dan Eicher.
2013-04-15 16:18:35 +00:00
Campbell Barton
83fff218cc svn merge ^/trunk/blender -r55700:55776 2013-04-04 13:37:07 +00:00
Antony Riakiotakis
dbfadcad61 Fix compilation on MinGW(64/32)
Also, add appropriate lib paths for recent OpenCollada for mingw32 (coming soon to an svn server near you)
2013-04-02 13:07:01 +00:00
Antony Riakiotakis
d067ba9cbc Fix build for MinGW without opencollada (updated libs coming soon), MinGW64 now builds with opencollada 2013-04-02 02:05:03 +00:00
Tamito Kajiyama
5524ed9ba2 Merged changes in the trunk up to revision 55700.
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
2013-04-01 13:47:19 +00:00
Gaia Clary
4707f1de17 modified build system for updated opencollada libraries (windows only, other platforms might want to update as well) 2013-03-28 18:02:24 +00:00
Campbell Barton
f13829c782 svn merge ^/trunk/blender -r55594:55635 2013-03-27 22:24:38 +00:00
Dalai Felinto
48c56a0616 CMake fix: OpenEXR and Tiff are linking dependencies of OIIO, and fix for Boost-Cycles-OIIO order
The NOT BOOST test was changing Cycles so should be before the
cycles-oiio link (by Campbell Barton, thanks)

And exr and tiff are required for oiio (on OSX at least)
2013-03-27 18:44:46 +00:00
Sergey Sharybin
31eee77a45 Fix #33518: Jack sync doesn't work in 2.64, 2.64 or 2.65 stable versions
Added new build option WITH_JACK_DYNLOAD for CMake and
WITH_BF_JACK_DYNLOAD for SCons, which means there'll be
no build-time linking against libjack and getting symbols
from libjack will happen runtime using dlopen and dlsym
tricks.

Alternative would be to use weak linking, but it'll require
having wrapper for preloading libjack.

This new options are disabled by default and they only
intended to be used on linux. Other platforms shall not
be using this and there shall be no functional changes
on non-linux platforms at all.
2013-03-27 07:19:54 +00:00
Tamito Kajiyama
385c72f5f2 Merged changes in the trunk up to revision 55546.
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
2013-03-24 12:13:13 +00:00
Campbell Barton
3966722057 code cleanup: misc warnings/style 2013-03-21 02:58:21 +00:00
Campbell Barton
643365818f add back -Wredundant-decls, just not for older gcc's 2013-03-20 13:30:20 +00:00
Ton Roosendaal
092b88c147 Make Blender compile again normal again with gcc 4.2
-Wredundant-decls is giving 1000s of lines of warnings for every file...
2013-03-20 12:34:20 +00:00