diff -urN blender-2.43.orig/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h blender-2.43/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h
--- blender-2.43.orig/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h 2007-05-13 17:13:48.575891020 +0000
+++ blender-2.43/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h 2007-05-13 17:14:10.169121548 +0000
@@ -49,8 +49,8 @@
#include <X11/Intrinsic.h>
#endif
-#include "npapi.h" /* NS related types*/
-#include "prlock.h" /* NSPR locking */
+#include <mozilla/npapi.h> /* NS related types*/
+#include <mozilla/nspr/prlock.h> /* NSPR locking */
#include "PLG_plugin_handles.h" /* Handles */
#ifdef __cplusplus
diff -urN blender-2.43.orig/source/gameengine/GamePlayer/netscape/src/PLG_X11_windowing.c blender-2.43/source/gameengine/GamePlayer/netscape/src/PLG_X11_windowing.c
--- blender-2.43.orig/source/gameengine/GamePlayer/netscape/src/PLG_X11_windowing.c 2007-05-13 17:13:48.547889423 +0000
+++ blender-2.43/source/gameengine/GamePlayer/netscape/src/PLG_X11_windowing.c 2007-05-13 17:14:10.285128158 +0000
@@ -225,13 +225,14 @@
inst->window_invalidated = 1;
}
+/*
if (((NPSetWindowCallbackStruct *) window->ws_info)->display != inst->display_ref) {
inst->display_ref = ((NPSetWindowCallbackStruct *) window->ws_info)->display;
inst->width = window->width;
inst->height = window->height;
inst->display_invalidated = 1;
}
-
+*/
if ( (!inst->initialized)
|| inst->window_invalidated
|| inst->display_invalidated) {
diff -urN blender-2.43.orig/source/gameengine/Physics/BlOde/OdePhysicsController.cpp blender-2.43/source/gameengine/Physics/BlOde/OdePhysicsController.cpp
--- blender-2.43.orig/source/gameengine/Physics/BlOde/OdePhysicsController.cpp 2007-05-13 17:13:49.811961460 +0000
+++ blender-2.43/source/gameengine/Physics/BlOde/OdePhysicsController.cpp 2007-05-13 17:14:10.301129069 +0000
@@ -266,8 +266,8 @@
float worldpos[3];
#ifdef dDOUBLE
- m_MotionState->getWorldOrientation((float)worldquat[1],
- (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);
+ m_MotionState->getWorldOrientation((float&)worldquat[1],
+ (float&)worldquat[2],(float&)worldquat[3],(float&)worldquat[0]);
#else
m_MotionState->getWorldOrientation(worldquat[1],
worldquat[2],worldquat[3],worldquat[0]);
@@ -356,8 +356,8 @@
float worldpos[3];
#ifdef dDOUBLE
- m_MotionState->getWorldOrientation((float)worldquat[1],
- (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);
+ m_MotionState->getWorldOrientation((float&)worldquat[1],
+ (float&)worldquat[2],(float&)worldquat[3],(float&)worldquat[0]);
#else
m_MotionState->getWorldOrientation(worldquat[1],
worldquat[2],worldquat[3],worldquat[0]);
@@ -491,8 +491,8 @@
dQuaternion worldquat;
#ifdef dDOUBLE
- m_MotionState->getWorldOrientation((float)worldquat[1],
- (float)worldquat[2], (float)worldquat[3],(float)worldquat[0]);
+ m_MotionState->getWorldOrientation((float&)worldquat[1],
+ (float&)worldquat[2], (float&)worldquat[3],(float&)worldquat[0]);
#else
m_MotionState->getWorldOrientation(worldquat[1],worldquat[2],
worldquat[3],worldquat[0]);
diff -urN blender-2.43.orig/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp blender-2.43/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
--- blender-2.43.orig/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp 2007-05-13 17:13:49.811961460 +0000
+++ blender-2.43/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp 2007-05-13 17:14:10.309129525 +0000
@@ -24,7 +24,7 @@
#include "OdePhysicsController.h"
#include <ode/ode.h>
-#include <../ode/src/joint.h>
+#include "../../../../extern/ode/dist/ode/src/joint.h"
#include <ode/odemath.h>
ODEPhysicsEnvironment::ODEPhysicsEnvironment()
diff -urN blender-2.43.orig/source/Makefile blender-2.43/source/Makefile
--- blender-2.43.orig/source/Makefile 2007-05-13 17:13:46.043746720 +0000
+++ blender-2.43/source/Makefile 2007-05-13 17:14:10.413135453 +0000
@@ -101,7 +101,7 @@
COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a
COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a
- COMLIB += $(NAN_JPEG)/lib/libjpeg.a
+ COMLIB += $(NAN_JPEG)/lib/libjpeg.so
ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
@@ -150,7 +150,7 @@
COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a
COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a
- COMLIB += $(NAN_PNG)/lib/libpng.a
+ COMLIB += $(NAN_PNG)/lib/libpng.so
COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a
COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
ifeq ($(WITH_QUICKTIME), true)
@@ -171,7 +171,7 @@
ifeq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
else
- COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+ COMLIB += $(NAN_FREETYPE)/lib/libfreetype.so
endif
endif
endif
@@ -194,7 +194,7 @@
COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
COMLIB += $(NAN_FREETYPE)/lib32/libintl.a
else
- COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+ COMLIB += $(NAN_FREETYPE)/lib/libfreetype.so
endif
endif
ifeq ($(OS), darwin)
@@ -408,8 +408,8 @@
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND)
- NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
- ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a)
+ NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.so
+ ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.so)
NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
diff -urN blender-2.43.orig/source/nan_definitions.mk blender-2.43/source/nan_definitions.mk
--- blender-2.43.orig/source/nan_definitions.mk 2007-05-13 17:13:46.043746720 +0000
+++ blender-2.43/source/nan_definitions.mk 2007-05-13 19:41:13.435930869 +0000
@@ -129,7 +129,7 @@
else
ifeq ($(OS),linux)
export NAN_OPENEXR ?= /usr
- export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
+ export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.so $(NAN_OPENEXR)/lib/libHalf.so $(NAN_OPENEXR)/lib/libIex.so
else
export NAN_OPENEXR ?= /usr/local
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
@@ -375,8 +375,8 @@
# Uncomment the following line to use Mozilla inplace of netscape
export CPPFLAGS += -DMOZ_NOT_NET
# Location of MOZILLA/Netscape header files...
- export NAN_MOZILLA_INC ?= /usr/include/mozilla
- export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/
+ export NAN_MOZILLA_INC ?= /usr/include/firefox
+ export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla-firefox/lib/
# Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB
# if this is not set.
diff -urN blender-2.43.orig/source/nan_link.mk blender-2.43/source/nan_link.mk
--- blender-2.43.orig/source/nan_link.mk 2007-05-13 17:13:46.043746720 +0000
+++ blender-2.43/source/nan_link.mk 2007-05-13 17:14:10.417135680 +0000
@@ -93,12 +93,12 @@
endif
ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64"))
COMMENT = "MESA 3.1"
- LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
- LLIBS += -lutil -lc -lm -ldl -lpthread
+ LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi -lXxf86vm
+ LLIBS += -lutil -lc -lm -ldl -lpthread -lesd
# LLIBS += -L$(NAN_ODE)/lib -lode
LOPTS = -export-dynamic
DADD = -lGL -lGLU
- SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
+ SADD = $(NAN_MESA)/lib/libGL.so $(NAN_MESA)/lib/libGLU.so
DYNLDFLAGS = -shared $(LDFLAGS)
endif
ifeq ($(CPU),$(findstring $(CPU), "powerpc sparc64"))
