comes with OSX in /usr/local.
Removed some frozen python files that were not generated by the freeze script.
mxTextTools is still disabled because of a link error.
Maarten
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:
+static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) {
maxSleep is checked against -1 so it needs to have a sign.
This could even fix some stability problems since -1 is passed in sometimes
in the code.
Kent
--
mein@cs.umn.edu
IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment(MT_Point3,
MT_Matrix3x3, double, MT_ExpMap)':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
IK_QSegment::m_length'
IK_QSegment.h:270: warning: and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:56: warning: will be re-ordered to match declaration order
IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment()':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
IK_QSegment::m_length'
IK_QSegment.h:270: warning: and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:73: warning: will be re-ordered to match declaration order
Kind of goofy its just the order of which 2 private vars are defined.
Kent
--
mein@cs.umn.edu
Had to add an argument to Create_window... (it was missing the sterio flag)
Also cleaned up some variable overloading warnings...
(i.e. window shadows previous def)
Kent
After building intern with the Makefile, this project builds all three targets.
blender and player targets are dependent on makes_dna so that dna.c is generated
automatically (at the moment it is created evry build).
The applications are complete with icons and file type registering.
The only catch is that it might be necessary to symlink the darwin-6.1-powerpc
directory if your kernel is no on 6.1.
Maarten
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
Maarten Gribnau
Simon Clitherow
Kent Mein
Stefan Gartner