From fcaad00bda20244a49e85175b2a6bc1b8c131c54 Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Thu, 17 Dec 2009 17:42:26 +0000
Subject: [PATCH] Some fixes to get blender compiling on solaris.

Kent
---
 intern/audaspace/SRC/Makefile                      | 2 +-
 source/Makefile                                    | 6 +-----
 source/blender/render/intern/raytrace/reorganize.h | 4 ++++
 source/nan_link.mk                                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/intern/audaspace/SRC/Makefile b/intern/audaspace/SRC/Makefile
index 5cf5f55b11f..0959ebb4bfa 100644
--- a/intern/audaspace/SRC/Makefile
+++ b/intern/audaspace/SRC/Makefile
@@ -35,7 +35,7 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
-CPPFLAGS += -I$(LCGDIR)/samplerate/include/
+CPPFLAGS += -I$(NAN_SAMPLERATE)/include
 CPPFLAGS += -I../ffmpeg
 CPPFLAGS += -I../FX
 CPPFLAGS += -I../SDL
diff --git a/source/Makefile b/source/Makefile
index e503fdc3302..37b528f4aed 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -118,6 +118,7 @@ COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
 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 @@ ifeq ($(WITH_BF_WEBPLUGIN), true)
     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"))
diff --git a/source/blender/render/intern/raytrace/reorganize.h b/source/blender/render/intern/raytrace/reorganize.h
index 2d4a4d15fe2..7b14108760a 100644
--- a/source/blender/render/intern/raytrace/reorganize.h
+++ b/source/blender/render/intern/raytrace/reorganize.h
@@ -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)
 {
diff --git a/source/nan_link.mk b/source/nan_link.mk
index 8f33c917526..f8bb8e8660d 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -120,7 +120,7 @@ ifeq ($(OS),solaris)
         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