nur

git-svn-id: http://svn.voria.com/code@35 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 928c23c..b624f2f 100644 (file)
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -95,7 +95,7 @@ else
 if MACOSX_PKG
 package: all pkg-info/macosx/synfig-core.info
        [ -d pkg_root ] && $(RMDIR) pkg_root || true
-       make install prefix="`pwd`/pkg_root"
+       make install-strip prefix="`pwd`/pkg_root"
        $(srcdir)/config/package pkg_root pkg-info/macosx/synfig-core.info -r $(srcdir)/pkg-info/macosx/core-resources
 endif
 endif

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index a44033c..e7b28ca 100755 (executable)
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -219,9 +219,7 @@ set +x
 output Patching libtool...
 patch config/ltmain.sh config/ltmain.patch
 ) || true
-
-false &&
-{
+false && {
        # Something went wrong...
        set +x
        output Failure.

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 0fb932f..8d94002 100644 (file)
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -341,7 +341,7 @@ AC_CHECK_LIB(png, png_write_row,[
        AC_MSG_RESULT([ *** PNG Output target disabled])
        TARGET_PNG="no"
        AM_CONDITIONAL(HAVE_LIBPNG,false)
-],[-lz])
+],[-lz -L${exec_prefix}/lib])
 
 AC_CHECK_LIB(jpeg, main,[
        JPEG_LIBS="-ljpeg"
@@ -352,7 +352,7 @@ AC_CHECK_LIB(jpeg, main,[
        AC_MSG_RESULT([ *** JPEG Output target disabled])
        TARGET_JPEG="no"
        AM_CONDITIONAL(HAVE_LIBJPEG,false)
-],[])
+],[-L${exec_prefix}/lib])
 
 
 dnl AC_CHECK_HEADERS(jpeglib.h,[],[
@@ -464,8 +464,8 @@ AC_SUBST(CONFIG_CFLAGS)
 AC_SUBST(CONFIG_DEPS)
 AC_SUBST(ETL_CFLAGS)
 
-SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $OPENEXR_LIBS $LIBSIGC_LIBS"
-SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $OPENEXR_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED"
+SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $LIBSIGC_LIBS"
+SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED"
 
 CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
 SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"

diff --git a/synfig-core/trunk/macosxbuild.sh b/synfig-core/trunk/macosxbuild.sh
index e112a69..d9f7c1b 100755 (executable)
--- a/synfig-core/trunk/macosxbuild.sh
+++ b/synfig-core/trunk/macosxbuild.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #OPTIONS="--disable-optimization --enable-debug"
-
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11R6/lib/pkgconfig
 OPTIONS=""
 #OPTIONS="$OPTIONS --enable-timelimit=120"
 #OPTIONS="$OPTIONS --enable-optimization=2"
@@ -9,6 +9,7 @@ OPTIONS="$OPTIONS --enable-optimization=3 --enable-g5opt"
 #OPTIONS="$OPTIONS --disable-optimization"
 OPTIONS="$OPTIONS --disable-debug"
 #OPTIONS="$OPTIONS --with-vimage"
+OPTIONS="$OPTIONS --without-openexr"
 
 CC=gcc
 CXX=g++
@@ -31,7 +32,7 @@ cd $BUILDDIR
 
 echo ../configure $OPTIONS CC="$CC" CXX="$CXX"
 
-../configure $OPTIONS CC="$CC" CXX="$CXX" || exit 1
+../configure $OPTIONS CC="$CC" CXX="$CXX" MACOS_DEPLOYMENT_TARGET=10.4 || exit 1
 
 make package $MAKEFLAGS
 

diff --git a/synfig-core/trunk/src/synfig/node.cpp b/synfig-core/trunk/src/synfig/node.cpp
index 55e28f5..b809e75 100644 (file)
--- a/synfig-core/trunk/src/synfig/node.cpp
+++ b/synfig-core/trunk/src/synfig/node.cpp
@@ -201,10 +201,10 @@ Node::get_guid()const
 #ifdef BE_FRUGAL_WITH_GUIDS
        if(!guid_)
        {
-               guid_.make_unique();
+               const_cast<GUID&>(guid_).make_unique();
                assert(guid_);
                assert(!global_node_map().count(guid_));
-               global_node_map()[guid_]=this;  
+               global_node_map()[guid_]=const_cast<Node*>(this);       
        }
 #endif
        

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index ebaacdf..a751d5e 100644 (file)
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -48,7 +48,7 @@ extern "C" { int _isnan(double x); }
 #endif
 
 #ifdef __APPLE__
-#define isnan __isnan
+#define isnan __isnanf
 #endif
 
 #endif

diff --git a/synfig-core/trunk/synfig.pc.in b/synfig-core/trunk/synfig.pc.in
deleted file mode 100644 (file)
index 473a488..0000000
--- a/synfig-core/trunk/synfig.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@synfigincludedir@
-
-Name: synfig
-Description: Synfig Core
-Requires: @CONFIG_DEPS@
-Version: 0.61.00-29
-Libs: -L${libdir} @CONFIG_LIBS@
-Cflags: @CONFIG_CFLAGS@ -I@synfigincludedir@