kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
31,288 Commits 2 Branches 0 Tags 753 MiB
82e622f158
Commit Graph

350 Commits

Author SHA1 Message Date
Campbell Barton
8470418b91 cmake: skip rpath (paths to libs) for portable distrobution 2011-08-23 20:19:08 +00:00
Sergey Sharybin
a33a26ca07 FFmpeg library update: 
- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.
 2011-08-22 18:49:42 +00:00
Campbell Barton
817273931a buildinfo is now quoted from the build systems, avoids stripping quotes on startup. 
tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
 2011-08-22 12:24:14 +00:00
Campbell Barton
bebee3fb60 new cmake doesn't consider CLang == GNUCC, set flags for clang explicitly. 2011-08-21 11:06:49 +00:00
Campbell Barton
bf23acf3bb fix for building ndof with cmake on osx 2011-08-07 15:06:35 +00:00
Campbell Barton
48a699d15b enable NDOF by default with cmake again, but check if it can be found on OSX, if not disable. 
I cant test this but at least if I made a mistake it will just not find the SDK and disable. an osx dev needs to test.
 2011-08-03 14:18:02 +00:00
Ton Roosendaal
01b105faa5 Cmake: compile with NDOF default off. This is a dependency on code 
that's not in our svn.
 2011-08-03 13:31:33 +00:00
Kent Mein
b2959e55f5 Fixes an issue with OSX Lion 
Also cleaned up the python detection for OSX 

Kent
 2011-08-02 17:35:07 +00:00
Campbell Barton
baa37b1b46 more cmake/x11 edits 
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
 2011-08-02 06:32:53 +00:00
Campbell Barton
fcd7d2b486 NDOF related edits 
- fix for building without NDOF on X11
- quiet some warnings
 2011-08-02 05:52:27 +00:00
Mike Erwin
56918978b7 3D mouse support from merwin-spacenav branch 2011-08-02 04:28:05 +00:00
Mike Erwin
dc2609da3d svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-08-02 01:01:56 +00:00
Campbell Barton
dde50cc39f add sse flags for cmake/msvc 2011-08-01 06:11:41 +00:00
Nathan Letwory
73a9ce7ec0 svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-27 07:42:53 +00:00
Mike Erwin
ff5a49b816 another CMake build fix (contributed by Kevin Cozens) 2011-07-23 21:33:04 +00:00
Campbell Barton
e6604288c8 cmake - option to disable the frame server 2011-07-21 23:06:51 +00:00
Mike Erwin
6cd4716d1a enable CMake builds with spacenav (contributed by Kevin Cozens) 2011-07-21 21:34:28 +00:00
Nathan Letwory
eea7c358c7 svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-21 09:40:59 +00:00
Campbell Barton
2d8c1e60e6 print an error message if Python.h can't be found for cmake and scons since its such a common problem. 2011-07-16 06:55:45 +00:00
Campbell Barton
1fd33b6e77 cmake option to build without smoke sim: WITH_MOD_SMOKE 2011-07-13 18:40:21 +00:00
Campbell Barton
cf485cd963 Advanced CMake option to build the player without blender: WITH_BLENDER 2011-07-13 08:15:06 +00:00
Campbell Barton
44e45e54c5 - don't build ghost's event printer unless ghost debug is enabled. 
- use char rather then STR_String for the event printer.
- added option to build WITH_GHOST_DEBUG for cmake
- renamed WITH_SDL_GHOST --> WITH_GHOST_SDL
 2011-07-13 06:04:54 +00:00
Campbell Barton
f7b9418d25 build option to use SDL 1.3 for GHOST rather then X11/Win32/Cocoa api's, 
This opens up the option for blender to be more easily ported to other devices, OS's.

TODO
- continuous grab.
- text glitch with multiple windows (was a bug in X11 too for a while, will check on this)
 2011-07-12 13:17:54 +00:00
Antony Riakiotakis
add56df7ca -OpenEXR fixed so enabling if user has enabled 
-Added Iex to lib list, was causing link time errors
 2011-07-10 20:04:56 +00:00
Campbell Barton
415761d508 own change to cmake files broke MSVC2010 with Debug configuration, reported by Alex K 2011-07-01 03:40:12 +00:00
Brecht Van Lommel
6582d30c26 Fix windows cmake build, this line got accidentally removed in variable renaming. 2011-06-29 17:56:32 +00:00
Campbell Barton
8f89e7a309 incorrectly had CMake storing directory names as filepaths 
also correct compiler warning for collada and remove print from own last commit.
 2011-06-29 13:16:11 +00:00
Sergey Sharybin
d8eb704784 Corrected link to FFmpeg homepage. 2011-06-29 09:46:00 +00:00
Campbell Barton
c2bd746fac own error in recent cmake edits 2011-06-28 16:57:25 +00:00
Brecht Van Lommel
3211bea679 CMake: campbell already added default build type as release a few hours 
earlier in a different way, missed that, so reverting my change.
 2011-06-28 15:43:03 +00:00
Brecht Van Lommel
a05b66defb CMake: set default cmake build type to Release. Without that you would 
get a build that has neither debug symbols nor optimization, now it
will build an optimized blender by default.
 2011-06-28 14:42:11 +00:00
Campbell Barton
c0a83d24e9 cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for debug 2011-06-28 02:49:49 +00:00
Mike Erwin
30b4ff8949 first attempt at CMake fix (untested) 2011-06-27 23:24:24 +00:00
Campbell Barton
e4f7b24e20 disable opencollada and openexr for msvc2010, gives linking errors 2011-06-27 16:33:59 +00:00
Campbell Barton
a961d62653 initialize cmake's CMAKE_BUILD_TYPE to 'Release' 
add reference to cmake cache for convenience GNUMakefile
 2011-06-27 13:18:08 +00:00
Campbell Barton
4b1cceddbd fix for building with msvc/cmake take 2 (think its correct this time) 
also sync build flags with scons.
 2011-06-26 17:18:37 +00:00
Mitchell Stokes
3de7a67562 This solves the issue of having symlinks in the LIBDIR path (CMAKE Windows). Hopefully it doesn't break other things. 2011-06-26 08:42:00 +00:00
Campbell Barton
83000d8504 Allow the lib dir to be a symlink, pointed out by Mitchell Stokes. 2011-06-26 06:05:56 +00:00
Nathan Letwory
e7c6b535b0 Remove unnecessary check. OpenAL, SDL, JACK don't depend on samplerate. 2011-06-23 17:29:18 +00:00
Campbell Barton
0767779387 fix for building mingw in debug mode 2011-06-23 16:33:59 +00:00
Campbell Barton
99253abef8 allow building with ffmpeg but not aud 2011-06-23 16:10:48 +00:00
Campbell Barton
bb3742fe91 correction to recent commit & made ffmpeg includes only add when enabled. 2011-06-23 15:58:41 +00:00
Campbell Barton
c3e48219e6 mistake in own commit. 2011-06-23 15:12:05 +00:00
Campbell Barton
2023db70a8 cmake option to build without an audio library. 2011-06-23 09:27:56 +00:00
Campbell Barton
b1b8284f9b fix for python include in msvc 2011-06-19 15:55:49 +00:00
Campbell Barton
c6eaa2300a cmake: add find jack module 2011-06-19 15:03:50 +00:00
Campbell Barton
a8d4c1f8a9 cmake: add find jemalloc module 2011-06-19 14:55:51 +00:00
Campbell Barton
56c0f69071 fix for building opencollada + msvc 2011-06-19 14:14:29 +00:00
Campbell Barton
29977893d3 since cmake new auto-detects many features, print a summery of the configuration on first run. 2011-06-19 13:49:20 +00:00
Campbell Barton
6790dbe9db cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables. 2011-06-19 13:06:21 +00:00