[Bf-committers] Some FreeBSD stuff
Chris Want
bf-committers@blender.org
Thu, 21 Aug 2003 21:37:06 -0600
This is a multi-part message in MIME format.
--------------080308080507090205000006
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
A few weeks ago the FreeBSD ports guy (spike)
made some suggestions that I briefly looked into,
but then promptly forgot about (I don't use FreeBSD).
Attached is a patch that includes his recommendations,
if some freebsd-er wants to look at them (or a
auto*/python guy, as some of the suggestions
touch those areas).
Chris
--------------080308080507090205000006
Content-Type: text/plain;
name="freebsd-patch.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="freebsd-patch.diff"
? Makefile.in
? aclocal.m4
? autom4te.cache
? config.h.in
? configure
? core.15527
? freebsd-patch.diff
? listde.mia
? log.mia
? seqaudio.diff
? user-def.mk
? wah.tgz
? extern/ode/user-settings
? extern/ode/dist/lib
? extern/ode/dist/include/ode/config.h
? intern/Makefile.in
? intern/SoundSystem/Makefile.in
? intern/bmfont/Makefile.in
? intern/bsp/Makefile.in
? intern/container/Makefile.in
? intern/decimation/Makefile.in
? intern/ghost/Makefile.in
? intern/guardedalloc/Makefile.in
? intern/iksolver/Makefile.in
? intern/memutil/Makefile.in
? intern/moto/Makefile.in
? intern/python/freeze/bkfile.pyo
? intern/python/freeze/checkextensions.pyo
? intern/python/freeze/makeconfig.pyo
? intern/python/freeze/makefreeze.pyo
? intern/python/freeze/makemakefile.pyo
? intern/python/freeze/modulefinder.pyo
? intern/python/freeze/parsesetup.pyo
? intern/python/frozen/src.list
? intern/string/Makefile.in
? obj/linux-glibc2.3.1-i386
? source/Makefile.in
? source/blender/Makefile.in
? source/blender/avi/Makefile.in
? source/blender/blenkernel/Makefile.in
? source/blender/blenlib/Makefile.in
? source/blender/blenloader/Makefile.in
? source/blender/blenpluginapi/Makefile.in
? source/blender/deflate/Makefile.in
? source/blender/imbuf/Makefile.in
? source/blender/img/Makefile.in
? source/blender/inflate/Makefile.in
? source/blender/makesdna/Makefile.in
? source/blender/makesdna/intern/Makefile.in
? source/blender/python/Makefile.in
? source/blender/python/api2_2x/Makefile.in
? source/blender/quicktime/Makefile.in
? source/blender/radiosity/Makefile.in
? source/blender/readblenfile/Makefile.in
? source/blender/readstreamglue/Makefile.in
? source/blender/render/Makefile.in
? source/blender/renderconverter/Makefile.in
? source/blender/src/Makefile.in
? source/blender/src/life.c
? source/blender/src/sector.c
? source/blender/writeblenfile/Makefile.in
? source/blender/writestreamglue/Makefile.in
? source/creator/Makefile.in
? source/gameengine/Makefile.in
? source/gameengine/BlenderRoutines/Makefile.in
? source/gameengine/Converter/Makefile.in
? source/gameengine/Expressions/Makefile.in
? source/gameengine/GameLogic/Makefile.in
? source/gameengine/GamePlayer/Makefile.in
? source/gameengine/Ketsji/Makefile.in
? source/gameengine/Network/Makefile.in
? source/gameengine/Physics/Makefile.in
? source/gameengine/Rasterizer/Makefile.in
? source/gameengine/SceneGraph/Makefile.in
? source/icons/Makefile.in
? source/kernel/Makefile.in
Index: configure.ac
===================================================================
RCS file: /cvsroot/bf-blender/blender/configure.ac,v
retrieving revision 1.53
diff -u -r1.53 configure.ac
--- configure.ac 21 Jul 2003 20:10:22 -0000 1.53
+++ configure.ac 22 Aug 2003 03:30:04 -0000
@@ -295,7 +295,7 @@
AC_CHECK_LIB([png], [png_get_header_version])
AC_CHECK_LIB([jpeg], [jpeg_destroy])
AC_CHECK_LIB([util], [openpty])
- AC_CHECK_LIB([SDL], [SDL_Init])
+ AC_CHECK_LIB([SDL], [SDL_Init],,,[$SDL_LIBS])
AC_CHECK_LIB([util], [openpty])
if test x"$enable_gameblender" = x"yes"; then
AC_CHECK_LIB([ode], [dJointGetAMotorAngle],,
Index: intern/SoundSystem/intern/SND_WaveCache.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/SoundSystem/intern/SND_WaveCache.cpp,v
retrieving revision 1.3
diff -u -r1.3 SND_WaveCache.cpp
--- intern/SoundSystem/intern/SND_WaveCache.cpp 25 Nov 2002 15:29:56 -0000 1.3
+++ intern/SoundSystem/intern/SND_WaveCache.cpp 22 Aug 2003 03:30:05 -0000
@@ -45,12 +45,15 @@
#include "SND_WaveCache.h"
#include <stdio.h>
-#ifndef __APPLE__
-#include <malloc.h>
-#else // __APPLE__
-#include <sys/malloc.h>
-#endif // __APPLE__
-
+#ifdef __APPLE__
+# include <sys/malloc.h>
+#else
+# ifdef __FreeBSD__
+# include <stdlib.h>
+# else
+# include <malloc.h>
+# endif
+#endif
SND_WaveCache::SND_WaveCache()
{
Index: source/blender/python/Makefile.am
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/python/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- source/blender/python/Makefile.am 28 Jun 2003 07:37:50 -0000 1.6
+++ source/blender/python/Makefile.am 22 Aug 2003 03:30:08 -0000
@@ -6,7 +6,12 @@
libblender_python_la_SOURCES = BPY_interface.c
-libblender_python_la_CFLAGS = -Wall
+# The FreeBSD Ports guy says that we'll all go to
+# hell if we include the following line, and that
+# if we want -Wall we should set it in $CFLAGS:
+#libblender_python_la_CFLAGS = -Wall
+
+libblender_python_la_CFLAGS =
libblender_python_la_LIBADD = \
api2_2x/libblender_api2_2x.la
Index: source/blender/python/api2_2x/Makefile.am
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/python/api2_2x/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- source/blender/python/api2_2x/Makefile.am 30 Jul 2003 21:15:30 -0000 1.23
+++ source/blender/python/api2_2x/Makefile.am 22 Aug 2003 03:30:08 -0000
@@ -69,7 +69,12 @@
modules.h \
bpy_types.h
-libblender_api2_2x_la_CFLAGS = -Wall
+# The FreeBSD Ports guy says that we'll all go to
+# hell if we include the following line, and that
+# if we want -Wall we should set it in $CFLAGS:
+#libblender_api2_2x_la_CFLAGS = -Wall
+
+libblender_api2_2x_la_CFLAGS =
INCLUDES = \
-I@PYTHONSYSPREFIX@/include/python@PYTHON_VERSION@ \
Index: source/creator/creator.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/creator/creator.c,v
retrieving revision 1.21
diff -u -r1.21 creator.c
--- source/creator/creator.c 19 Jul 2003 20:14:07 -0000 1.21
+++ source/creator/creator.c 22 Aug 2003 03:30:09 -0000
@@ -88,10 +88,9 @@
#include <signal.h>
#ifdef __FreeBSD__
- #ifndef __OpenBSD__
- #include <floatingpoint.h>
- #include <sys/rtprio.h>
- #endif
+#include <sys/types.h>
+#include <floatingpoint.h>
+#include <sys/rtprio.h>
#endif
#ifdef WITH_QUICKTIME
--------------080308080507090205000006--