Commit Graph

137921 Commits

Author SHA1 Message Date
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
Maarten Gribnau
e3376a4338 Added mouse down event when window was activated by
clicking on it. The mouse up was already generated. They
are now balanced by mouse downs. The behaviour of the
OSX target now matches that of the WIN32 target.
Maarten
2003-01-01 21:35:51 +00:00
Maarten Gribnau
581b3139b1 Fix for lots of window size events during window drag
Maarten
2003-01-01 21:31:36 +00:00
Maarten Gribnau
490b6469f2 Enabled event printer in debug target to trace event handling in ghost.
Maarten
2003-01-01 21:30:39 +00:00
Maarten Gribnau
6cafc69ef6 Removed injust assertion failure when clicking on the menu bar. Debug target would complain about an invalid window.
Maarten
2003-01-01 21:20:10 +00:00
Maarten Gribnau
729281a021 Added test for events pending for windows already disposed. These events are removed from the event stack now.
Maarten
2003-01-01 20:42:27 +00:00
Maarten Gribnau
c78a1749ed Removed unused vars.
Maarten
2003-01-01 20:31:12 +00:00
Maarten Gribnau
065f294aa1 Fixed ghost full-screen problem
After switching back from full-screen, the active window is returned to the one active before full-screen mode was entered.
Maarten
2003-01-01 20:23:42 +00:00
Maarten Gribnau
570b0462e2 Fixed some documentation errors
Maarten
2003-01-01 19:57:02 +00:00
Kent Mein
077fd2d1de Finished cleaning up the ik directory removing unused files.
Kent
--
mein@cs.umn.edu
2003-01-01 18:28:31 +00:00
Kent Mein
26aa841a1f I added the two patches Chris and I pointed too back in Nov.
(Adding Window Hints and giving the window input focus after it has
been raised.)

Kent
--
mein@cs.umn.edu
2003-01-01 18:11:26 +00:00
Kent Mein
6e8abc4a8e Rob's patches for the slow render problem.
Kent
--
mein@cs.umn.edu
2003-01-01 17:47:20 +00:00
Chris Want
4fa246c082 Initial commit of 'release'.
These 2 got files missed because the * wildcard didn't match the
'.' at the beginning of the names (%$&#*!)

Chris
2003-01-01 15:11:07 +00:00
Chris Want
96897d5674 Initial commit of the 'release' directory (splash screen/icon
junkies will be happy to find the datatoc.c program in the
datafiles directory).

Some quick notes:

* 'datafiles' has the version 2.21 splash.jpg and blenderbuttons (e.g., so
no NLA icon). Someone should at least get the 2.25 blenderbuttons from
somewhere and commit them.

* 'text' has obsolete content/license

* I did not include the python scripts as they have copyright
Jan Walter and no license specified.

* I changed to unix line terminators everywhere with the exeption of the
'windows' directory.

Chris
2003-01-01 15:06:10 +00:00
Chris Want
d52deb4397 A kludge to use the right compiler while freezing
using gcc under Irix -- without this it uses only
'cc -n32' (since this is what the sgi employee
who compiled the python stuff used).

Chris
2003-01-01 02:07:47 +00:00
Kent Mein
e67802264a changed back to char :)
Kent
--
mein@cs.umn.edu
2002-12-31 14:43:16 +00:00
Kent Mein
69c57046e7 Sorry about that this is part of the last update. I ment to cancel it
and include both files.

Anyway I was fixing the warning with ascii char...  Here is the diff for
editfont.c (the .h was just fixing the header to match it)

Kent

Index: editfont.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editfont.c,v
retrieving revision 1.3
diff -u -r1.3 editfont.c
--- editfont.c  25 Nov 2002 12:02:05 -0000      1.3
+++ editfont.c  31 Dec 2002 11:52:10 -0000
@@ -226,11 +226,12 @@
        }
 }

-void do_textedit(unsigned short event, short val, char ascii)
+void do_textedit(unsigned short event, short val, unsigned char _ascii)
 {
        Curve *cu;
        static int accentcode= 0;
        int x, doit=0, cursmove=0;
+        int ascii = _ascii;
2002-12-31 11:54:33 +00:00
Kent Mein
b36298c60e :q! 2002-12-31 11:53:03 +00:00
Kent Mein
85ddbc4514 Updated the spacebar toolbox so the fonts are moved up 2 pixels.
It was causing funky artifacts on some letters that dropped down into the
background.

Here is the diff

Kent


Index: toolbox.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/toolbox.c,v
retrieving revision 1.5
diff -u -r1.5 toolbox.c
--- toolbox.c   22 Dec 2002 13:43:21 -0000      1.5
+++ toolbox.c   30 Dec 2002 20:13:51 -0000
@@ -506,7 +506,7 @@
        oldcursor= get_cursor();
        set_cursor(CURSOR_STD);

-       tbfontyofs= (TBOXH-11)/2;       /* toolbox, hier stond ooit getheigh */
+       tbfontyofs= (TBOXH-11)/2 +2;    /* toolbox, hier stond ooit getheigh */
 }
2002-12-30 20:15:07 +00:00
Maarten Gribnau
82a1469e4b removed second CVS id tags, cleaned up new lines
Maarten
2002-12-30 12:11:03 +00:00