From: <hug...@li...> - 2011-01-07 18:15:43
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a75c9fef69ff changeset: 4805:a75c9fef69ff user: tmodes date: Fri Jan 07 19:15:16 2011 +0100 description: Merged diffstat: mac/ExternalPrograms/scripts/enblend.sh | 6 +++--- mac/ExternalPrograms/scripts/pano13.sh | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diffs (45 lines): diff -r 53508ea2ec6f -r a75c9fef69ff mac/ExternalPrograms/scripts/enblend.sh --- a/mac/ExternalPrograms/scripts/enblend.sh Fri Jan 07 19:13:49 2011 +0100 +++ b/mac/ExternalPrograms/scripts/enblend.sh Fri Jan 07 19:15:16 2011 +0100 @@ -125,8 +125,8 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I/usr/include" \ LIBS="-lGLEW -framework GLUT -lobjc -framework OpenGL -framework AGL" \ LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ @@ -134,7 +134,7 @@ PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \ - --with-glew $extraConfig || fail "configure step for $ARCH"; + --with-glew $extraConfig --with-openexr || fail "configure step for $ARCH"; # hack; AC_FUNC_MALLOC sucks!! diff -r 53508ea2ec6f -r a75c9fef69ff mac/ExternalPrograms/scripts/pano13.sh --- a/mac/ExternalPrograms/scripts/pano13.sh Fri Jan 07 19:13:49 2011 +0100 +++ b/mac/ExternalPrograms/scripts/pano13.sh Fri Jan 07 19:15:16 2011 +0100 @@ -24,6 +24,7 @@ # 20100119.0 sg Support the SVN version of panotools - 2.9.16 # 201004xx.0 hvdw support 2.9.17 # 20100624.0 hvdw More robust error checking on compilation +# 20110107.0 hvdw support for 2.9.18 # ------------------------------- # init @@ -54,6 +55,10 @@ GENERATED_DYLIB_NAME="libpano13.2.dylib"; GENERATED_DYLIB_INSTALL_NAME="libpano13.dylib"; ;; + "18") + GENERATED_DYLIB_NAME="libpano13.2.dylib"; + GENERATED_DYLIB_INSTALL_NAME="libpano13.dylib"; + ;; *) echo "Unknown libpano version $libpanoVsn. Program aborting." exit 1 |