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
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 */
}
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
comment inside of a comment
Also removed the config.h thing since this is a .h
Hopefully I'll get around to the other .h's soon.
Kent
--
mein@cs.umn.edu
Time to go watch er.
Note this was already done with face_old, img_old was probably just
overlooked.
(If you guys didn't notice I was sick for a couple of days but I'm back now
as you can tell)
Kent
--
mein@cs.umn.edu
Index: editface.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editface.c,v
retrieving revision 1.3
diff -u -r1.3 editface.c
--- editface.c 2002/11/25 12:02:05 1.3
+++ editface.c 2002/12/20 02:50:55
@@ -1202,7 +1202,7 @@
TFace *face, *face_old = 0;
short xy[2], xy_old[2];
//int a, index;
- Image *img, *img_old;
+ Image *img, *img_old = 0;
in readfile.c I renamed some localvars that were named main to mainl in
a couple of functions.
in action.c I initalized a var to 0. This is probably not needed but
its a little safer incase someone adds more modes...
I've included a diff of this last one below.
Kent
Index: action.c
===================================================================
RCS file: /cvs01/blender/source/blender/blenkernel/intern/action.c,v
retrieving revision 1.6
diff -u -r1.6 action.c
--- action.c 2002/11/25 12:01:52 1.6
+++ action.c 2002/12/20 02:06:27
@@ -153,7 +153,7 @@
){
bConstraint *dcon;
const bConstraint *scon;
- float dstweight;
+ float dstweight = 0;
switch (mode){
case POSE_BLEND:
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
source/blender/makesdna/intern/dna.c
This should fix the segfault at startup for non-x86 systems (tested on
linux/ppc and linux/x86). I would be glad if someone could check
if it works on other systems as well.
sgefant
(I noticed its not completely gone yet from the blender/source dir)
But its a big step in the right direction if it doesn't enable
all of the functionatlity already...
(Using cscope for LICENSE_KEY_VALID still turns up some stuff)
Kent
--
mein@cs.umn.edu
some people are getting sick of the email and the comments are small.
editmesh.c I added casts in a couple of places to remove a few warnings.
Then I cleaned up configure.ac a bit specifically the checks for
--with-ssl etc... so they work a little nicer.
I also modified source/Makefile.am to add targets for the player
Still needs some work I'm sure but its a start.
Kent
--
mein@cs.umn.edu
(also adding a couple of include pathes)
changes in Ode*.cpp to get it compile with gcc 2.95.4
to make it compile with ./configure --with-gameengine
--enable-gameplayer
Kent
--
mein@cs.umn.edu