[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25446] trunk/blender: Some fixes to get blender compiling on solaris.

[Kent Mein]

Revision: 25446
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25446
Author:   sirdude
Date:     2009-12-17 18:42:26 +0100 (Thu, 17 Dec 2009)

Log Message:
-----------
Some fixes to get blender compiling on solaris.

Kent

Modified Paths:
--------------
    trunk/blender/intern/audaspace/SRC/Makefile
    trunk/blender/source/Makefile
    trunk/blender/source/blender/render/intern/raytrace/reorganize.h
    trunk/blender/source/nan_link.mk

Modified: trunk/blender/intern/audaspace/SRC/Makefile
===================================================================
--- trunk/blender/intern/audaspace/SRC/Makefile	2009-12-17 17:34:56 UTC (rev 25445)
+++ trunk/blender/intern/audaspace/SRC/Makefile	2009-12-17 17:42:26 UTC (rev 25446)
@@ -35,7 +35,7 @@
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
-CPPFLAGS += -I$(LCGDIR)/samplerate/include/
+CPPFLAGS += -I$(NAN_SAMPLERATE)/include
 CPPFLAGS += -I../ffmpeg
 CPPFLAGS += -I../FX
 CPPFLAGS += -I../SDL

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2009-12-17 17:34:56 UTC (rev 25445)
+++ trunk/blender/source/Makefile	2009-12-17 17:42:26 UTC (rev 25446)
@@ -118,6 +118,7 @@
 COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
 COMLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
 COMLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
+COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
 COMLIB += $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a
 
 ifeq ($(WITH_FFMPEG),true)
@@ -378,11 +379,6 @@
     endif
 endif
 
-ifeq ($(OS),solaris)
-    PULIB += $(NAN_ZLIB)/lib/libz.a
-    SPLIB += $(NAN_ZLIB)/lib/libz.a
-endif
-
 ifeq ($(WITH_OPENAL),true)
   ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
     ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc x86_64 parisc64"))

Modified: trunk/blender/source/blender/render/intern/raytrace/reorganize.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/reorganize.h	2009-12-17 17:34:56 UTC (rev 25445)
+++ trunk/blender/source/blender/render/intern/raytrace/reorganize.h	2009-12-17 17:42:26 UTC (rev 25446)
@@ -39,6 +39,10 @@
 extern int tot_pushup;
 extern int tot_pushdown;
 
+#if !defined(INFINITY) && defined(HUGE_VAL)
+#define INFINITY HUGE_VAL
+#endif
+
 template<class Node>
 bool node_fits_inside(Node *a, Node *b)
 {

Modified: trunk/blender/source/nan_link.mk
===================================================================
--- trunk/blender/source/nan_link.mk	2009-12-17 17:34:56 UTC (rev 25445)
+++ trunk/blender/source/nan_link.mk	2009-12-17 17:42:26 UTC (rev 25446)
@@ -120,7 +120,7 @@
         LLIBS += -L$(NAN_MESA)/lib
     endif
     
-    LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl 
+    LLIBS += $(NAN_ZLIB)/lib/libz.a -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl 
     DYNLDFLAGS = -shared $(LDFLAGS)
 endif