Index: extern/solid/examples/Makefile.am =================================================================== RCS file: /cvsroot/bf-blender/blender/extern/solid/examples/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- extern/solid/examples/Makefile.am 16 Feb 2004 15:59:00 -0000 1.2 +++ extern/solid/examples/Makefile.am 25 May 2004 12:29:41 -0000 @@ -7,7 +7,7 @@ physics_SOURCES = physics.cpp mnm_SOURCES = mnm.cpp -GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXi -lX11 +GLLIBS = -framework GLUT -framework OpenGL -lobjc sample_LDADD = ../src/libsolid.la gldemo_LDADD = ../src/libsolid.la $(GLLIBS) Index: extern/solid/examples/Makefile.in =================================================================== RCS file: /cvsroot/bf-blender/blender/extern/solid/examples/Makefile.in,v retrieving revision 1.3 diff -u -r1.3 Makefile.in --- extern/solid/examples/Makefile.in 3 May 2004 17:58:36 -0000 1.3 +++ extern/solid/examples/Makefile.in 25 May 2004 12:29:41 -0000 @@ -134,7 +134,7 @@ physics_SOURCES = physics.cpp mnm_SOURCES = mnm.cpp -GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXi -lX11 +GLLIBS = -framework GLUT -framework OpenGL -lobjc sample_LDADD = ../src/libsolid.la gldemo_LDADD = ../src/libsolid.la $(GLLIBS) Index: extern/solid/examples/gldemo.cpp =================================================================== RCS file: /cvsroot/bf-blender/blender/extern/solid/examples/gldemo.cpp,v retrieving revision 1.2 diff -u -r1.2 gldemo.cpp --- extern/solid/examples/gldemo.cpp 16 Feb 2004 15:59:00 -0000 1.2 +++ extern/solid/examples/gldemo.cpp 25 May 2004 12:29:41 -0000 @@ -21,7 +21,12 @@ * use of this library. */ +#if __APPLE__ +#include +#else #include +#endif + #include #define DISPLAY // Interactively draw new placements Index: extern/solid/examples/mnm.cpp =================================================================== RCS file: /cvsroot/bf-blender/blender/extern/solid/examples/mnm.cpp,v retrieving revision 1.2 diff -u -r1.2 mnm.cpp --- extern/solid/examples/mnm.cpp 16 Feb 2004 15:59:00 -0000 1.2 +++ extern/solid/examples/mnm.cpp 25 May 2004 12:29:41 -0000 @@ -29,7 +29,11 @@ //#define DRAW_COORD #include +#if __APPLE__ +#include +#else #include +#endif #include "GEN_MinMax.h" #include "MT_Point3.h" Index: extern/solid/examples/physics.cpp =================================================================== RCS file: /cvsroot/bf-blender/blender/extern/solid/examples/physics.cpp,v retrieving revision 1.2 diff -u -r1.2 physics.cpp --- extern/solid/examples/physics.cpp 16 Feb 2004 15:59:00 -0000 1.2 +++ extern/solid/examples/physics.cpp 25 May 2004 12:29:41 -0000 @@ -28,7 +28,11 @@ //#define USE_QUADS // Idem, but now with quads #include +#if __APPLE__ +#include +#else #include +#endif #include "GEN_MinMax.h" #include "MT_Point3.h" Index: intern/SoundSystem/intern/SND_DeviceManager.cpp =================================================================== RCS file: /cvsroot/bf-blender/blender/intern/SoundSystem/intern/SND_DeviceManager.cpp,v retrieving revision 1.3 diff -u -r1.3 SND_DeviceManager.cpp --- intern/SoundSystem/intern/SND_DeviceManager.cpp 25 Nov 2002 15:29:56 -0000 1.3 +++ intern/SoundSystem/intern/SND_DeviceManager.cpp 25 May 2004 12:29:41 -0000 @@ -38,6 +38,10 @@ #include #endif +#if __APPLE__ +#undef USE_OPENAL +#endif + #include "SND_DeviceManager.h" #include "SND_DependKludge.h" #include "SND_DummyDevice.h" @@ -126,7 +130,11 @@ #ifdef USE_OPENAL case snd_e_openaldevice: { +#if __APPLE__ + m_instance = new SND_DummyDevice(); +#else m_instance = new SND_OpenALDevice(); +#endif m_device_type = device_type; break; } Index: source/nan_definitions.mk =================================================================== RCS file: /cvsroot/bf-blender/blender/source/nan_definitions.mk,v retrieving revision 1.59 diff -u -r1.59 nan_definitions.mk --- source/nan_definitions.mk 4 May 2004 04:55:23 -0000 1.59 +++ source/nan_definitions.mk 25 May 2004 12:29:43 -0000 @@ -62,7 +62,11 @@ export NAN_SOLID ?= $(LCGDIR)/gcc/solid export NAN_QHULL ?= $(LCGDIR)/gcc/qhull else - export NAN_SOLID ?= $(LCGDIR)/solid +# ifeq ($(OS),darwin) +# else +# endif + + export NAN_SOLID ?= $(LCGDIR)/solid export NAN_QHULL ?= $(LCGDIR)/qhull endif export NAN_SUMO ?= $(SRCHOME)/gameengine/Physics/Sumo @@ -84,7 +88,10 @@ ifeq ($(FREE_WINDOWS), true) export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl else - export NAN_FTGL ?= $(LCGDIR)/ftgl + ifeq ($(OS),darwin) + else + export NAN_FTGL ?= $(LCGDIR)/ftgl + endif endif # Platform Dependent settings go below: @@ -110,7 +117,7 @@ export NAN_SDL ?= $(shell sdl-config --prefix) export NAN_SDLLIBS ?= $(shell sdl-config --libs) export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) - + # Uncomment the following line to use Mozilla inplace of netscape # CPPFLAGS +=-DMOZ_NOT_NET # Location of MOZILLA/Netscape header files... @@ -134,23 +141,26 @@ export ID = $(shell whoami) export HOST = $(shell hostname -s) - export NAN_PYTHON ?= /sw + export NAN_PYTHON ?= $(dports_prefix) export NAN_PYTHON_VERSION ?= 2.3 - export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) - export NAN_OPENAL ?= $(LCGDIR)/openal + export NAN_PYTHON_BINARY ?= $(dports_prefix)/bin/python$(NAN_PYTHON_VERSION) +# export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_FMOD ?= $(LCGDIR)/fmod - export NAN_JPEG ?= /sw - export NAN_PNG ?= /sw - export NAN_ODE ?= $(LCGDIR)/ode + export NAN_JPEG ?= $(dports_prefix) + export NAN_PNG ?= $(dports_prefix) + export NAN_ODE ?= $(dports_prefix) export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= $(LCGDIR)/zlib export NAN_NSPR ?= $(LCGDIR)/nspr - export NAN_FREETYPE ?= /sw - export NAN_GETTEXT ?= $(LCGDIR)/gettext - export NAN_SDL ?= $(LCGDIR)/sdl - export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include - export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa + export NAN_FREETYPE ?= $(dports_prefix) + export NAN_GETTEXT ?= $(dports_prefix) + export NAN_SDL ?= $(dports_prefix) + export NAN_FTGL ?= $(dports_prefix) + export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include/SDL + export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa -framework IOKit -framework OpenGL -liconv + export NAN_NO_OPENAL = true +# export NAN_SOLID ?= $(SRCHOME)/../extern/solid # Uncomment the following line to use Mozilla inplace of netscape # CPPFLAGS +=-DMOZ_NOT_NET Index: source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h =================================================================== RCS file: /cvsroot/bf-blender/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h,v retrieving revision 1.8 diff -u -r1.8 RAS_OpenGLRasterizer.h --- source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h 16 May 2004 12:55:21 -0000 1.8 +++ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h 25 May 2004 12:29:44 -0000 @@ -44,6 +44,8 @@ #include "RAS_MaterialBucket.h" #include "RAS_ICanvas.h" +class MT_Quaternion; + /** * 3D rendering device context. */