Revision: 17571
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17571
Author: sgefant
Date: 2008-11-25 13:53:13 +0100 (Tue, 25 Nov 2008)
Log Message:
-----------
* fix path to openexr on irix
* added missing define in storage.c
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/nan_definitions.mk
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2008-11-25
12:26:36 UTC (rev 17570)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2008-11-25
12:53:13 UTC (rev 17571)
@@ -204,7 +204,7 @@
return -1;
#endif
-#if defined (__sun__) || defined (__sun)
+#if defined (__sun__) || defined (__sun) || defined (__sgi)
if (statvfs(name, &disk)) return(-1);
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) ||
defined(__sparc__))
/* WARNING - This may not be supported by geeneric unix os's - Campbell
*/
Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk 2008-11-25 12:26:36 UTC (rev
17570)
+++ trunk/blender/source/nan_definitions.mk 2008-11-25 12:53:13 UTC (rev
17571)
@@ -84,7 +84,7 @@
export NAN_GUARDEDALLOC ?= $(LCGDIR)/guardedalloc
export NAN_IKSOLVER ?= $(LCGDIR)/iksolver
export NAN_BSP ?= $(LCGDIR)/bsp
- export NAN_BOOLOP ?= $(LCGDIR)/boolop
+ export NAN_BOOLOP ?= $(LCGDIR)/boolop
export NAN_SOUNDSYSTEM ?= $(LCGDIR)/SoundSystem
export NAN_STRING ?= $(LCGDIR)/string
export NAN_MEMUTIL ?= $(LCGDIR)/memutil
@@ -117,7 +117,7 @@
export WITH_DDS ?= true
ifeq ($(OS),windows)
- export NAN_WINTAB ?= $(LCGDIR)/wintab
+ export NAN_WINTAB ?= $(LCGDIR)/wintab
ifeq ($(FREE_WINDOWS), true)
export NAN_PTHREADS ?= $(LCGDIR)/pthreads
export NAN_OPENEXR ?= $(LCGDIR)/gcc/openexr
@@ -130,27 +130,33 @@
endif
else
ifeq ($(OS),darwin)
- export NAN_OPENEXR ?= $(LCGDIR)/openexr
- ifeq ($(CPU),powerpc)
- export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a
$(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
- else
- export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a
$(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
$(NAN_OPENEXR)/lib/libIlmThread.a
- endif
+ export NAN_OPENEXR ?= $(LCGDIR)/openexr
+ ifeq ($(CPU),powerpc)
+ export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a
$(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
+ else
+ export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a
$(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
$(NAN_OPENEXR)/lib/libIlmThread.a
+ endif
else
ifeq ($(OS),linux)
- ifeq ($(WITH_OPENEXR), true)
- NAN_OPENEXR?=$(shell pkg-config --variable=prefix
OpenEXR )
- NAN_OPENEXR_INC?=$(shell pkg-config --cflags OpenEXR )
- NAN_OPENEXR_LIBS?=$(addprefix
${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs-only-l OpenEXR
| sed -s "s/-l//g" )))
- endif
+ ifeq ($(WITH_OPENEXR), true)
+ NAN_OPENEXR?=$(shell pkg-config --variable=prefix OpenEXR )
+ NAN_OPENEXR_INC?=$(shell pkg-config --cflags OpenEXR )
+ NAN_OPENEXR_LIBS?=$(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix
.a,$(shell pkg-config --libs-only-l OpenEXR | sed -s "s/-l//g" )))
+ endif
else
ifeq ($(OS), solaris)
# this only exists at the moment for i386-64 CPU Types at the
moment
export NAN_OPENEXR ?= $(LCGDIR)/openexr
-
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a
$(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
$(NAN_OPENEXR)/lib/libIlmThread.a -lrt
else
- export NAN_OPENEXR ?= $(LCGDIR)/openexr
+ ifeq ($(OS), irix)
+ ifeq ($(IRIX_USE_GCC), true)
+ export NAN_OPENEXR ?= $(LCGDIR)/openexr/gcc
+ else
+ export NAN_OPENEXR ?= $(LCGDIR)/openexr
+ endif
+ endif
+ export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include
-I$(NAN_OPENEXR)/include/OpenEXR
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a
$(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
$(NAN_OPENEXR)/lib/libIlmThread.a
endif
endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
