sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
32,256 Commits 2 Branches 0 Tags 753 MiB
622e8ee363
Commit Graph

360 Commits

Author SHA1 Message Date
Campbell Barton
242035fa2d attempt to fix issue with opencollada + ubuntu ppa 2011-08-24 17:09:25 +00:00
Campbell Barton
9ad6434c4e opencollada find module. hopefully solves the problem where includes can in an /include subdir or not. 2011-08-24 16:04:35 +00:00
Campbell Barton
82e622f158 fix [#28356] Import export STL files, problem in script in version r39307 
& correct some bad comments.
 2011-08-24 14:22:41 +00:00
Sergey Sharybin
0e3b8ff6a5 Update rules for linux cross and mingw: list of DLLs for FFmpeg should be defined there. 2011-08-22 19:27:54 +00:00
Sergey Sharybin
e39cb8a040 Forgot this in previous commit 2011-08-22 19:00:32 +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
7d316b70b8 rename NAN_BUILDINFO --> WITH_BUILDINFO 2011-08-22 16:54:26 +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
Sergey Sharybin
36f20f162c Fix #28154: linux3-config.py doesn't exist 
Change OURPLATFORM from "linux<major_version>" to simple "linux".
Since new policy for linux kernel versions that major version in
platform doesn't make much sense for building rules so the same
rules could be used for both of linux2 and linux3 now/

Tested on both of linux2 and linux3 systems.
 2011-08-21 13:31:46 +00:00
Campbell Barton
93f135cfda added cmake configureation presets, so on *nix systems you can do... 
# minal blender with debug info
 make debug lite

 # blender with no ui
 make headless

 # blender as a python module
 make bpy
 2011-08-16 09:36:15 +00:00
Nathan Letwory
3359b7d7b7 use correct libdir for buildbot win64. 2011-08-11 16:43:36 +00:00
Sergey Sharybin
c9216e390c Commiting patch from jensverwiebe for NDOF support on OSX 2011-08-11 15:59:19 +00:00
Campbell Barton
349c838996 add missing header to cmake files (else some IDE's wont index it) 2011-08-08 05:43:04 +00:00
Thomas Dinges
fad243a4bf Mac Compile fix for ndof, by jensverwiebe. Thanks! 2011-08-07 22:48:04 +00:00
Campbell Barton
577293569a scons patch from jensverwiebe 
fix a silly bug in version detection, - added an OSX sdk-check

jensverwiebe, needs to get commit access!, but will apply his patches for now.
 2011-08-07 16:54:40 +00:00
Mike Erwin
6a0bbfd0e4 fixed ndof library detect for Mac SCons, ndof enabled by default (disabled if lib not found), minor cleanup 2011-08-07 16:29:05 +00:00
Mike Erwin
6c821f4078 stricter NDOF guards for Windows (forgot in earlier commit) 2011-08-06 23:13:36 +00:00
Kent Mein
7368298a45 Messed up char was causing problems on windows even though it was in the 
comments.

Kent
 2011-08-05 19:55:36 +00:00
Campbell Barton
a6b677c81d patch from jensverwiebe to scons to be compatible with gcc llvm. people who copy the darwin-config.py to their user-config.py should update. 2011-08-05 12:07:05 +00:00
Nathan Letwory
d795a78cb7 Default to False for WITH_BF_3DMOUSE, since needs separate package installed. 2011-08-03 14:04:48 +00:00
Nathan Letwory
289ef16fcf Add win64_scons builder 2011-08-03 13:00:11 +00:00
Nathan Letwory
36887bbc82 Add BF_BITNESS for win32/win64 2011-08-03 12:57:38 +00:00
Sergey Sharybin
aac8bab172 Fixing terrible typo. 2011-08-03 12:20:07 +00:00
Sergey Sharybin
f1fb54e126 Switch slave_pack to use new FFmpeg for windows. 2011-08-03 11:47:03 +00:00
Sergey Sharybin
df6dfb93b2 Switch windows buildbot to new FFmpeg 0.8.1. 
Hope it'll work because i haven't got buildbot slave by hand.
 2011-08-03 11:10:19 +00:00
Sergey Sharybin
2c4357c1e1 - Move list of FFmpeg DLLs to be installed from SConstruct 
to conficuration variable BF_FFMPEG_DDL.
  This would allow to use different FFmpeg in buildbot.
- Added some 3DMOUSE variables to list of command line options.
  Now 3dmouse related-settings can be set from command line.
 2011-08-03 10:50:21 +00:00
Sergey Sharybin
fd35ee8422 - Switch linux buildbot to FFmpeg-0.8.1 
- Enable FFmpeg for blenderplayer for linux buildbot.
 2011-08-03 09:07:30 +00:00
Nathan Letwory
5c36b75324 Simple argument to be able to explicitely tell the bitness you want to build Blender in. 
python scons\scons.py BF_BITNESS=32
python scons\scons.py BF_BITNESS=64

So from now on for Windows you don't have to run a specific win32 or win64 Python version
to get the Blender version you want. If you omit the BF_BITNESS flag the bitness as per
Python version will be used as before.

Note that this is an argument, so works *only* on the command-line, not in your user-config.py
 2011-08-02 18:33:39 +00:00
Sergey Sharybin
a9b093d9eb Changes for buildbot rules to use propper spnav library path. 2011-08-02 18:16:48 +00:00
Sergey Sharybin
13eefec9dd More flexible configuration for 3dmouse library for scons. 
Needed for release environment and buildbot.

Buildbot rules would be updated with next commit after
environment will be tested.
 2011-08-02 17:59:43 +00:00
Nathan Letwory
9e0113890e 3D Mouse support on for windows/msvc by default. 2011-08-02 09:06:55 +00:00
Jiri Hnidek
2e860a3e85 - Blender could be build with scons again. 2011-08-02 07:02:40 +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
f4293067c1 py api: sphinx doc corrections, pep8 cleanup and style edits, also added __all__ to some modules which were missing it. 2011-07-31 03:15:37 +00:00
Nathan Letwory
24def76ac8 svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-29 07:58:03 +00:00
Campbell Barton
2658949752 pep8 cleanup, also print message when attempting to run in animation player mode. 2011-07-29 01:24:03 +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
60ae40a0ed patch [#28030] SCONS Build: Build Date reflects "1" instead of actual date of build 
by Scott Giese (sgiese)

This bug effected windows and linux.
 2011-07-20 06:22:16 +00:00
Campbell Barton
c7532c5b81 update to cmake checker script to also check if our include paths are ok 2011-07-17 12:42:03 +00:00
Sergey Sharybin
9eb1b26312 Fix for recent GHOST SDL commit. 
SCons rules haven't been changed to deal with new option.
 2011-07-12 18:39:46 +00:00
Dalai Felinto
355cb26ff3 blenderplayer bundle in OSX doesn't need script folder (untested) 
I can't test this here, somehow blender+scons is failing in my building env.
but it should work. Basically it skips the copy of the script folder for the blenderplayer.app

I will test it once buildbot get pass this review ;)
 2011-07-05 00:30:27 +00:00
Campbell Barton
2c66ab12e9 minor pep8 edits 2011-07-01 12:33:34 +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
Mike Erwin
bca3da4fb0 updated build script for SpaceNav on Linux -- was foolishly relying on user-config.py 2011-06-28 21:20:47 +00:00
Mike Erwin
446be52164 made Pascal string less intrusive to build systems 2011-06-28 15:57:39 +00:00
Nathan Letwory
fdbae99668 Explicitly turn off JACK so it's clear it's not supported. 2011-06-28 06:56:39 +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
Campbell Barton
93bb6238e0 remove some unused flags and correct aud example heading 2011-06-27 07:44:59 +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
Campbell Barton
418bce9341 fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug 2011-06-25 14:10:46 +00:00
Campbell Barton
be94dc10c1 split cmake check configuration out 2011-06-22 05:30:06 +00:00
Campbell Barton
eaae38551f pep8 compliance 2011-06-21 17:17:51 +00:00
Campbell Barton
d33b63c5d8 update cmake checker to ignore file list and add some headers to the source list. 2011-06-21 17:00:34 +00:00
Campbell Barton
418d2ce49e allow rna to set vertex parent indices, blender checks for invalid values on access. 
build blenderplayer by default on linux with scons.
 2011-06-21 07:41:49 +00:00
Nathan Letwory
d10b247c78 Set Player building to True by default. 2011-06-20 20:51:12 +00:00
Campbell Barton
78ea4561a4 fix for python ABI search, was missing 'd' 2011-06-20 09:39:14 +00:00
Campbell Barton
97a85fe100 - add example for python rna property update 
- edit the copyright for blender specific cmake find modules
 2011-06-20 02:54:56 +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
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
Campbell Barton
e7c8169086 add back PYTHON_LIBPATH, needed for installing on python 2011-06-19 11:04:15 +00:00
Campbell Barton
def6bcd4e5 cmake add module for finding fftw3. 
also allow debug blender to build with non debug python
 2011-06-19 08:57:34 +00:00
Campbell Barton
167bcc2b67 cmake: add libsamplerate find module 2011-06-19 08:20:02 +00:00
Campbell Barton
b15a2b0ffc cmake: added FindOpenJPEG module. 2011-06-19 07:46:24 +00:00
Campbell Barton
145944d66f cmake: 
new macro file_list_suffix() for adding a suffix to every file in a path before the file extension.
 useful to create names for debug libs on windows.
 2011-06-19 06:57:56 +00:00
Campbell Barton
2c68bdb03e cmake: make python search into a find package module. 2011-06-18 15:53:47 +00:00
Campbell Barton
5e59d0c8bb make better use of cmake builtin funcitons for finding python library/header 2011-06-18 15:15:31 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Campbell Barton
549c2c58a1 added FindSndFile cmake module to replace inline checks. 2011-06-18 12:12:19 +00:00
Campbell Barton
82216030e9 py-api: store frequently used strings as unicode PyObject's to avoid creating/distroying every time. 
also fix for cmake warning
 2011-06-18 08:45:45 +00:00
Nathan Letwory
1d3a025e0a Fix [#27666] Python/Windows issue: "import uuid" results in an error popup 
submitted by Gaia Clary

Ignore msvc runtime libs while linking. Tested on win64.
 2011-06-17 00:30:04 +00:00
Campbell Barton
2e8ca6d196 include some extra search paths for cmake openexr 2011-06-16 02:55:26 +00:00
Campbell Barton
0575c05eb0 fix to FindOpenEXR pointed out by Sergey Sharybin, 
also added check for IlmThread and marked individual library cache variables as advanced.
 2011-06-16 02:48:07 +00:00
Campbell Barton
04c5f054d8 error in recent commit 2011-06-15 14:00:50 +00:00
Campbell Barton
c02121b708 use full library paths for openexr & msvc, also remove unneeded exr includes 2011-06-15 13:54:57 +00:00
Campbell Barton
bb6e0834e0 cmake: combine debug/optimized into one target_link_libraries() call. 2011-06-15 13:42:02 +00:00
Campbell Barton
4f3936083a replace own inline cmake include search logic for a typical FindXXX.cmake module. 2011-06-15 12:09:02 +00:00
Campbell Barton
1243992f27 cmake: correct uninitialized vars 2011-06-14 00:24:50 +00:00
Nathan Letwory
1b1fdd7ecf Turn off Quicktime support by default. Will be phased out soon. 2011-06-13 09:33:27 +00:00
Campbell Barton
fedc811014 minor updates to the cmake checker 2011-06-13 03:09:14 +00:00
Campbell Barton
c2e1f3a1e2 fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes. 
Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C
 2011-06-11 06:00:28 +00:00
Campbell Barton
9cf0bbb95c added a check to console auto-compleation for pythons struct_seq type, so bpy.app and sys.float_info autocompleate their attributes rather then bring treated as a typle. 2011-06-10 09:44:27 +00:00
Mike Erwin
e75ff53452 migrated NDOF code from soc-2010-merwin, SpaceNavigator now works on Mac blender 2011-06-08 21:18:03 +00:00
Nathan Letwory
899f2776db Shuffle some build code around to ensure debug builds on Windows actually run too. 
* creator/SConscript is now empty, code is moved to an emitter function in Blender.py
* make sure COLLADA debug libs are used when BF_DEBUG=True
 2011-06-08 11:53:07 +00:00
Campbell Barton
7b9eabb6f2 fix from nico_ga on IRC, building on MSVC with jack but not ffmpeg. 2011-06-06 08:40:47 +00:00
Sergey Sharybin
d84c6a3cdb Fix for linux buildslaves. Now they should be able to compile branches. 2011-06-03 21:36:39 +00:00
Brecht Van Lommel
06ca703737 BuildBot: various changes to support building branches. 2011-06-03 20:44:23 +00:00
Brecht Van Lommel
7b4aac3e34 Fix #27481: windows uninstaller could remove files unrelated to blender 
when installing to a folder that already existed. Now the uninstaller
will remove only the files it has installed, and leave any other files
in the installation directory intact.
 2011-06-01 13:13:55 +00:00
Campbell Barton
09da9d4393 cmake maintenance 
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
 2011-05-31 01:15:44 +00:00
Campbell Barton
20ae95422e include ffmpeg_compat header in cmake source list. 2011-05-28 04:53:17 +00:00
Brecht Van Lommel
d369a6aaaf Windows installer and Path changes, fixing various issues: 
* Windows installer not working for non-admin users and multiple users
* Addon scripts not installing next to user configuration
* Portable install not being taken into account in all places

The main problem was the windows installer was installing system scripts in
AppData next to the user configuration directory, which is not shared between
users. Now these are installed in ProgramFiles, and only addon scripts added
by the users go to AppData.

On all platforms, addon scripts were sometimes getting installed between
system scripts, because the scripts folder in the executable directory was
given precedence over the user configuration folder, that is no longer done
now. So addons now behave like user configuration, they are preserved even
if you download a newer build of the same blender version.

If you have an installation of 2.57 on windows, the addon install location
will not change until we do the version bump to 2.58, to avoid conflicts with
the existing the installed 2.57 version.

The old behavior of giving precedence to the local folder was done to support
portable install, where all configuration is written to the local folder. This
is now implemented differently: if and only if a "config" folder exists in the
local folder, portable install will be assumed, and files will only be written
to that local folder.
 2011-05-27 09:57:53 +00:00
Campbell Barton
514de547ac update to build system excluding parts of the python bundle. 2011-05-26 11:45:25 +00:00
Campbell Barton
26252bb315 correct spelling error and some pep8 changes. 2011-05-26 09:33:51 +00:00
Campbell Barton
b69c1e8f1a CMake changes 
- don't allow building if the LIBDIR is not found on mac/windows.
- by default use -O2 rather then -O3 for GCC release flags, was crashing some GCC versions and blender releases are supposed to use -O2.
 2011-05-23 14:56:14 +00:00
Sergey Sharybin
a8ef6ffd17 typo in previous commit 2011-05-20 13:10:40 +00:00
Sergey Sharybin
e721d31b5d buildbot: 
ffmpeg was compuled with faad now (aac support which keeps
libs gpl2 compatibile).
Updating library dependencies for buildbot rules.
 2011-05-20 13:06:19 +00:00