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
(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
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
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
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;
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 */
}
---------------------------->8----------------------------------------------
g++ -DHAVE_CONFIG_H -I. -I../../../blender/intern/bsp -I../.. -I../../../blender/intern/container -I../../../blender/intern/moto/include -I../../../blender/intern/memutil -I/usr/freeware/include -g -funsigned-char -c ../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp -MT BSP_CSGMesh.lo -MD -MP -MF .deps/BSP_CSGMesh.TPlo -DPIC -o .libs/BSP_CSGMesh.lo
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h: In
constructor `std::__normal_iterator<_Iterator,
_Container>::__normal_iterator(const std::__normal_iterator<_Iter,
_Container>&) [with _Iter = const BSP_MFace*, _Iterator = BSP_MFace*,
_Container = std::vector<BSP_MFace, std::allocator<BSP_MFace> >]':
../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp:270: instantiated from here
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h:474: cannot
convert `const BSP_MFace* const' to `BSP_MFace*' in initialization
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
---------------------------->8----------------------------------------------
The line in question that causes the error is the middle one in this group:
vector<BSP_MFace>::const_iterator f_it_end = FaceSet().end();
vector<BSP_MFace>::const_iterator f_it_begin = FaceSet().begin();
vector<BSP_MFace>::iterator f_it = FaceSet().begin();
Dropping the 'const_' from that middle line enables gcc to compile the
file correctly (this is also consistent with what is going on with other
parts of the file, i.e., stuff that is returned from a begin() method is
declared as vector<BSP_MFace>::iterator instead of
vector<BSP_MFace>::const_iterator.
But I'll be honest: I have no idea what this code does, so if somebody with
better C++ skills wants to check it, then please do.
This change was also tested to compile and run on debian linux/x86
(well, booleans are broken right now, so I wasn't able to do too much
testing).
Chris
I took out the following from the includes in the intern dir that still had
it:
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
Kent
--
mein@cs.umn.edu
too -- a user reported crashing while using decimation and rolling back
the modifications between rev 1.2 and rev 1.3 for this file fixed it.
Regards,
Chris
(to stop gcc compiler warnings) caused segfaults when
performing intersections (and possibly while doing other
boolean operations). I felt it was best to revert these
changes (I also got rid of the DOS line terminators in
the files). Some more info about the matter can be found
in the first 10 or so posts for Novembor on the old
mailing list:
http://www.soze.com/mailman/private/bf-committers/2002-November/date.html
Chris (Merry Christmas!)
