Commit Graph

30 Commits

Author SHA1 Message Date
Joseph Eagar
f81bc543e7 =Scons ffmpeg link order update=
Update link order for ffmpeg on win32, patch provided by
Anders Nor "Debolaz" Berle on irc.
2007-12-26 10:59:08 +00:00
Joseph Eagar
139cb3c0bc =Scons ffmpeg update and avi fix=
Updated scons to work with the ffmpeg binaries in
lib/windows/gcc again.  Also fixed a bug reported by
Debolaz on irc.  Blender's internal avi reading (which can
only read simple formats like motion jpeg) was telling the
video code it could read all avis, without checking their
codec.

To fix this, I copied AVI_open_movie(), and modified it to
to replace AVI_is_avi().  Now it properly checks the codec,
and validates the header.
2007-12-25 06:48:45 +00:00
Nathan Letwory
8ab62dc6c2 * make sure stdc++ is linked against. 2007-07-01 08:55:50 +00:00
Kent Mein
613646b33e This commit is a modified version of patch #6860
It adds read only dds support.  (Writing will come later)

Kent
2007-06-25 19:50:25 +00:00
Stephen Swaney
5ca1910276 add -Wdeclaration-after-statement to warning flags for gcc 2007-04-12 18:20:00 +00:00
Nathan Letwory
113fa75449 === SCons ===
Update configs to use Python 2.5. To quote from IRC:

07:17  * stivs waves his +5 Mouse of Power and authorizes jestie to update all of scons to py 2.5.
07:17 < stivs> let the screaming begin!
2007-02-28 04:51:13 +00:00
Nathan Letwory
eb73025c63 ==SCons==
Enable Bullet2 for Scons. This should work for all platforms, but please, test, test,
 test, test, test (ad infinitum)
2006-11-21 06:11:41 +00:00
Andrea Weikert
32d49a8dae ==== scons ====
- cleanup for wintab library headers
- properly define BF_WINTAB and BF_WINTAB_INC
2006-11-13 06:40:08 +00:00
Kent Mein
d1285dc756 This is really two commits but the first one is very small and affects one
file I modified for the other patch.  So I'm being bad and combining them
together.

First one is added -lXi to LLIBS for solaris.  (Makes it so it compiles
again with the tablet stuff added)

Second one is the real commit its an expansion of patch #4458
This adds optional ICONV lining to support international fonts in the
file selector.  Thanks to wisit venita (dripstone) I mostly just cleaned
it up a little and made it optional via defines.

Its currently turned off for all platforms except for solaris on scons.
For scons see your config/(platform).py file look for WITH_BF_ICONV
For the Makefiles look at source/nan_definitions.mk look for WITH_ICONV
(basically you'll want to export WITH_ICONV=true and possibly set some other
stuff)

Let me know if there are any problems.

Kent
--
mein@cs.umn.edu
2006-11-09 15:45:19 +00:00
Nathan Letwory
88446eeca4 Patch 5105 by Joshua Leung (Aligorith), slightly modified by me
* Add WITH_BF_YAFRAY, which per default is 'true', so no visible changes for developers (and users).

Set WITH_BF_YAFRAY to 'false', and you'll save some major compile time :) Also handy if you're strapped for memory and compilation fails on yafray compilation due
 to this.

- this commit also has a few whitespace changes and
- made BF_NO_ELBEEM a proper BoolOption. This will be renamed to WITH_BF_ELBEEM in the near future...
2006-10-18 05:45:47 +00:00
Nathan Letwory
1266234202 * remove the .Append(LIBS = ['libverse']), since it confused the build system.
* removed unused options BF_VERSE_LIBPATH, BF_VERSE, BF_VERSE_LIBS, since they are not used at all.
* some whitespace mods

There should be no more issues with "libverse.lib" not being found (or anything like
 that).
2006-10-11 07:28:37 +00:00
Nathan Letwory
278b242638 * add missing WITH_BF_VERSE to config files for completeness. Reported by Emanuel Greisen. 2006-09-05 08:36:42 +00:00
Nathan Letwory
7fd8ce8156 * Patch #4909 by Joseph Eagar (joeedh)
- this patch adds verse support for SCons, which can be enabled by
    giving WITH_BF_VERSE=1, ie. on command-line
  - this patch also adds a custom lib dir possibility. From the patch description:


 "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py."

* Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
Nathan Letwory
800ae7cf46 [ #4035 ] patch to make scons compile with ffmpeg in mingw
Submitted by Joseph Eagar (joeedh). windows/gcc ffmpeg library may need recompiling to support all codecs necessary (ie. H264 doesn't work).
2006-08-14 12:47:13 +00:00
Andrea Weikert
98b8b876b6 - changed back SHGetFolderPath to SHGetSpecialFolderPath to support older Win98 and Win95 systems without having to redirstribute shfolder.dll
- MINGW should compile too now (was problem when fucntionality was first introduced), tested with MINGW 5.0.2 (scons)
- added -lshell32 for the dependency on MINGW
2006-06-12 19:13:17 +00:00
Andrea Weikert
a89905d6fa === MINGW compile ===
Fixing compile for Windows mingw builds with cygwin make and scons.
Used SHGetFolderPath instead of SHGetSpecialFolderPath which is
better supported for mingw.
Thanks to Ralf Hoelzemer for the tip and the patch.

Let me know if any problems persist, I'll try to fix then.

--- Andrea
2006-03-20 17:25:42 +00:00
Nathan Letwory
b92c2197ec ==SCons==
* Applied patch #4012 by Joseph Eagar. The patch provides a way to quickly assign a list
  of libraries to build with debug symbols. Usage:

  scons BF_QUICKDEBUG=src,bf_blenkernel,bf_blenlib
2006-03-17 16:38:39 +00:00
Nathan Letwory
16c0f8bfae ==SCons==
* If you look quickly somewhere else, you won't notice the missing ''s
2006-03-13 13:45:11 +00:00
Nathan Letwory
9be2af4523 ==SCons==
* Begin of the week, so I wanted to fill my commit quota right off the bat.
  Add CC and CXX defaults for mingw, too. Unless we have invisible configs
  this should be the last one :S
2006-03-13 13:42:56 +00:00
Nathan Letwory
595b4158ba ==SCons==
* a comma was missing from a list :S
2006-03-11 13:15:39 +00:00
Nathan Letwory
a71c07a044 ==SCons==
* change CCFLAGS to CXXFLAGS and CFLAGS to CCFLAGS to be better
  for SCons
- removed old cruft from ancient system
2006-03-10 20:11:48 +00:00
Nathan Letwory
d9f9e76500 ==SCons==
+ SCons support for pthreads-win32. Library will be committed shortly into
  lib/windows, so be sure to check commit list and update that as well
  when the pthread lib is available.
2006-02-25 14:53:27 +00:00
Nathan Letwory
e377a5f721 ==SCons==
* Use same warning flags as with linux2, greatly reducing noise in
  output during compile. Also for developers using win32/mingw now
  in effect: correct *each* and *every* warning in your code. I
  command you to!
2006-02-25 10:40:31 +00:00
Nathan Letwory
30a9f0b053 ==SCons==
* accidently left WITH_BF_STATICOPENGL enabled for non-linux. tsktsk.
2006-02-21 14:24:08 +00:00
Nathan Letwory
11fd198a70 ==SCons==
* when WITH_BF_STATICOPENGL=1 on Linux Blender will be statically linked
  against GL libraries. NOTE: I used values that worked on my machine -
  platform managers and people who have better knowledge about this, please
  modify config/linux2-config.py accordingly.
2006-02-21 12:36:50 +00:00
Nathan Letwory
0876e99ccf ==SCons==
A working configuration file for win32/mingw, provided by Rehno Lindeque.
Thanks!
2006-02-19 19:33:36 +00:00
Nathan Letwory
896b6288ca ==SCons==
* remove useless BF_TIFF* options. Upon closer inspection of code, only
  path to headers is needed
2006-02-05 17:50:19 +00:00
Nathan Letwory
3c9494bbfd * reflect WITH_BF_INTERNATIONAL changes into (platform)-config.py files too 2006-02-05 12:27:49 +00:00
Nathan Letwory
ea539ab643 * Use better option propagation everywhere
lukep, I didn't touch darwin-config.py yet, because you're still
  working on it. But if you could see and make similar changes as
  I did to the rest.
2006-02-05 00:47:34 +00:00
Nathan Letwory
3bb82a27fc == SCons ==
* This commit is all of the rewrite work done on the SCons system. For
  documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt.
  Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring
  contains valuable information, along with what still needs to be done.

    - linux, os x and windows compile now.
    - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py)
        - NOTE: Jean-Luc P will commit sometime during the weekend proper
          appit() for OS X. For now, copy the resulting binary to an
          existing .app bundle.
    - features:
        - cleaner structure for better maintenance
        - cleaner output during compile
        - better handling of build options
        - general overall speed increase
        - see the wiki for more info

  Cygwin, FreeBSD and Solaris systems still need work. For these systems:
    1) copy a config/(platform)-config.py to ie. config/cygwin-config.py
    2) set the proper defaults for your platform
    3) mail me at jesterking at letwory dot net with you configuration. if
       you need any modifications to the system, do send a patch, too.

  I'll be giving first-aid today and tomorrow, after that it'll be all
  regular development work :)

  /Nathan
2006-02-04 14:15:10 +00:00