Commit Graph

126 Commits

Author SHA1 Message Date
Ton Roosendaal
add697407a Bug fix #1995
Unpacking a file with packed sounds didn't save the samples... was due
to *very* weird method samples were put in Blender.
2004-12-09 13:46:38 +00:00
Kent Mein
175491deb4 I had to change a bit of the stuff I added to get solaris openal working.
I also removed a redundant bit of config stuff for freebsd
that didn't do anything.

Kent
2004-12-09 13:13:24 +00:00
Kent Mein
80b25309b1 This commit makes it so openal finally works on solaris.
Kent
2004-12-08 14:58:40 +00:00
Ton Roosendaal
4226715fc0 Update make system for darwin;
- using python framework (default on, set it off with define in
  definitions.mk)
- not installing .bfont.tff
2004-11-14 13:44:47 +00:00
Stefan Gartner
772b66d79f build on Linux/x86_64 2004-11-03 14:45:52 +00:00
Chris Want
95b9534d2b We don't use ODE anymore, so I commented out some lines that make it
required to build.
2004-08-26 22:42:44 +00:00
Chris Want
6883efe712 windows-gcc vs. solid, round 2
Doing it the Kester way, but in a way that it actually compiles and links
for non-Kester people. >=P

(translation: FREE_WINDOWS now builds the stuff in extern and overwrites
the pre-compiled solid libs).
2004-07-19 02:43:07 +00:00
Chris Want
98b86b55fa This makes the windows-gcc build finish (only link to libsolid.a)
... might not be the best way, but it works.
2004-07-18 18:42:36 +00:00
Kester Maddock
a57cd82e9f Remove all the autoconf stuff for QHull & SOLID and use the Makefiles.
This should make building Solid & Qhull much more reliable.
2004-07-17 02:44:24 +00:00
Brecht Van Lommel
4f1c674ee0 Added SuperLU 3.0:
http://crd.lbl.gov/~xiaoye/SuperLU/

This is a library to solve sparse matrix systems (type A*x=B). It is able
to solve large systems very FAST. Only the necessary parts of the library
are included to limit file size and compilation time. This means the example
files, fortran interface, test files, matlab interface, cblas library,
complex number part and build system have been left out. All (gcc) warnings
have been fixed too.

This library will be used for LSCM UV unwrapping. With this library, LSCM
unwrapping can be calculated in a split second, making the unwrapping proces
much more interactive.

Added OpenNL (Open Numerical Libary):
http://www.loria.fr/~levy/OpenNL/

OpenNL is a library to easily construct and solve sparse linear systems. We
use a stripped down version, as an interface to SuperLU.

This library was kindly given to use by Bruno Levy.
2004-07-13 11:42:13 +00:00
Nathan Letwory
39a8c014c4 This commit removes the glue from Blender, and with it
the directories decrypt, deflate, encrypt, inflate, readstreamglue,
sign, writeblenfile and writestreamglue.

Sirdude was so kind to modify the makefiles, so SCons and
Make are ready to build with the new Blender.

Visual Studio workspaces, solutions and projectfiles still need
to be updated (I'll do the .vcprojs and .sln myself after this commit).

Runtimes created with the Blender Publisher are not anymore
recognised - if you want these available, you'll have to convert
them first to .blends with the Publisher.
2004-04-16 15:55:16 +00:00
Stefan Gartner
837da93f19 enable openal support for os x and linux-powerpc
as there is a conflict between openal and sdl (when compiled with cdrom
support), i had to disable support for cd playing using sdl on os x
for the time being.
2004-04-14 13:00:36 +00:00
Chris Want
05707df10c Making the SDL CD stuff link right. 2004-04-04 15:33:18 +00:00
Chris Want
2cd00774cd Makefile support for solid -- assumes solid and qhull are in the lib
dir, i.e., ../lib/your_platform/{solid|qhull}.
2004-03-28 21:56:00 +00:00
Chris Want
5b90aafbd6 Added 2 options to the Makefiles (enable in environment, user-def.mk,
or whatever):

NAN_NO_KETSJI: when set to true, disables compilation of the game engine.
NAN_JUST_BLENDERDYNAMIC: when set to true, only dynamic executable is
build (i.e., no plugin, etc).

Note that NAN_NO_KETSJI implies NAN_JUST_BLENDERDYNAMIC.
2004-03-21 19:59:51 +00:00
Michel Selten
d705e90841 Makefile update
* In a previous commit, the following targets on Linux were commented out:
  - plugin
  - xplink
  - blenderstatic
  - blenderplayer
  This commit uncommented those targets again.
2004-01-28 19:05:52 +00:00
Kent Mein
a017282b62 Tweaks to get yafray stuff working with Makefiles
Kent
2004-01-05 17:42:07 +00:00
Wouter van Heyst
57a7dfe5a5 - Revert to NaN makefiles 2004-01-05 00:06:11 +00:00
Alejandro Conty Estevez
eff07b8329 Basic initial yafray integration by Eeshlo.
Materials are exported the best we can do by now. It will look almost as in
blender except for the missing procedural textures and some minor issues.
You have to tweak normal modulation amount to get the desired result cause
is not the same in yafray.

We added a panel in render space to adjust some yafray settings (GI and so)

Also we export transparency and reflection using new raytracing settings,
but that will be changed and improved soon.

Remember that you have to set YFexport path in user defaults and yafray must
be on path (version 0.0.6)

We added the "yafray" button to activate all this stuff in the render window.
Panel and settings are only shown when checked.

So now when activated the code calls yafray export instead of the internal
renderer and finally the resulting image is loaded back into render window's
buffer. So animation is also possible and results can be saved using blender
usual scheme.
2004-01-04 22:10:36 +00:00
Wouter van Heyst
f56eb94bab Work done to build blender on Linux [sparc64].
extern/ode/dist/ode/test/test_ode.cpp:
- Don't include <ieeefp.h> on sparc linux, it doesn't exist.

extern/ode/Makefile:
- While hacking on ode, get rid of that annoying infinite rebuild

source/Makefile:
- Define a default BINTARGETS (just blenderdynamic) for linux, individual archs
  can override/add to that if they so please

source/nan_link.nmk:
- Add a sparc64 arch target to the linux section of nan_link.mk, using the same
  options as powerpc

After the first ode problem, the build completed all but the linking of a
blender binary, because there wasn't any target defined!

On the rebuilding: The usersettings would have a newer date than targets
depending on it, so it would rebuild entirely. I haven't really fixed this, but
isolated it to the platforms where usersettings need to be moved around (darwin
and windows). FBSD patches the usersettings, so it might still happen there.  I
didn't bother with a proper fix, as it looks like we're moving to scons soon.
I'm amazed no one got annoyed enough before to take care of this.
2004-01-01 23:19:08 +00:00
Robert Wenzlaff
85ae21d5dd Commit of cursor framework. Cursors now defined in source/blender/src/cursors.c and
source/blender/include/BIF_cursors.h.  Allows large cursors on Win32 and X11.
See cursors.c for documentatioin on how to use.
2003-12-26 20:12:42 +00:00
Ton Roosendaal
470b5c0366 So, for the platform managers to check:
- the link order for Blender has changed, the libradiosity.a has to be moved after the librender.a (obviously for a new dependency!). Check blender/source/Makefile
- there's a new file: blender/source/radiosity/intern/source/radrender.c

Here's what the new code does:

Using the core routines of the Radiosity tool, each renderface with 'emit material' and each renderface with 'radio material flag' set will be used to itterate to a global illumination solution. Per face with high energy (emit) little images are rendered (hemicubes) which makes up lookup tables to 'shoot' its energy to other faces.
In the end this energy - color - then is directly added to the pixel colors while rendering, Gouraud shaded.
Since it's done with renderfaces, it works for all primitives in Blender.

What is doesn't do yet:
- take into account textured color of faces. Currently it uses the material RGB color for filtering distributed energy.
- do some smart pre-subdividing. I don't know yet if this is useful... Right now it means that you'll have to balance the models yourself, to deliver small faces where you want a high accuracy for shadowing.
- unified render (is at my todo list)

User notes:
- per Material you want to have included in radiosity render: set the 'radio' flag. For newly added Materials it is ON by default now.
- the Ambient slider in Material controls the amount of radiosity color.
- for enabling radiosity rendering, set the F10 "Radio" button.
- the Radiosity buttons now only show the relevant radiosity rendering options. Pressing "collect meshes" will show all buttons again.
- for meshes, the faces who use Radio material always call the 'autosmooth' routine, this to make sure sharp angles (like corners in a room) do not have shared vertices. For some smooth models (like the raptor example) you might increase the standard smoothing angle from 30 to 45 degree.

Technical notes:
- I had to expand the renderface and rendervertices for it... shame on me! Faces have one pointer extra, render vertices four floats...
- The size of the hemicubes is now based at the boundbox of the entire scene (0.002 of it). This should be more reliable... to be done
- I fixed a bug in radiosity render, where sometimes backfaces where lit

In general:
I'd like everyone to play a bit with this system. It's not easy to get good results with it. A simple "hit and go" isn't there... maybe some good suggestions?
2003-08-31 20:33:46 +00:00
Chris Want
d58a5fa269 Added the variable NAN_NO_OPENAL to force building without
openal. Set NAN_NO_OPENAL to true for this behavior.
Also removed a comment about EXPYTHON, which is obsolete.
2003-07-27 17:09:19 +00:00
Wouter van Heyst
d2fe1ea50a - Make the output bin/ directory for every target that needs it.
Fixes build problems where (for example) plugin was to be made before the real
blender targets, and the entire build failed because of this missing directory.
It used to be so that nan_subdirs.mk made the output directory, but that relies
on DIR being correctly set, which is no longer the case.
2003-07-21 20:09:36 +00:00
Stefan Gartner
90f325ea6e some sdl related stuff:
* moved references to libSDL out of ifeq($(INTERNATIONAL), true) (win32)
and  ifeq($(WITH_FREETYPE2),true) (irix) conditionals in source/Makefile

* look for sdl in $(LCGDIR)/sdl if sdl-config isn't found

thanks to LarstiQ for doing most of the work
2003-07-18 10:11:40 +00:00
Chris Want
e7d35b40b0 - Made references to SoundSystem look in intern instead of gameengine for
all platforms. Please test on non-linux/non-irix.
- Changed another libsoundsystem.a to libSoundSystem.a.
- Removed comments refering to fmod (I assume it's not coming back ever)
2003-07-17 03:36:25 +00:00
Chris Want
ae512b137c Changed some occurances of the lib 'soundsystem' to 'SoundSystem'
(seems half of the references were one way, the other half were
the other way). Also made irix link to $(OCGDIR)/intern/*SoundSystem/*
instead of $(OCGDIR)/gameengine/*SoundSystem/*
2003-07-17 02:36:56 +00:00
Chris Want
0fde8dedf0 Sound support for irix 2003-07-16 23:53:09 +00:00
Florian Eggenberger
899a12a5cb -SDL links now on windows for cygwin-msvc and cygwin-gcc. 2003-07-16 19:53:48 +00:00
Kent Mein
8dd015e9b0 Hopefully update for NaN Makefiles for the moving of SoundSystem.
I need to get openal working on my machine before I can test it so
if it doesn't work feel free to fix it.  Hopefully this will be
the majority of the stuff though.

Kent
2003-07-16 19:00:04 +00:00
Chris Want
307586f03f EXPYTHON in now the only python for the Makefiles build. 2003-07-12 00:46:43 +00:00
Hans Lambermont
2775b2c380 fix the link target naming 2003-06-14 22:58:01 +00:00
Kent Mein
3c7c20676e This is a fun one ;)
Removes ssl from blender.
makes the following directorys not needed anymore:
blender/intern/keymaker
blender/source/blender/src/pub
blender/source/blender/encrypt
blender/source/blender/decrypt
blender/source/blender/sign
blender/source/blender/verify

It works with The Nan Makefiles and autoconf, could whoever is working
on the other build systems update them so we can nuke those directorys?
They won't do anything but I figured I'd leave them in for a week or so
to make things easyer on people.

Kent
2003-05-30 15:06:54 +00:00
Chris Want
76dc07b9f6 Support for the experimental python stuff in the traditional
Makefiles (set EXPYTHON=true in user-def.mk).
2003-05-29 16:29:57 +00:00
Chris Want
924a849755 Support for building bf-blender under windows with gcc (huge thanks to
Florian Eggenburger).

Full instructions are in doc/README.windows-gcc.

Main differences from Florian's patch:

- the 'lib' dir should now be the same level as the 'blender' dir (rather
than being a subdir of 'blender'). This is consistent with the other
platforms that bf-blender supports (tuhopuu will also adopt this convention
hopefully soon).

- the script 'free_windows-env.mk' is no longer needed ... see the
docs about how this is overcome (again, tuhopuu will hopefully
also follow this route soon).

- the dlltool dir has it's own Makefile that builds all of the
needed stub libraries from the dll's in cvs.
2003-05-24 20:04:37 +00:00
Kent Mein
b8f2835ba2 Stage two of removing ssl support.
I've modified things so it nolonger uses the stuff in
blender/source/blender/verify
This should be working for both the old Makefiles and the autoconf stuff.
People working with other build systems please update them,
both blender/source/blender/verify and sign will be going away soon.

(Next step is to get rid of blender/intern/keymaker)

Kent
2003-05-22 17:16:41 +00:00
Kent Mein
5930fe7162 First step in removing ssl support...
I removed the source/blender/sign dir from both autoconf and the
old makefiles.
If someone could update the projectfiles and the other build systems
then we can nuke that directory.

Kent
2003-05-20 17:13:39 +00:00
Chris Want
769d724d83 Static linking of freetype, libintl from sgi freeware for irix
and made WITH_FREETYPE2 independent of INTERNATIONAL (please
test).
2003-05-13 03:30:26 +00:00
Simon Clitherow
9ffc4e7be5 cygwin build now uses Matt Ebb's new blender icon 2003-05-11 20:58:41 +00:00
Simon Clitherow
92b017f3ce cygwin build now links with freetype2ST.lib 2003-05-11 18:17:00 +00:00
Chris Want
fbca17dfa7 FTGL support for irix (I would like to say international and truetype
text object support, but I can't test too much until Monday).
2003-05-11 00:27:23 +00:00
Stefan Gartner
b3c48c4d2c enable truetype fonts for text objects when building with the original
Makefiles. Platform manages should check nan_definitions.mk and set
INTERNATIONAL to true for their platforms.
2003-05-10 16:35:28 +00:00
Chris Want
1ecddea462 Some modifications to get cygwin/msvc compiling/linking 2003-05-10 16:25:23 +00:00
Stefan Gartner
7180ad4c86 enable multilingual support on linux and os x using the original Makefiles 2003-05-05 21:28:54 +00:00
Stefan Gartner
723b84c79c fun with quicktime:
#include <QuickTime/Movies.h> instead of #include <Movies.h> on OS X to
avoid having to specify the full path to the QT headers in the Makefiles

#undef NDEBUG on OS X to avoid errors about ID being declared twice

enable support for QuickTime in the original Makefiles on OS X
2003-05-02 13:36:56 +00:00
Chris Want
1f668df514 Irix will now link to ode 2003-03-31 17:27:20 +00:00
Wouter van Heyst
22305bc08d FreeBSD can use the exact same python includes as everyone else 2003-03-25 23:36:40 +00:00
Daniel Dunbar
de09cf7609 Remove references to obsolete misc lib 2003-03-24 17:34:43 +00:00
Hans Lambermont
ad625dd508 - fix 'debug' target
- add ID and copyrights to top level makefile
2003-02-17 16:51:16 +00:00
Frank van Beek
e20e2c0201 - build and link against OpenAL instead of FMod on windows
Note: this needs to be changed in the projectfiles as well
2003-02-09 20:51:14 +00:00
Stefan Gartner
5b8aee77a2 don't use fmod on darwin 2003-02-09 20:15:39 +00:00
Wouter van Heyst
cdfeebb00f Change a freebsd and Linux/ppc case to first build blenderdynamic, and blenderstatic after that.
This works around tinderbox bailing out on static and thus burning, the static
build still breaks but we're not checking that in tinderbox yet.
2003-02-03 01:46:29 +00:00
Wouter van Heyst
1ee378865f Correct typo in blenderstatic rule 2003-02-02 16:45:32 +00:00
Kent Mein
407071d526 Modified the Makefile to build just blender now instead of blenderpublisher
blendercreator....

This might break tinderbox but we need to commit it to test it to
get it working fully. :)

Kent
2003-02-02 15:38:42 +00:00
Kent Mein
227a8b7d16 I took out adding ode to the directorys to build in blender/source/Makefile
since its no longer there.  Here is the diff.

Kent

Index: Makefile
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile    11 Jan 2003 22:47:48 -0000      1.24
+++ Makefile    14 Jan 2003 19:06:59 -0000
@@ -39,9 +39,6 @@
 include nan_definitions.mk

 DIRS = creator blender kernel gameengine
-ifneq ($(OS),$(findstring $(OS), "darwin freebsd irix linux"))
-    DIRS += ode
-endif
2003-01-14 19:08:56 +00:00
Hans Lambermont
a1a8edffeb don't try to link against ODE on Irix 2003-01-11 22:47:48 +00:00
Wouter van Heyst
ade767d2af Linux now also uses ode from lib/ 2003-01-07 05:08:10 +00:00
Hans Lambermont
3a0c7e4a8a John Walton's changes for Irix mips3 (NaN makefiles build) 2003-01-06 23:01:28 +00:00
Frank van Beek
e8b0922986 - DEFFILE needed for linking Netscape Blender plugin now points to local
version of npB3DPlg.def
2003-01-05 17:58:46 +00:00
Hans Lambermont
95c780f203 remove ssr leftovers 2003-01-05 14:27:57 +00:00
Hans Lambermont
080dd299d6 - use ODE in lib/ for FreeBSD
- use default python library path
- remove obsolete SSR comments
2003-01-04 20:20:54 +00:00
Frank van Beek
24f546162e - we're using python22.lib instead of python20.lib nowadays 2003-01-04 16:29:09 +00:00
Maarten Gribnau
efb524d53f Rewired python for OSX. The Makefiles now use the Python that comes with OSX
in /usr/local.
mxTextTools is still disabled because of a link error.
Maarten
2002-12-21 22:26:46 +00:00
Kent Mein
0f95aa1622 This is sort of a two parter from the mailling list but really its the
same thing:

Added the xpcom include and added a flag to use mozilla vs netscape.
Which basically adds some ifdefs to
_Blender3DPlugin_implementation_.cpp

Basically I modified the nan_definitions.mk in the following way
(You'll need to update yours don't forget) ;)
Also updated the makefiles to use the new vars and flushed them out
so they first include whatever nspr is set to and then look in
NAN_MOZILLA_INC

I wasn't sure what the NAN_MOZILLA_INC and _LIB defaults should be
since were assuming they point to a netscape dir by default (or maybe
old mozilla???)
maybe they should be
   export NAN_MOZILLA_INC ?= $(LCGDIR)/netscape/include
   export NAN_MOZILLA_LIB ?= $(LCGDIR)/netscape/lib/

instead...

Anyone have any opinions on the defaults?

Kent
--
mein@cs.umn.edu

Index: nan_definitions.mk
===================================================================
RCS file: /cvs01/blender/source/nan_definitions.mk,v
retrieving revision 1.8
diff -u -r1.8 nan_definitions.mk
--- nan_definitions.mk  2002/12/19 21:12:58     1.8
+++ nan_definitions.mk  2002/12/20 19:28:51
@@ -75,7 +75,13 @@
     export NAN_TEST_VERBOSITY ?= 1
     export NAN_ZLIB ?= $(LCGDIR)/zlib
     export NAN_BMFONT ?= $(LCGDIR)/bmfont
-    export NAN_MOZILLA ?= $(LCGDIR)/mozilla
+    # Uncomment the following line to use Mozilla inplace of netscape
+    # CPPFLAGS +=-DMOZ_NOT_NET
+    # Location of MOZILLA/Netscape header files...
+    export NAN_MOZILLA_INC ?= $(LCGDIR)/mozilla/include
+    export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/
+    # Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB
+    # if this is not set.
     export NAN_NSPR ?= $(LCGDIR)/nspr
2002-12-20 19:37:38 +00:00
Maarten Gribnau
ac699ba672 Used NAN_ODE to point to the ode lib location.
Maarten
2002-12-19 21:14:18 +00:00
Maarten Gribnau
eb12ae40dc Removed Ode build from OSX target.
This is now replaced by the Ode lib in CVS.
Maarten
2002-12-16 22:31:50 +00:00
Kent Mein
d374995374 This might be a slight hack but Iksolver library was complaining about
some linking stuff that was in libmoto.a so I added a libmoto after it
in the link lines.

Hans got a better way to do this? :)

Kent

Here is the diff:
RCS file: /cvs01/blender/source/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    2002/11/13 16:09:38     1.12
+++ Makefile    2002/12/13 20:28:13
@@ -165,6 +165,7 @@
     COMLIB += $(NAN_PNG)/lib/libpng.a

     BCLIB = $(NAN_IKSOLVER)/lib/libiksolver.a
+    BCLIB += $(NAN_MOTO)/lib/libmoto.a
     BCLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
     BCLIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
     BCLIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a
@@ -174,6 +175,7 @@
     BCLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrccreator.a

     PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
+    PULIB += $(NAN_MOTO)/lib/libmoto.a
     PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
     PULIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
     PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
2002-12-13 20:30:07 +00:00
Kent Mein
05dd7ff3fb Committing LarstiQ's patch for NAN_PYTHON_BINARY and NAN_MXTEXTTOOLS
It worked on my system and no one else has said anything.

Kent
--
mein@cs.umn.edu
2002-11-13 16:09:38 +00:00
Kent Mein
fbdf58fe29 I needed to update the path to libfrozen on the linking also
missed it before.

Kent
--
mein@cs.umn.edu
2002-11-08 10:16:47 +00:00
Kent Mein
e46a6d2611 I autmated the rest of building libfrozen.a
I also moved it so that it gets put in:
 $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libfrozen.a

and removed the stuff from the readme on how to do it by hand.

(I made one other small change and that was to comment
out the ssr target on solaris and freebsd in source/Makefile
I forgot to commit it yesterday)

Kent
--
mein@cs.umn.edu
2002-11-07 17:47:15 +00:00
Maarten Gribnau
bd39a84c8b Added fmod sound for OSX and fixed some endian problems in
gameengine/SoundSystem to get it to work.
Maarten (mail@maartengribnau.com)
2002-11-04 21:50:33 +00:00
Maarten Gribnau
8ddd50ef5c added a line to add executable attributes to the binaries when copying into the
Mac bundles
Maarten (mail@maartengribnau.com)
2002-11-03 22:29:15 +00:00
Maarten Gribnau
c9f6b9c268 removed sumo from build directories
Maarten (mail@maartengribnau.com)
2002-11-03 21:30:02 +00:00
Norman Lin
1b15961786 First checkin of core ODE functionality. See OdePhysicsController.cpp for a todo list. 2002-10-18 14:36:34 +00:00
Norman Lin
40a078a36d Updated punctuation to be more dramatic. 2002-10-17 21:16:10 +00:00
Hans Lambermont
12315f4d0e Initial revision 2002-10-12 11:37:38 +00:00