bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Mac intel commit

Browse Source 
- patch from Douglas with endian fixes
- Makefile adds static libiconv.a from lib/
- this version will use OpenEXR libs from lib/ too, and is latest release
  with threading support
- openAL is missing, added it as default to not include it
This commit is contained in:
Ton Roosendaal 2006-07-03 19:50:53 +00:00
parent d55b5240b9
commit 64ff9ae4a8
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/guardedalloc/intern/mallocn.c
View File

@ -93,7 +93,7 @@ static const char *check_memlist(MemHead *memh);
/* locally used defines */
/* --------------------------------------------------------------------- */
#if defined( __sgi) || defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__APPLE__)
#if defined( __sgi) || defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__))
#define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
#else
#define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )

3
source/Makefile
View File

@ -201,6 +201,9 @@ ifeq ($(INTERNATIONAL), true)
endif
ifeq ($(OS), darwin)
COMLIB += $(NAN_GETTEXT)/lib/libintl.a
ifeq ($(CPU), i386)
COMLIB += $(NAN_GETTEXT)/lib/libiconv.a
endif
endif
ifeq ($(OS), solaris)
COMLIB += $(NAN_GETTEXT)/lib/libintl.a

2
source/blender/imbuf/intern/imbuf.h
View File

@ -63,7 +63,7 @@
#define ENDIAN_NOP(x) (x)
#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__APPLE__)
#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__))
#define LITTLE_SHORT SWAP_SHORT
#define LITTLE_LONG SWAP_LONG
#define BIG_SHORT ENDIAN_NOP

9
source/nan_compile.mk
View File

@ -80,8 +80,13 @@ endif
ifeq ($(OS),darwin)
CC = gcc
CCC = g++
CFLAGS += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5
CCFLAGS += -pipe -fPIC
ifeq ($(CPU),powerpc)
CFLAGS += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5
CCFLAGS += -pipe -fPIC
else
CFLAGS += -pipe -fPIC -ffast-math -march=pentium-m
CCFLAGS += -pipe -fPIC
endif
REL_CFLAGS += -O2
REL_CCFLAGS += -O2
CPPFLAGS += -D_THREAD_SAFE

19
source/nan_definitions.mk
View File

@ -112,9 +112,17 @@ endif
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/IlmImf -I$(NAN_OPENEXR)/include/Imath -I$(NAN_OPENEXR)/include/Iex
endif
else
export NAN_OPENEXR ?= /usr/local
export NAN_OPENEXR ?= $(LCGDIR)/openexr
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
ifeq ($(OS),darwin)
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
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
endif
endif
# Platform Dependent settings go below:
@ -199,9 +207,12 @@ endif
export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa -framework IOKit
export NAN_NO_KETSJI=false
# export NAN_NO_KETSJI=true
ifeq ($(CPU), i386)
export NAN_NO_OPENAL=true
endif
# Uncomment the following line to use Mozilla inplace of netscape
# CPPFLAGS +=-DMOZ_NOT_NET
# Location of MOZILLA/Netscape header files...