Commit Graph

24 Commits

Author SHA1 Message Date
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
5d40740671 * add debug flag so debug symbols are actually created when doing a 'scons BF_DEBUG=1' 2006-09-01 13:04:33 +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
Kent Mein
d10797a23e was:
BF_FFMPEG_LIBPATH =  '$(BF_FFMPEG)/lib'
Needs to be:
	BF_FFMPEG_LIBPATH =  '${BF_FFMPEG}/lib'

There are some commented out ones that should maybe be switched as well
so it doesn't happen again but this fixes the problem for now :)

Kent
2006-08-14 17:16:51 +00:00
Ken Hughes
9cc25e5a15 Make scons pick up default link flags from previous commit on linux platforms;
statically-linked python releases won't work otherwise.  Bugfixes for #4676
and #4486.
2006-07-14 04:13:55 +00:00
D.J. Capelis
6a72f9f61d Changing some default link flags, crossing fingers and waiting for bugs to
magically be fixed.
2006-07-14 02:02:57 +00:00
D.J. Capelis
10d6a50ae0 Correcting order for static linking. 2006-07-03 10:00:56 +00:00
Stephen Swaney
d45b13ea64 support for ffmpeg in linux. default is no.
set BF_OPENGL to /usr rather than /usr/lib.  thx Ken!
2006-06-04 16:46:55 +00:00
D.J. Capelis
2be9d80b5a Reordering OpenEXR libraries to correctly reflect dependencies.
This fixes some ld errors when the static versions of the EXR libs are used.
2006-04-06 20:11:06 +00:00
Nathan Letwory
cf6c497d6f ==SCons==
* CC and CXX for linux2
2006-03-14 12:20:04 +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
8dd19059fc ==SCons==
* Warning flags I had dutifully copied from sirdudes yet unpublished
  make rewrite turned out to be the Paranoia flags, causing the flood
  of warnings. Using better flags instead (like current Makefile level 1).

  All developers on Linux that use SCons for building - (new) code you write is
  supposed to be *entirely* warning-free from now on (Ton said so!)
2006-02-25 01:06:02 +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
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
257124a44f - remove Xmu and Xext from linking line for linux2, as they are not needed
+ WITH_BF_OPENAL actually enables or disables use of OpenAL
+ WITH_BF_OPENEXR removes openexr libs from linking if disabled
2006-02-05 11:11:44 +00:00
Nathan Letwory
3d3f5d1640 + WITH_BF_OPENAL=0 should now actually not need OpenAL stuff
* BF_PROFILE_FLAGS to list form
2006-02-05 01:09:40 +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
cb2f833aa5 * Made options evaluate differently, so setting one option properly
propagates to related options:

  In (platform)-config.py
    BF_PYTHON_VERSION = '2.4'
    BF_PYTHON_INC = '/usr/include/python${BF_PYTHON_VERSION}'

  In user-config.py
    BF_PYTHON_VERSION = '2.3'

  This will now have BF_PYTHON_INC evaluate actually to
  '/usr/include/python2.3' and not to '/usr/include/python2.4' as with
  the old way. Reported by Chris Want.

  Todo: also use in other platform configurations.
2006-02-05 00:03:51 +00:00
Nathan Letwory
e48ed941a0 ==SCons==
* If you set C_WARN=[] and CC_WARN=[] in your user-config.py, no complaints
  whatsoever should show. Otherwise a lot of warnings are shown.
2006-02-04 15:52:55 +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