Commit Graph

128893 Commits

Author SHA1 Message Date
Kent Mein 56743efbcd Fixed some stuipid bugs in the Makefile.am's and
added --with-ode=prefix to configure.ac

Getting closer to building...

Kent
--
mein@cs.umn.edu
2002-11-27 16:25:54 +00:00
Kent Mein 209a2ede2c Last of the config.h mods...
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

added to these files.

Kent
--
mein@cs.umn.edu
2002-11-25 15:29:57 +00:00
Kent Mein d0e346d544 updated .c files to include:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

Just need to finish cpp files now :)

Kent
--
mein@cs.umn.edu
2002-11-25 12:02:15 +00:00
Kent Mein b9a19f1ea7 Did all of the .h's in source
(adding)
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

also the Makefile.in's were from previous patch adding
the system depend stuff to configure.ac

Kent
--
mein@cs.umn.edu
2002-11-25 11:16:17 +00:00
Kent Mein 3f2f1571e5 added the following to configure.ac
+case "$target" in
+  *sparc* )
+        AC_DEFINE(SUN_OGL_NO_VERTEX_MACROS,1,[Fix for Sun's GL])
+  ;;
+esac
+

Also added the include to the above .c files.
I'm going to add it to everything in source just haven't gotten that far yet.

Kent
2002-11-25 10:13:52 +00:00
Kent Mein 0fbadc8eb7 Yes I did it again ;)
added the following 3 lines to everything in the intern dir:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

Kent
--
mein@cs.umn.edu
2002-11-25 09:53:07 +00:00
Kent Mein d44f2c6dcc Robert Wenzlaff's fix for AVI_JPEGS.
Kent
--
mein@cs.umn.edu
2002-11-22 15:59:38 +00:00
Kent Mein 1f0fff0dc5 Moved the stuff on autoconfig to doc/autoconfig.txt and added quite a bit
more on the basics of it.  (as well as put a link to it in the README)

Kent
--
mein@cs.umn.edu
2002-11-21 14:20:42 +00:00
Kent Mein 8328f6d5a7 removed our licensing info as requested :)
Kent
--
mein@cs.umn.edu
2002-11-20 14:43:09 +00:00
Kent Mein a8334b353a Ok I added the following options to configure.ac
--with-ssl=PFX        Path to ssl files
  --with-libjpeg=PFX    Path to libjpeg files
  --with-libpng=PFX     Path to libpng files
  --with-libz=PFX       Path to libz files
  --with-mozilla=PFX    Path to mozilla files
(The mozilla one still needs some work but its a start)

I also cleaned up the blender/intern automake files a little as far as
the python stuff goes, it still isn't doing the correct thing in
intern/python/freeze but its a little closer I think.

Anyone that has ideas on this I'm all ears :)

Kent
--
mein@cs.umn.edu
2002-11-19 18:51:52 +00:00
Kent Mein 8efde305eb --- IK_JacobianSolver.cpp 2002/10/13 16:07:40 1.2
+++ IK_JacobianSolver.cpp       2002/11/19 18:47:33
@@ -134,7 +134,7 @@
        m_svd_w = 0;
        m_svd_v = 0;

-       TNT::SVD(m_svd_u,m_svd_w,m_svd_v);
+       TNT::SVD_a(m_svd_u,m_svd_w,m_svd_v);

        // invert the SVD and compute inverse


Fix for why it wasn't building with configure

Kent
--
mein@cs.umn.edu
2002-11-19 18:48:07 +00:00
Kent Mein 98e307346c Fixed a typo. Had a [ added.
Kent
--
mein@cs.umn.edu
2002-11-19 00:09:54 +00:00
Kent Mein 33d21df15d removed the comments about libtool not working :)
Kent
--
mein@cs.umn.edu
2002-11-15 18:41:50 +00:00
Kent Mein db37b9810d Ok were getting somewhere here ;)
I'm not an expert at this but I think I'm getting the hang of it quite nicely.
I added autoconf stuff for most of the intern dir.  I move readme.txt to
README and added the following section to it:

*********************************************************************
*********************************************************************
We are in the process of moving things over to automake/autoconf
The old makefiles are still in place and will work.  If you want to
get a working blender skip down to the next section and use this readme as
a guide.

If you want to play with the new autoconf environment you need to do the
following, inside this dir:
./bootstrap
mkdir ../newdir
cd ../newdir
../blender/configure

Take a look at INSTALL for options you can give to configure.
About half of the intern directory is done so you won't get very far.
If you want to work on fixing it you need to edit Makefile.am's and
configure.ac
after editing those files you need to run bootstrap again.

TODO to finish up the intern dir
Square away how ghost works.
(i.e. would be nice if under windows you could choose X11 or normal windows
libs, same with macos.. right now its a cludge and it doesn't do one explicitly
probably involves changing the way configure.ac picks stuff)

Get intern/python figured out.

Add the following to configure.ac
        --with-openssl=dir
        --with-mozilla=dir      (get it so nspr is autodetected here)
        --with-nspr=dir         (incase in different dir)
        --with-jpeg=dir
        --with-png=dir
        --with-zlib=dir

figure out why the heck the libtool that gets created is wrong on my
system (mein@cs.umn.edu) :)


Kent
--
mein@cs.umn.edu
2002-11-15 06:57:59 +00:00
Maarten Gribnau fdb2036beb Some more clean up in the intern MSVC project files.
Renamed the bmfont project files and updated them.
Maarten
2002-11-14 22:43:55 +00:00
Maarten Gribnau 61d996b801 Added more frozen files to the MSVC project.
Maarten
2002-11-14 16:51:01 +00:00
Maarten Gribnau c57ca3c86a Changed module name utils to util so that freeze will find the quaternions
etc. there.
Maarten
2002-11-14 16:50:24 +00:00
Maarten Gribnau a46e70f0e6 Fixed problem with the main intern MSVC project.
Maarten
2002-11-14 08:23:57 +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
Maarten Gribnau b4c622d4ba bug fix in vrml (inventor) import.
Maarten
2002-11-12 20:12:40 +00:00
Kent Mein b60b8009e7 Added a link for mozilla downloads.
Kent
--
mein@cs.umn.edu
2002-11-12 15:56:33 +00:00
Kent Mein 716caf4d37 - ALenum alc_error = alcGetError(); // openal_2.14+
+               ALenum alc_error = alcGetError(NULL);   // openal_2.14+


Fix to get it to work with latest version of openal.

Kent
--
mein@cs.umn.edu
2002-11-12 15:26:05 +00:00
Maarten Gribnau 278922d090 Modified the MSVC project files to use the static jpeg library as it used to be.
Maarten
2002-11-11 23:58:52 +00:00
Maarten Gribnau e0d9272376 Made a dependency so that the MSVC intern project file will actually call the
batch file that freezes the Blender Python code.
I had to add a dummy.cpp file to the freeze directory to make MSVC
understand it should call the batch file in a post build step. If someone else
has a better idea, feel free to change it!
Maarten
2002-11-11 22:48:06 +00:00
Maarten Gribnau 0efbb6c87b Fixed the MSVC project files. They now build both the release and debug
targets of creator publisher and player.
Assuming you have the libraries installed in lib/windows of course...
Maarten
2002-11-11 21:59:46 +00:00
Kent Mein d4e488abed Changed -O3 to -O2 under linux 2002-11-11 21:33:11 +00:00
Kent Mein f8843ee7e9 - python $(PYFLAGS) freeze.py -d -x os -x pprint -x Blender -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py
+       python $(PYFLAGS) freeze.py -d -x os -x pprint -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py


Freeze the Blender module
(I got this from some other people on #blendersauce and truthfully I have
no idea if this is correct or not so if someone else could look at it
that would be great)

Kent
--
mein@cs.umn.edu
2002-11-11 21:26:19 +00:00
Maarten Gribnau 9715aa0436 Converted icon files to binary files (cvs admin -kb) and restored them.
Maarten
2002-11-11 20:57:09 +00:00
Kent Mein a65506a3b5 Fixed action.c (brought it back to 1.2)
Kent
--
mein@cs.umn.edu
2002-11-11 14:46:27 +00:00
Maarten Gribnau 6db6011d89 First round of updates to project files. There is a working game player (debug
target) as long as you have installed the right libraries.
Added project file for Blender Ode.
Maarten
2002-11-11 00:02:52 +00:00
Maarten Gribnau 57ef60d081 Added another project to freeze Blender Python code from the main intern
MSVC workspace. It is not finished completely but it works (through a
batchfile).
Maarten
2002-11-10 23:54:39 +00:00
Maarten Gribnau f21dd64460 Added almost all projects in intern to the main MSVC project for intern (in
intern/make/msvc_6_0. Changed paths in all these files to build to
lib/windows and use obj/window/intern for object files and other temporary
stuff.
Added project files for guardedalloc and blenkey (in keymaker directory).
blenkey still assumes openssl being installed in lib/windows.
The only thing not automated is is the frozen Python stuff.

Maarten
2002-11-08 23:34:53 +00:00
Maarten Gribnau 54c3daf2e3 Updated MSVC GHOST project like the string project and added it to the
intern MSVC workspace
Maarten
2002-11-08 16:18:56 +00:00
Maarten Gribnau c7be06468e New MSVC workspace were I will add all the intern MSVC projects so that
they can all be build and installed in one go.
Maarten
2002-11-08 16:07:13 +00:00
Maarten Gribnau 2c35a94396 Fixed the MSVC project file so that it creates the lib/windows directories to
install the libraries into. Also, the objects are now build in the right directories.
Maarten
2002-11-08 16:00:26 +00:00
Kent Mein 50aabf8599 switched the order of build (frozen and intern are now intern and frozen)
that way the lib gets installed before the dir didn't exist so it
died.

Kent
--
mein@cs.umn.edu
2002-11-08 11:36:37 +00:00
Kent Mein bd89c211a2 I added the following comments to the readme:
--Notes on compiling mxTextTools
To get the latest version to compile on my machine I had to
edit mxSetup.py and remove /usr/include from INCLPATH for it to build
properly.
(after doing this you need to edit blender/source/Makefile and
fix the pointer to it I'm still working on automating this)

Kent
--
mein@cs.umn.edu
2002-11-08 10:28:47 +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
Maarten Gribnau 7325eff128 Added extra ranlib on libary files after being copied to the lib tree for OSX only.
This saves other OSX developers the trouble of manually running ranlib.
This is not a good solution (because I don't know the correct one) but it works.
Maarten
2002-11-07 22:41:42 +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
Kent Mein 2c183d2da7 Updated it so intern/python/freeze is combined into intern's Makefile
also updated the readme so its not an extra step anymore.

Kent
--
mein@cs.umn.edu
2002-11-06 21:19:23 +00:00
Kent Mein 0252df880c added the following link:
mxtexttools:http://www.egenix.com/files/python/mxTextTools.html (python lib)

Kent
--
mein@cs.umn.edu
2002-11-06 16:52:20 +00:00
Kent Mein 7f4f5488f3 That was me Kent
I noticed it sounded kind of stupid so quit half way through the commit :)

Anyway it now reads:
If you tried to just have a go at making stuff you might wind up with
an empty file /tmp/.nanguess
You need to remove the empty file and it will get created automatically
by $NANBLENDERHOME/source/tools/guess/guessconfig after you have
setup the NANBLENDERHOME variable.

Kent
--
mein@cs.umn.edu
2002-11-06 15:49:26 +00:00
Kent Mein a4767dc245 Changed more wording again and added some extra software links.
Also added the following since it burned me and a couple people have asked:

If you tried to just have a go at making stuff you might wind up with
an empty file /tmp/.nanguess
You need to remove the empty file and re run it after you have
setup the NANBLENDERHOME variable.
2002-11-06 15:47:23 +00:00
Kent Mein 97827c21d0 I Just modified the Makefile to use the definitions instead of hard paths.
-CPPFLAGS += -I../../../../sumo/Fuzzics/include
-CPPFLAGS += -I../../../../sumo/include
+CPPFLAGS += -I$(NAN_FUZZICS)/include
+CPPFLAGS += -I$(NAN_SUMO)/include

Kent
--
mein@cs.umn.edu
2002-11-06 02:09:02 +00:00
Kent Mein 0a21a70463 Commented out the include since it was causing problems on some systems
and its not needed here.
(intern/Makefile)

Kent
--
mein@cs.umn.edu
2002-11-06 00:53:45 +00:00
Maarten Gribnau 2d5514be28 Brought back the sumo physics controllers and undid game engine make file
changes.
Instead modified the top level nan_definitions.mk to point the NAN_SUMO and
NAN_FUZZICS to the right locations.
Maarten
2002-11-05 20:20:50 +00:00
Kent Mein 7c59c12dc0 Sorry people reporting syntax problems :)
I should maybe hold off and post a couple at a time, but I figured
since others are working on stuff now it would be nice to keep it upto
date.  (let me know if I'm committing to often...)

(removed set from the bash instructions)

Kent
2002-11-05 20:05:19 +00:00
Kent Mein 9bddc20bd3 changed:
friend SG_Controller;
to:
 friend class SG_Controller;

gcc-3.2 was complaining that it wasn't defined.

Kent
--
mein@cs.umn.edu
2002-11-05 19:54:23 +00:00
Kent Mein f3ba5d80f9 Cleaned up the wording a little more and moved Martins info about
the intern/python stuff up a little to the more generic case.
(well the unix bit but hopefully we can rename the unix bit
generic make instructions or something.)

Kent
--
mein@cs.umn.edu
2002-11-05 19:53:11 +00:00