kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
29,040 Commits 2 Branches 0 Tags 753 MiB
a147a91899
Commit Graph

29040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wouter van Heyst
4b3ce0b7a5 Finally a toplevel Makefile, all it does is prepare the environment and call 
make in extern/, intern/ and source/
 2003-01-18 21:12:55 +00:00
Maarten Gribnau
192a136c0f fixed missing frozen files 
Maarten
 2003-01-15 14:51:47 +00:00
Maarten Gribnau
3ef0209f80 fixed the missing copy of the header file 
Maarten
 2003-01-15 14:51:23 +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
Francis Laurence
f6ce35861a Made debug build of blender creator use the debug libraries from intern. 
(visual C++)
 2003-01-13 19:25:57 +00:00
Francis Laurence
586b210573 Remove isect.c 
from the BL_src.dsp (visual c++ project file)
Goodbye isect
 2003-01-13 19:23:58 +00:00
Francis Laurence
22b42656aa Remove BDR_isect.h 
The purpose of this and the previous commit is to remove the old mesh
intersection function (activated by the "Intersect" button in the mesh buts)
 2003-01-13 19:20:34 +00:00
Francis Laurence
fd2a468d5d Get rid of call to isect - the old (but loved)interection function. 2003-01-13 19:07:01 +00:00
Francis Laurence
c6a905f7e9 Hello, 
*Fixed boolean buglet in the bsp lib. I have not committed any libraries so you'll
have to do this to see the changes in blender.
*Got the bsp test program working again with the new GHOST createWindow
interface.
*(Visual C++) Modfied some of the dsp in the intern library to NOT prompt when
overwirting old libs and header files. This is the /Y option after XCOPY
Cheers
Laurence.
 2003-01-12 19:48:53 +00:00
Frank van Beek
040797ba3d - ode now compiles and installs under MSVC / cygwin 2003-01-12 10:52:45 +00:00
Hans Lambermont
bb4ea174f1 kill unneccesary python ramblings on Solaris 2003-01-12 06:12:25 +00:00
Hans Lambermont
80acb04124 Enable automated build and install runs on FreeBSD for ODE. 
ODE does not build on FreeBSD out of the box, so an automated patchfile
is included as well.
The 'clean' target reverses the patches that were done by 'all'.
 2003-01-11 23:20:10 +00:00
Hans Lambermont
a1a8edffeb don't try to link against ODE on Irix 2003-01-11 22:47:48 +00:00
Hans Lambermont
1a32da86f1 skip BlOde for irix 2003-01-11 22:10:00 +00:00
Hans Lambermont
97fece8cde Build and install ode in lib/<platform> 
Only enabled for Linux now, and not even tested yet :-P (what do you
mean 'in a hurry' ;-)
 2003-01-11 19:14:34 +00:00
Wouter van Heyst
5e6c729aa7 Revert NAN_OPENSSL to it's previous value of '/usr' on FreeBSD 2003-01-11 02:37:11 +00:00
Kent Mein
fc0e924e0f I went whole hog on the definitions each platform has its own block 
and there is a block at the very end for platforms not specified above.

(not all of the defintions are in the platform's for example there
is no need for  export NAN_IKSOLVER ?= $(LCGDIR)/iksolver
to be repeated all over the place, all of the ones you'll probably
want to change are in the platform specific blocks though)

This allows all platforms to be overridden by env vars...

Kent
 2003-01-10 22:45:25 +00:00
Kent Mein
3dbf2235e4 modified the default path to python for macosX to /sw 
which is where fink puts it.

Kent
 2003-01-10 16:15:49 +00:00
Kent Mein
b6d3351af4 Added another fink bit under the macosX instructions. 
6. python22 ((addes the static lib for python) fink install python22)
        You will probably want to select python22-nox-shlibs when
        it asks you.

        After you have done this you should install the mx lib from:
        http://www.egenix.com/files/python/mxTextTools.html

Kent
 2003-01-07 18:16:58 +00:00
Wouter van Heyst
ade767d2af Linux now also uses ode from lib/ 2003-01-07 05:08:10 +00:00
Stefan Gartner
3531f874e0 added a buch of 
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
(also for <GL/glu.h>)

so that people don't have to create symlinks in
/System/Library/Frameworks/OpenGL.framework on Mac OS X
(Charles Wardlaw)
 2003-01-07 00:18:59 +00:00
Hans Lambermont
3a0c7e4a8a John Walton's changes for Irix mips3 (NaN makefiles build) 2003-01-06 23:01:28 +00:00
Kent Mein
13c8ae5708 Ok took out the ln -s for the GL headers. 
A little looking shows that MacOSX uses OpenGL/blah.h
instead of GL/blah.h

Looks like time for more ifdef's

I also added a note to fink install cvs
(fixes a bug in the cvs you get by default with empty dirs)

Kent
 2003-01-06 21:45:02 +00:00
Maarten Gribnau
0adee8a828 updates because of python changes 
Maarten
 2003-01-06 21:38:26 +00:00
Kent Mein
08c8cac6c7 Ok hopefully this is the last one for macosX ;) 
Added this:
Step 4:
cd /System/Library/Frameworks/OpenGL.framework/
ln -s Headers GL


Kent
 2003-01-06 21:30:28 +00:00
Kent Mein
faa1d14834 added for MacOSX instructions: (This has the static lib for libcrypto) 
2. openssl-dev (fink install openssl-dev)

Kent
 2003-01-06 21:09:09 +00:00
Kent Mein
dfd2b15afb Updated the fink calls to libjpeg and libpng instead of just jpeg and png. 
Kent
 2003-01-06 20:23:45 +00:00
Michel Selten
c95d631b83 Removed references to modules that do not exist. The python interface is 
broken, but it should give 0 errors when building.

Michel
 2003-01-06 17:27:43 +00:00
Stefan Gartner
fa45a02295 on Mac OS X run ranlib on libfrozen.a after creating it 2003-01-06 17:22:57 +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
42dcaf9add cleanup. 2003-01-05 14:28:33 +00:00
Hans Lambermont
95c780f203 remove ssr leftovers 2003-01-05 14:27:57 +00:00
Stefan Gartner
3290b8c1c0 cpifdiff.sh died with an error when $(LCGDIR)/$(LIBNAME)/include/blenkey.h 
didn't exist instead of installing it as it should.

-       @../tools/cpifdiff.sh blenkey.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h
+       @../tools/cpifdiff.sh blenkey.h $(LCGDIR)/$(LIBNAME)/include/

sgefant
 2003-01-04 21:58:04 +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
8dcdf3bf0b - replaced #elif with more correct version: 
< #elif _WIN32
---
> #elif defined(_WIN32)
 2003-01-04 18:17:50 +00:00
Michel Selten
f92d4b8650 libfrozen will be built only once until one of the python files is changed. 
Michel
 2003-01-04 17:31:11 +00:00
Frank van Beek
3aa1f9ed3e - replaced files with the original versions that also contain 32x32 and 
8 bit icons.
 2003-01-04 17:18:50 +00:00
Frank van Beek
38e5b5899c - on windows alcGetError() has no arguments. On other platforms it does. 2003-01-04 16:46:49 +00:00
Frank van Beek
24f546162e - we're using python22.lib instead of python20.lib nowadays 2003-01-04 16:29:09 +00:00
Frank van Beek
76f4ae72f3 - when compiling on windows, override CC=gcc with CC=..../cl_wrapper.pl 
and use the Python.h in the lib/windows/python/include directory.
  MSVC++ doesn't like linking with a gcc compiled frozen library.
 2003-01-04 16:27:26 +00:00
Hans Lambermont
45b243ac47 Workaround for the header file copying dependency hell 2003-01-04 15:07:25 +00:00
Hans Lambermont
302399b9d0 and the other FreeBSD python locations. 2003-01-04 01:41:19 +00:00
Hans Lambermont
4a42823155 another FreeBSD python location change 2003-01-04 00:40:47 +00:00
Hans Lambermont
7ff3f0553f start using platform default locations for FreeBSD. 
try not to break anything for other platforms.
 2003-01-04 00:35:01 +00:00
Hans Lambermont
b506bdb2b7 Use FreeBSD's default python location when on FreeBSD 2003-01-04 00:19:53 +00:00
Hans Lambermont
5fda04dfdc Start using platform default locations of libraries that used to be in 
lib/ and came from extern/ (which isn't in the new repository at all)

So use stuff like:

   ifeq ($(OS),freebsd)
     export NAN_OPENSSL ?= /usr
   else
     export NAN_OPENSSL ?= $(LCGDIR)/openssl
   endif

Hans
 2003-01-03 22:51:49 +00:00
Michel Selten
0a51feab36 These updates enable the build of the gameengine 
(configure --enable-gameengine). However, you still need to manually configure,
compile and install ode.

* Following the original NaN makefile, I removed the TerraplayNetwork files
  from the build. (Moved the two files to EXTRA_DIST).

* Pass a const char * to Py_BuildValue instead of a STR_String in
  BL_ActionActuator.cpp

* Added some include directories in Makefile.am's

Michel
 2003-01-03 21:36:16 +00:00
Kent Mein
1af0e07f74 Added the following prototype to get rid of another warning: 
void pub_priv_test(char *HexPriv, char *HexPub);

Kent
 2003-01-03 16:01:12 +00:00
Kent Mein
f2aaeb8f5b Two small updates to fix warnings. 
The first is renaming fv_data to fv_data2 to get rid of a shadow warning
second is an unused var that was an extra uneeded call to fabs.

Diff included:

Kent
--
mein@cs.umn.edu

Index: BSP_CSGMeshBuilder.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_CSGMeshBuilder.cpp,v
retrieving revision 1.3
diff -u -r1.3 BSP_CSGMeshBuilder.cpp
--- BSP_CSGMeshBuilder.cpp      25 Nov 2002 09:52:48 -0000      1.3
+++ BSP_CSGMeshBuilder.cpp      3 Jan 2003 15:47:15 -0000
@@ -89,13 +89,13 @@
        }

        if (props.user_face_vertex_data_size) {
-               char * fv_data = NULL;
-               fv_data = new char[4 * props.user_face_vertex_data_size];
+               char * fv_data2 = NULL;
+               fv_data2 = new char[4 * props.user_face_vertex_data_size];

-               face.user_face_vertex_data[0] = fv_data;
-               face.user_face_vertex_data[1] = fv_data + props.user_face_vertex
_data_size;
-               face.user_face_vertex_data[2] = fv_data + 2*props.user_face_vert
ex_data_size;
-               face.user_face_vertex_data[3] = fv_data + 3*props.user_face_vert
ex_data_size;
+               face.user_face_vertex_data[0] = fv_data2;
+               face.user_face_vertex_data[1] = fv_data2 + props.user_face_verte
x_data_size;
+               face.user_face_vertex_data[2] = fv_data2 + 2*props.user_face_ver
tex_data_size;
+               face.user_face_vertex_data[3] = fv_data2 + 3*props.user_face_ver
tex_data_size;
        } else {
                face.user_face_vertex_data[0] = NULL;
                face.user_face_vertex_data[1] = NULL;
[9:47] ~/blender/intern/bsp/intern(mein@captcrab) % cvs diff BSP_MeshFragment.cp
p
Index: BSP_MeshFragment.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_MeshFragment.cpp,v
retrieving revision 1.3
diff -u -r1.3 BSP_MeshFragment.cpp
--- BSP_MeshFragment.cpp        25 Nov 2002 09:52:48 -0000      1.3
+++ BSP_MeshFragment.cpp        3 Jan 2003 15:47:21 -0000
@@ -106,8 +106,6 @@
                if (BSP_Classification(vert.OpenTag()) == e_unclassified)
                {
                        MT_Scalar sdistance = plane.signedDistance(vert.m_pos);
-                       MT_Scalar fsdistance = fabs(sdistance);
-
                        if (fabs(sdistance) <= BSP_SPLIT_EPSILON) {
                                // this vertex is on
                                vert.SetOpenTag(e_classified_on);
 2003-01-03 15:53:46 +00:00
Maarten Gribnau
fac23acffe Added fix for invisible size widget on OSX. 
It's still behind a define because it does not work with
blender (player and gears work fine).
Maarten
 2003-01-01 22:32:35 +00:00