[Bf-committers] Makefile patch

Ton Roosendaal bf-committers@blender.org
Mon, 16 Aug 2004 15:30:12 +0200


--Apple-Mail-4-539179168
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed

Hi,

This was added in bug tracker by Radim Kolar (hsn). He said it was 
tested on freebsd only. It has changes I can't judge, in openAl & 
sumo/solid. Anyone?



--Apple-Mail-4-539179168
Content-Disposition: attachment;
	filename=all.patches
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="all.patches"

--- release/plugins/bmake.orig	Tue Nov 25 21:10:06 2003
+++ release/plugins/bmake	Wed Aug  4 16:02:55 2004
@@ -112,6 +112,8 @@
 	INCLUDES=-I..;
 elif ( test -f "../include/plugin.h" ) then
 	INCLUDES=-I../include
+elif ( test -f "%%PREFIX%%/lib/blender/include/plugin.h" ) then
+	INCLUDES=-I%%PREFIX%%/lib/blender/include
 else 
 	echo "Couldn't find plugin.h";
 	exit;
--- ./source/gameengine/Physics/Makefile.orig	Mon Mar 22 23:02:08 2004
+++ ./source/gameengine/Physics/Makefile	Sat Aug  7 21:01:35 2004
@@ -36,6 +36,6 @@
 SOURCEDIR = source/gameengine/Physics
 DIR = $(OCGDIR)/gameengine/blphys
 DIRS = common Sumo Dummy
-DIRS += BlOde
+#DIRS += BlOde
 
 include nan_subdirs.mk
--- intern/SoundSystem/intern/Makefile.orig	Wed Oct 22 01:27:08 2003
+++ intern/SoundSystem/intern/Makefile	Sun Aug  1 22:41:54 2004
@@ -47,3 +47,7 @@
 CPPFLAGS += -I../openal
 CPPFLAGS += -I..
 CPPFLAGS += -I.
+
+ifeq ($(NAN_NO_OPENAL),true)
+  CPPFLAGS += -DNO_SOUND
+endif
--- source/Makefile.orig	Mon Jul 19 04:43:07 2004
+++ source/Makefile	Sat Aug  7 21:20:25 2004
@@ -122,8 +122,8 @@
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
-#    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
+#    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
 #    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a

--Apple-Mail-4-539179168
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	delsp=yes;
	charset=US-ASCII;
	format=flowed




-Ton-

------------------------------------------------------------------------ 
--
Ton Roosendaal  Blender Foundation ton@blender.org  
http://www.blender.org
--Apple-Mail-4-539179168--