[Bf-committers] OSX update

Kent Mein bf-committers@blender.org
Tue, 18 Nov 2003 12:47:50 -0600


I Tried compiling blender on an OSX 10.3.1 box and had
to make the following change, ok to commit this will it work with
older versions?  I've included the cvs diff and the build script
I'm using...

Kent

cvs diff:
Index: source/nan_link.mk
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/nan_link.mk,v
retrieving revision 1.19
diff -u -r1.19 nan_link.mk
--- source/nan_link.mk  4 Aug 2003 03:26:07 -0000       1.19
+++ source/nan_link.mk  18 Nov 2003 18:43:48 -0000
@@ -58,7 +58,7 @@
 ifeq ($(OS),darwin)
     LLIBS    += -lGLU -lGL
     LLIBS    += -lz -framework Carbon -framework AGL 
-       LLIBS    += -framework QuickTime
+       LLIBS    += -framework QuickTime -liconv
     LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
     DBG_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
 endif



#---------------------- End Diff here and start my build script----------------

#!/bin/sh

#rm -f /tmp/.nanguess
export NANBLENDERHOME=`pwd`
export MAKEFLAGS="-w -I $NANBLENDERHOME/source --no-print-directory -DWITH_FREET
YPE2 -DINTERNATIONAL"
#export HMAKE="$NANBLENDERHOME/source/tools/hmake/hmake"
export HMAKE=make

export NAN_ODE=/world/blender/extern/ode/dist
export NAN_FREETYPE=/usr
export NAN_FTGL=/usr/local
export NAN_PYTHON=/usr
export NAN_PYTHON_VERSION=2.2
export NAN_PYTHON_BINARY=/usr/bin/python
export NAN_OPENAL=/usr/local
export NAN_GHOST=/world/ggg
export NAN_FMOD=/usr/local
export NAN_JPEG=/usr
export NAN_PNG=/usr
export NAN_SDL=/usr
export NAN_ZLIB=/usr
export CPPFLAGS="-DMOZ_NOT_NET"
export CFLAGS="-DMOZ_NOT_NET"
export NAN_MOZILLA_INC=/usr/include/mozilla-1.3
export NAN_MOZILLA_LIB=/usr/lib/mozilla-1.3
#export NAN_NSPR=/usr/include/mozilla-1.3/nspr
#export NAN_MESA=/usr/local/Mesa-4.1
export WITH_FREETYPE2=true
export INTERNATIONAL=true

$HMAKE -C intern/
if [ $? -eq 0 ]; then
        $HMAKE -C source/
fi
$HMAKE -C release