[tuhopuu-cvs] CVS commit: blender Makefile blender/source Makefile nan_link.mk blender/source/blender/imbuf/intern Makefile imagemagick.c
cwant at ualberta.ca
Fri Feb 14 21:25:16 CET 2003
hos (Chris Want) 2003/02/14 21:25:14 CET
blender/source Makefile nan_link.mk
blender/source/blender/imbuf/intern Makefile imagemagick.c
Two things in this commit, with elaboration below:
1) Enabling Rob's ImageMagick support for UNIX;
2) Some makefile options that help me, and *shouldn't* hinder others.
1) This compiles and links with libMagick ... I'm not sure if
it actually works though (what is it supposed to do?). This
is enabled by uncommenting the "# export WITH_IMAGEMAGICK=true"
line in the top level Makefile.
2) The current Makefiles don't work too well for my purposes and
as such I use modified local copies and I have to revert my
Makefiles to what is in CVS everytime I have to commit a change to
them. To make this easier, I have added a couple of env variables:
NAN_MOSTLY_STATIC and NAN_DEBIAN_NVIDIA_WEIRDNESS. The NAN_MOSTLY_STATIC
variable links in stuff like the openal files statically, and the
NAN_DEBIAN_NVIDIA_WEIRDNESS variable helps deal with the diversions
that the debian package manager uses for the mesa stuff when you
have the nvidia drivers installed. These variables are not set
by default so they should not be harmful to other people's build
systems ... let me know if you have problems or want to recommend
a better way of dealing with this.
Revision Changes Path
1.19 +4 -0 blender/Makefile
1.14 +12 -1 blender/source/Makefile
1.10 +25 -3 blender/source/nan_link.mk
1.6 +5 -1 blender/source/blender/imbuf/intern/Makefile
1.2 +4 -4 blender/source/blender/imbuf/intern/imagemagick.c
More information about the tuhopuu-cvs