From: <har...@us...> - 2010-01-19 14:46:13
|
Revision: 4916 http://hugin.svn.sourceforge.net/hugin/?rev=4916&view=rev Author: harryvanderwolf Date: 2010-01-19 14:45:56 +0000 (Tue, 19 Jan 2010) Log Message: ----------- [OSX] script modifications to incorporate libiconv into bundle creation Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh hugin/trunk/mac/complete-bundle.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-19 06:10:57 UTC (rev 4915) +++ hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-19 14:45:56 UTC (rev 4916) @@ -5,6 +5,7 @@ # Update to enblend-enfuse-4.0 and panotools 2.9.15 # 20100112.0 sg Made libxmi dynamic. Created lib-static directory # 20100117.0 sg Update for glew 1.5.2 +# 20100119.0 HvdW Add libiconv # ------------------------------- cd /PATHTOHUGIN/hugin/mac/ExternalPrograms/scripts @@ -15,6 +16,7 @@ echo "$pre boost $pst" && cd ../boost_1_40_0 && sh ../scripts/boost.sh echo "$pre expat $pst" && cd ../expat-2.0.1 && sh ../scripts/libexpat.sh; +echo "$pre libiconv $pst && cd ../libiconv-1.13.1 && sh ../scripts/libiconv.sh; echo "$pre gettext $pst" && cd ../gettext-0.17 && sh ../scripts/gettext.sh echo "$pre libjpeg-7 $pst" && cd ../jpeg-7 && sh ../scripts/libjpeg-7.sh; echo "$pre libpng $pst" && cd ../libpng-1.2.38 && sh ../scripts/libpng.sh; Modified: hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2010-01-19 06:10:57 UTC (rev 4915) +++ hugin/trunk/mac/ExternalPrograms/scripts/gettext.sh 2010-01-19 14:45:56 UTC (rev 4916) @@ -103,10 +103,10 @@ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared --enable-static --disable-csharp \ + --enable-shared --enable-static --disable-csharp --disable-java \ --with-included-gettext --with-included-glib \ --with-included-libxml --without-examples --with-libexpat-prefix=$REPOSITORYDIR \ - --with-included-libcroco --without-emacs --with-libiconf-prefix=/usr ; + --with-included-libcroco --without-emacs --with-libiconf-prefix=$REPOSITORYDIR ; # read input; make clean; Modified: hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2010-01-19 06:10:57 UTC (rev 4915) +++ hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2010-01-19 14:45:56 UTC (rev 4916) @@ -87,7 +87,8 @@ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --program-transform-name='s/^make$/gnumake/'; + --with-libiconv-prefix=$REPOSITORYDIR --with-libintl-prefix=$REPOSITORYDIR \ + --program-transform-name='s/^make$/gnumake/'; make clean; make; Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2010-01-19 06:10:57 UTC (rev 4915) +++ hugin/trunk/mac/complete-bundle.sh 2010-01-19 14:45:56 UTC (rev 4916) @@ -10,9 +10,9 @@ App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi" +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv.dylib" -binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*" +binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin* $App/Contents/Resources/align_image_stack" #------------------------------------------------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ski...@us...> - 2010-01-19 19:56:01
|
Revision: 4918 http://hugin.svn.sourceforge.net/hugin/?rev=4918&view=rev Author: skipgaede Date: 2010-01-19 19:55:49 +0000 (Tue, 19 Jan 2010) Log Message: ----------- [OSX] Fixed minor glitches in complete-bundle.sh and scripts/build-all.sh Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh hugin/trunk/mac/complete-bundle.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-19 15:28:35 UTC (rev 4917) +++ hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-19 19:55:49 UTC (rev 4918) @@ -6,9 +6,10 @@ # 20100112.0 sg Made libxmi dynamic. Created lib-static directory # 20100117.0 sg Update for glew 1.5.2 # 20100119.0 HvdW Add libiconv +# 20100118.1 sg Fixed missing "" and named SVN directory for panotools libpano13-2.9.16 # ------------------------------- -cd /PATHTOHUGIN/hugin/mac/ExternalPrograms/scripts +cd /PATHTOHUGIN/mac/ExternalPrograms/scripts cat SetEnv.txt source SetEnv.txt pre="<<<<<<<<<<<<<<<<<<<< building" @@ -16,7 +17,7 @@ echo "$pre boost $pst" && cd ../boost_1_40_0 && sh ../scripts/boost.sh echo "$pre expat $pst" && cd ../expat-2.0.1 && sh ../scripts/libexpat.sh; -echo "$pre libiconv $pst && cd ../libiconv-1.13.1 && sh ../scripts/libiconv.sh; +echo "$pre libiconv $pst" && cd ../libiconv-1.13.1 && sh ../scripts/libiconv.sh; echo "$pre gettext $pst" && cd ../gettext-0.17 && sh ../scripts/gettext.sh echo "$pre libjpeg-7 $pst" && cd ../jpeg-7 && sh ../scripts/libjpeg-7.sh; echo "$pre libpng $pst" && cd ../libpng-1.2.38 && sh ../scripts/libpng.sh; @@ -24,7 +25,7 @@ echo "$pre wxmac $pst" && cd ../wxMac-2.8.10 && sh ../scripts/wxmac28.sh; echo "$pre ilmbase $pst" && cd ../ilmbase-1.0.1 && sh ../scripts/ilmbase.sh; echo "$pre openexr $pst" && cd ../openexr-1.6.1 && sh ../scripts/openexr16.sh; -echo "$pre libpano13 $pst" && cd ../libpano13-2.9.15 && sh ../scripts/pano13.sh; +echo "$pre libpano13 $pst" && cd ../libpano13-2.9.16 && sh ../scripts/pano13.sh; echo "$pre libexiv2 $pst" && cd ../exiv2-0.18.2 && sh ../scripts/libexiv2.sh; echo "$pre liblcms $pst" && cd ../lcms-1.17 && sh ../scripts/lcms.sh; echo "$pre libxmi $pst" && cd ../libxmi-1.2 && sh ../scripts/libxmi.sh; Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2010-01-19 15:28:35 UTC (rev 4917) +++ hugin/trunk/mac/complete-bundle.sh 2010-01-19 19:55:49 UTC (rev 4918) @@ -10,7 +10,7 @@ App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv.dylib" +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv" binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin* $App/Contents/Resources/align_image_stack" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ski...@us...> - 2010-01-21 22:21:34
|
Revision: 4925 http://hugin.svn.sourceforge.net/hugin/?rev=4925&view=rev Author: skipgaede Date: 2010-01-21 22:18:43 +0000 (Thu, 21 Jan 2010) Log Message: ----------- [OSX] Updated scripts for updated packages: boost,jpeg,png,tiff,exiv2,lcms Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2010-01-21 22:18:43 UTC (rev 4925) @@ -3,6 +3,7 @@ //---------------------------------- // 20091208.0 sg Added gettext version, needed for libraries with embedded hyphen in name // Added documentation about when absolute pathspecs are needed +// 20100121.0 sg Updated boost and exif-tool versions //---------------------------------- // where external libraries are installed @@ -56,10 +57,10 @@ /// ExifTool // See comments above for REPOSITORY_DIR. This may need to be a fully qualified path. -EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.96 +EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-8.07 // Boost Thread -BOOST_VER = 1_40 +BOOST_VER = 1_41 BOOST_THREAD_LIB = libboost_thread // Hugin builder Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2010-01-21 22:18:43 UTC (rev 4925) @@ -20,9 +20,10 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for 1_41 # ------------------------------- -BOOST_VER="1_40" +BOOST_VER="1_41" # install headers Modified: hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-21 22:18:43 UTC (rev 4925) @@ -7,34 +7,44 @@ # 20100117.0 sg Update for glew 1.5.2 # 20100119.0 HvdW Add libiconv # 20100118.1 sg Fixed missing "" and named SVN directory for panotools libpano13-2.9.16 +# 20100121.0 sg Updated for newer packages: boost,jpeg,png,tiff,exiv2,lcms # ------------------------------- -cd /PATHTOHUGIN/mac/ExternalPrograms/scripts +cd /PATHTOHUGIN/hugin/mac/ExternalPrograms/scripts || exit 1 cat SetEnv.txt source SetEnv.txt pre="<<<<<<<<<<<<<<<<<<<< building" pst=">>>>>>>>>>>>>>>>>>>>" -echo "$pre boost $pst" && cd ../boost_1_40_0 && sh ../scripts/boost.sh -echo "$pre expat $pst" && cd ../expat-2.0.1 && sh ../scripts/libexpat.sh; -echo "$pre libiconv $pst" && cd ../libiconv-1.13.1 && sh ../scripts/libiconv.sh; -echo "$pre gettext $pst" && cd ../gettext-0.17 && sh ../scripts/gettext.sh -echo "$pre libjpeg-7 $pst" && cd ../jpeg-7 && sh ../scripts/libjpeg-7.sh; -echo "$pre libpng $pst" && cd ../libpng-1.2.38 && sh ../scripts/libpng.sh; -echo "$pre libtiff $pst" && cd ../tiff-3.8.2 && sh ../scripts/libtiff.sh; -echo "$pre wxmac $pst" && cd ../wxMac-2.8.10 && sh ../scripts/wxmac28.sh; -echo "$pre ilmbase $pst" && cd ../ilmbase-1.0.1 && sh ../scripts/ilmbase.sh; -echo "$pre openexr $pst" && cd ../openexr-1.6.1 && sh ../scripts/openexr16.sh; -echo "$pre libpano13 $pst" && cd ../libpano13-2.9.16 && sh ../scripts/pano13.sh; -echo "$pre libexiv2 $pst" && cd ../exiv2-0.18.2 && sh ../scripts/libexiv2.sh; -echo "$pre liblcms $pst" && cd ../lcms-1.17 && sh ../scripts/lcms.sh; -echo "$pre libxmi $pst" && cd ../libxmi-1.2 && sh ../scripts/libxmi.sh; -echo "$pre libglew $pst" && cd ../glew-1.5.2 && sh ../scripts/libglew.sh; -echo "$pre gnumake-119 $pst" && cd ../gnumake-119 && sh ../scripts/gnumake.sh; -echo "$pre enblend-enfuse $pst" && cd ../enblend-enfuse-4.0 && sh ../scripts/enblend.sh; -echo "$pre autopano-sift-C $pst" && cd ../autopano-sift-C && sh ../scripts/autopano-sift-C.sh; -echo "$pre panomatic $pst" && cd ../panomatic-0.9.4 && sh ../scripts/panomatic.sh; +# To start this script in the middle, uncomment the next 2 lines and move the "fi" line down as needed +#if [ -z "this will test will fail" ] ; then +#fi +echo "$pre boost $pst" && cd ../boost_1_41_0 || exit 1 && sh ../scripts/boost.sh +echo "$pre expat $pst" && cd ../expat-2.0.1 || exit 1 && sh ../scripts/libexpat.sh; +echo "$pre libiconv $pst" && cd ../libiconv-1.13.1 || exit 1 && sh ../scripts/libiconv.sh; +echo "$pre gettext $pst" && cd ../gettext-0.17 || exit 1 && sh ../scripts/gettext.sh +echo "$pre libjpeg-8 $pst" && cd ../jpeg-8 || exit 1 && sh ../scripts/libjpeg.sh; +echo "$pre libpng $pst" && cd ../libpng-1.2.42 || exit 1 && sh ../scripts/libpng.sh; +echo "$pre libtiff $pst" && cd ../tiff-3.9.2 || exit 1 && sh ../scripts/libtiff.sh; +echo "$pre wxmac $pst" && cd ../wxMac-2.8.10 || exit 1 && sh ../scripts/wxmac28.sh; +echo "$pre ilmbase $pst" && cd ../ilmbase-1.0.1 || exit 1 && sh ../scripts/ilmbase.sh; +echo "$pre openexr $pst" && cd ../openexr-1.6.1 || exit 1 && sh ../scripts/openexr16.sh; +echo "$pre libpano13 $pst" && cd ../libpano13-2.9.16 || exit 1 && sh ../scripts/pano13.sh; +echo "$pre libexiv2 $pst" && cd ../exiv2-0.19 || exit 1 && sh ../scripts/libexiv2.sh; +echo "$pre liblcms $pst" && cd ../lcms-1.19 || exit 1 && sh ../scripts/lcms.sh; +echo "$pre libxmi $pst" && cd ../libxmi-1.2 || exit 1 && sh ../scripts/libxmi.sh; +echo "$pre libglew $pst" && cd ../glew-1.5.2 || exit 1 && sh ../scripts/libglew.sh; +echo "$pre gnumake-119 $pst" && cd ../gnumake-119 || exit 1 && sh ../scripts/gnumake.sh; +# Correct funky name for the enblend-enfuse-4.0 directory +if [ ! -d ../enblend-enfuse-4.0 ] && [ -d ../enblend-enfuse-4.0-753b534c819d ] ; then + ln -s enblend-enfuse-4.0-753b534c819d ../enblend-enfuse-4.0 +fi +echo "$pre enblend-enfuse $pst" && cd ../enblend-enfuse-4.0 || exit 1 && sh ../scripts/enblend.sh; +# Following packages are optional. Uncomment if you are building them +#echo "$pre autopano-sift-C $pst" && cd ../autopano-sift-C && sh ../scripts/autopano-sift-C.sh; +#echo "$pre panomatic $pst" && cd ../panomatic-0.9.4 && sh ../scripts/panomatic.sh; + # Separate static libraries into their own directory. Needed to build static tools cd $REPOSITORYDIR Modified: hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2010-01-21 22:18:43 UTC (rev 4925) @@ -21,10 +21,14 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for 1.19 # ------------------------------- # init +LCMSVER_M="1" +LCMSVER_FULL="$LCMSVER_M.0.19" + let NUMARCH="0" for i in $ARCHS @@ -36,10 +40,6 @@ mkdir -p "$REPOSITORYDIR/lib"; mkdir -p "$REPOSITORYDIR/include"; -LCMSVER_M="1" -LCMSVER_FULL="$LCMSVER_M.0.16" - - # compile for ARCH in $ARCHS Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/ExternalPrograms/scripts/libexiv2.sh 2010-01-21 22:18:43 UTC (rev 4925) @@ -20,10 +20,14 @@ # ------------------------------- # 20091206.0 sg Script NOT tested but uses std boilerplate # 20100111.0 sg Script tested for building dylib +# 20100121.0 sg Script updated for 0.19 # ------------------------------- # init +EXIV2VER_M="6" +EXIV2VER_FULL="$EXIV2VER_M.3.1" + let NUMARCH="0" for i in $ARCHS @@ -35,10 +39,6 @@ mkdir -p "$REPOSITORYDIR/lib"; mkdir -p "$REPOSITORYDIR/include"; -EXIV2VER_M="5" -EXIV2VER_FULL="$EXIV2VER_M.3.1" - - # compile for ARCH in $ARCHS @@ -115,7 +115,7 @@ # merge libexiv2 -for liba in lib/libexiv2.a lib/libexiv2.$EXIV2VER_FULL.dylib +for liba in lib/libexiv2.a lib/libexiv2.$EXIV2VER_M.dylib do if [ $NUMARCH -eq 1 ] ; then @@ -151,11 +151,11 @@ done -if [ -f "$REPOSITORYDIR/lib/libexiv2.$EXIV2VER_FULL.dylib" ] +if [ -f "$REPOSITORYDIR/lib/libexiv2.$EXIV2VER_M.dylib" ] then - install_name_tool -id "$REPOSITORYDIR/lib/libexiv2.$EXIV2VER_FULL.dylib" "$REPOSITORYDIR/lib/libexiv2.$EXIV2VER_FULL.dylib" - ln -sfn libexiv2.$EXIV2VER_FULL.dylib $REPOSITORYDIR/lib/libexiv2.$EXIV2VER_M.dylib; - ln -sfn libexiv2.$EXIV2VER_FULL.dylib $REPOSITORYDIR/lib/libexiv2.dylib; + install_name_tool -id "$REPOSITORYDIR/lib/libexiv2.$EXIV2VER_M.dylib" "$REPOSITORYDIR/lib/libexiv2.$EXIV2VER_M.dylib" +# ln -sfn libexiv2.$EXIV2VER_FULL.dylib $REPOSITORYDIR/lib/libexiv2.$EXIV2VER_M.dylib; + ln -sfn libexiv2.$EXIV2VER_M.dylib $REPOSITORYDIR/lib/libexiv2.dylib; fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/ExternalPrograms/scripts/libjpeg.sh 2010-01-21 22:18:43 UTC (rev 4925) @@ -1,7 +1,7 @@ # ------------------ # libjpeg # ------------------ -# $Id: libjpeg.sh 1902 2007-02-04 22:27:47Z ippei $ +# $Id: libjpeg-7.sh 1902 2007-02-04 22:27:47Z ippei $ # Copyright (c) 2007, Ippei Ukai @@ -18,9 +18,12 @@ # OTHERARGs=""; # ------------------------------- -# 20091206.0 sg Script NOT tested but has std boilerplate +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for version 8 # ------------------------------- +JPEGLIBVER="8" + # init uname_release=$(uname -r) @@ -111,39 +114,25 @@ env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ - LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --disable-shared --enable-static; + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-shared --enable-static; make clean; - make - make install-lib; + make; + make install; - # the old config-make stuff do not create shared library well. Best do it by hand. - rm "libjpeg.62.0.0.dylib"; - $CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip \ - -dynamiclib -flat_namespace -undefined suppress \ - -lmx -shared-libgcc -current_version 62.0.0 -compatibility_version 62.0.0\ - -install_name "$REPOSITORYDIR/lib/libjpeg.62.dylib" -o libjpeg.62.0.0.dylib \ - jcomapi.o jutils.o jerror.o jmemmgr.o jmemnobs.o \ - jcapimin.o jcapistd.o jctrans.o jcparam.o jdatadst.o jcinit.o \ - jcmaster.o jcmarker.o jcmainct.o jcprepct.o jccoefct.o jccolor.o \ - jcsample.o jchuff.o jcphuff.o jcdctmgr.o jfdctfst.o jfdctflt.o \ - jfdctint.o \ - jdapimin.o jdapistd.o jdtrans.o jdatasrc.o jdmaster.o \ - jdinput.o jdmarker.o jdhuff.o jdphuff.o jdmainct.o jdcoefct.o \ - jdpostct.o jddctmgr.o jidctfst.o jidctflt.o jidctint.o jidctred.o \ - jdsample.o jdcolor.o jquant1.o jquant2.o jdmerge.o; - install "libjpeg.62.0.0.dylib" "$REPOSITORYDIR/arch/$ARCH/lib"; - done # merge libjpeg -for liba in lib/libjpeg.a lib/libjpeg.62.0.0.dylib +for liba in lib/libjpeg.a lib/libjpeg.$JPEGLIBVER.dylib do if [ $NUMARCH -eq 1 ] ; then @@ -173,14 +162,12 @@ done lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - done -if [ -f "$REPOSITORYDIR/lib/libjpeg.62.0.0.dylib" ] -then - ln -sfn "libjpeg.62.0.0.dylib" "$REPOSITORYDIR/lib/libjpeg.62.dylib"; - ln -sfn "libjpeg.62.0.0.dylib" "$REPOSITORYDIR/lib/libjpeg.dylib"; +if [ -f "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib" ] ; then + install_name_tool \ + -id "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib" \ + "$REPOSITORYDIR/lib/libjpeg.$JPEGLIBVER.dylib"; + ln -sfn "libjpeg.$JPEGLIBVER.dylib" "$REPOSITORYDIR/lib/libjpeg.dylib"; fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2010-01-21 22:18:43 UTC (rev 4925) @@ -20,9 +20,16 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for 1.2.40 # ------------------------------- -PNGVER="1.2.38" +#libraries created: +# libpng.3.1.2.42 <- (libpng.3, libpng) +# libpng12.12.1.2.42 <- (libpng12.12, libpng12) +# libpng12.a <- libpng.a +PNGVER_M="12" +PNGVER="1.2.42" +PNGVER_FULL="$PNGVER_M.1.2.42" # init @@ -39,12 +46,12 @@ # patch # pngconf.h -if [ -f pngconf-bk.h ] -then - mv -f pngconf-bk.h pngconf.h -fi -cp pngconf.h pngconf-bk.h -patch < ../scripts/pngconf_h.patch +#if [ -f pngconf-bk.h ] +#then +# mv -f pngconf-bk.h pngconf.h +#fi +#cp pngconf.h pngconf-bk.h +#patch < ../scripts/pngconf_h.patch # compile @@ -91,24 +98,26 @@ # makefile.darwin # includes hack for libpng bug #2009836 -if [ -n $CC ] -then - sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ - -e "s/CC=.*/CC=$CC/" \ - -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ - -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ - -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ - -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ - scripts/makefile.darwin > makefile; -else - sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ - -e 's/CC=cc/CC=gcc/' \ - -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ - -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ - -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ - -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ - scripts/makefile.darwin > makefile; -fi +sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ + scripts/makefile.darwin > makefile; +#if [ -n $CC ] +#then +# sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ +# -e "s/CC=.*/CC=$CC/" \ +# -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ +# -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ +# -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ +# -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ +# scripts/makefile.darwin > makefile; +#else +# sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ +# -e 's/CC=cc/CC=gcc/' \ +# -e 's/compatibility_version \$(SONUM)/compatibility_version 1.2.0/g' \ +# -e 's/current_version \$(SONUM)/current_version \$(PNGMIN)/g' \ +# -e 's/compatibility_version %OLDSONUM%/compatibility_version 3.0.0/g' \ +# -e 's/current_version %OLDSONUM%/current_version 3.0.0/g' \ +# scripts/makefile.darwin > makefile; +#fi make clean; make $OTHERMAKEARGs install-static install-shared \ @@ -119,7 +128,7 @@ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ OBJCFLAGS="-arch $ARCH" \ OBJCXXFLAGS="-arch $ARCH" \ - LDFLAGS="-L$REPOSITORYDIR/lib -L. -L$ZLIBLIB -lpng12 -lz -mmacosx-version-min=$OSVERSION" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L. -L$ZLIBLIB -lpng$PNGVER_M -lz -mmacosx-version-min=$OSVERSION" \ NEXT_ROOT="$MACSDKDIR" \ LIBPATH="$REPOSITORYDIR/arch/$ARCH/lib" \ BINPATH="$REPOSITORYDIR/arch/$ARCH/bin" \ @@ -129,7 +138,7 @@ # merge libpng -for liba in lib/libpng12.a lib/libpng12.12.$PNGVER.dylib lib/libpng.3.$PNGVER.dylib +for liba in lib/libpng$PNGVER_M.a lib/libpng$PNGVER_M.$PNGVER_FULL.dylib lib/libpng.3.$PNGVER.dylib do if [ $NUMARCH -eq 1 ] ; then @@ -164,14 +173,19 @@ done -if [ -f "$REPOSITORYDIR/lib/libpng12.a" ] ; then - ln -sfn libpng12.a $REPOSITORYDIR/lib/libpng.a; +if [ -f "$REPOSITORYDIR/lib/libpng$PNGVER_M.a" ] ; then + ln -sfn libpng$PNGVER_M.a $REPOSITORYDIR/lib/libpng.a; fi -if [ -f "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" ] ; then - install_name_tool -id "$REPOSITORYDIR/lib/libpng12.1.dylib" "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" - ln -sfn libpng12.12.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.12.dylib; - ln -sfn libpng12.12.dylib $REPOSITORYDIR/lib/libpng12.dylib; +if [ -f "$REPOSITORYDIR/lib/libpng$PNGVER_M.$PNGVER_FULL.dylib" ] ; then + install_name_tool -id "$REPOSITORYDIR/lib/libpng$PNGVER_M.$PNGVER_FULL.dylib" "$REPOSITORYDIR/lib/libpng$PNGVER_M.$PNGVER_FULL.dylib" + ln -sfn libpng$PNGVER_M.$PNGVER_FULL.dylib $REPOSITORYDIR/lib/libpng$PNGVER_M.$PNGVER_M.dylib; + ln -sfn libpng$PNGVER_M.$PNGVER_FULL.dylib $REPOSITORYDIR/lib/libpng$PNGVER_M.dylib; fi +if [ -f "$REPOSITORYDIR/lib/libpng.$PNGVER_FULL.dylib" ] ; then + install_name_tool -id "$REPOSITORYDIR/lib/libpng.$PNGVER_FULL.dylib" "$REPOSITORYDIR/lib/libpng.$PNGVER_FULL.dylib" + ln -sfn libpng.$PNGVER_FULL.dylib $REPOSITORYDIR/lib/libpng.$PNGVER_M.dylib; + ln -sfn libpng.$PNGVER_FULL.dylib $REPOSITORYDIR/lib/libpng.dylib; +fi if [ -f "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ] ; then install_name_tool -id "$REPOSITORYDIR/lib/libpng.3.dylib" "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ln -sfn libpng.3.$PNGVER.dylib $REPOSITORYDIR/lib/libpng.3.dylib; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2010-01-21 19:00:35 UTC (rev 4924) +++ hugin/trunk/mac/ExternalPrograms/scripts/libtiff.sh 2010-01-21 22:18:43 UTC (rev 4925) @@ -20,6 +20,7 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for 3.9.2 # ------------------------------- uname_release=$(uname -r) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ski...@us...> - 2010-01-21 23:52:59
|
Revision: 4926 http://hugin.svn.sourceforge.net/hugin/?rev=4926&view=rev Author: skipgaede Date: 2010-01-21 23:52:46 +0000 (Thu, 21 Jan 2010) Log Message: ----------- [OSX] Reverted back to older version (1.40) of boost Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2010-01-21 22:18:43 UTC (rev 4925) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2010-01-21 23:52:46 UTC (rev 4926) @@ -4,6 +4,7 @@ // 20091208.0 sg Added gettext version, needed for libraries with embedded hyphen in name // Added documentation about when absolute pathspecs are needed // 20100121.0 sg Updated boost and exif-tool versions +// 20100121.1 sg Backed out boost 1_41 //---------------------------------- // where external libraries are installed @@ -60,7 +61,7 @@ EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-8.07 // Boost Thread -BOOST_VER = 1_41 +BOOST_VER = 1_40 BOOST_THREAD_LIB = libboost_thread // Hugin builder Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2010-01-21 22:18:43 UTC (rev 4925) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2010-01-21 23:52:46 UTC (rev 4926) @@ -21,9 +21,10 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100121.0 sg Script updated for 1_41 +# 20100121.1 sg Script reverted to 1_40 # ------------------------------- -BOOST_VER="1_41" +BOOST_VER="1_40" # install headers Modified: hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-21 22:18:43 UTC (rev 4925) +++ hugin/trunk/mac/ExternalPrograms/scripts/build-all.sh 2010-01-21 23:52:46 UTC (rev 4926) @@ -8,6 +8,7 @@ # 20100119.0 HvdW Add libiconv # 20100118.1 sg Fixed missing "" and named SVN directory for panotools libpano13-2.9.16 # 20100121.0 sg Updated for newer packages: boost,jpeg,png,tiff,exiv2,lcms +# 20100121.1 sg Backed out new version of boost # ------------------------------- cd /PATHTOHUGIN/hugin/mac/ExternalPrograms/scripts || exit 1 @@ -19,7 +20,7 @@ # To start this script in the middle, uncomment the next 2 lines and move the "fi" line down as needed #if [ -z "this will test will fail" ] ; then #fi -echo "$pre boost $pst" && cd ../boost_1_41_0 || exit 1 && sh ../scripts/boost.sh +echo "$pre boost $pst" && cd ../boost_1_40_0 || exit 1 && sh ../scripts/boost.sh echo "$pre expat $pst" && cd ../expat-2.0.1 || exit 1 && sh ../scripts/libexpat.sh; echo "$pre libiconv $pst" && cd ../libiconv-1.13.1 || exit 1 && sh ../scripts/libiconv.sh; echo "$pre gettext $pst" && cd ../gettext-0.17 || exit 1 && sh ../scripts/gettext.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-02-14 13:15:50
|
Revision: 4976 http://hugin.svn.sourceforge.net/hugin/?rev=4976&view=rev Author: harryvanderwolf Date: 2010-02-14 13:15:41 +0000 (Sun, 14 Feb 2010) Log Message: ----------- [OSX] update XCode project: set project optimalization to -O3, add target "Hugin with tools" Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/complete-bundle.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-02-14 13:14:01 UTC (rev 4975) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-02-14 13:15:41 UTC (rev 4976) @@ -975,8 +975,109 @@ 7377C7441064212B002EF919 /* CleanCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24BB11061592C00B8A25D /* CleanCP.cpp */; }; 7377C755106422F8002EF919 /* cpclean in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; }; 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; + 737E92341125ED3000773356 /* keypoints in Resources */ = {isa = PBXBuildFile; fileRef = 737E922F1125ED1900773356 /* keypoints */; }; + 737E92351125ED3000773356 /* patfree-panomatic in Resources */ = {isa = PBXBuildFile; fileRef = 737E92301125ED1900773356 /* patfree-panomatic */; }; + 737E923C1125FE0E00773356 /* exiv2 in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 737E923B1125FE0100773356 /* exiv2 */; }; 7388EAFD0F6BFB1B001E08FA /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; }; 738C044B10A0A5D90061D144 /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738C044910A0A5D90061D144 /* AboutDialog.cpp */; }; + 7391937F1119FC73007D96F4 /* CleanCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24BB11061592C00B8A25D /* CleanCP.cpp */; }; + 739193801119FC73007D96F4 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331010C4A8859006AA781 /* AssistantPanel.cpp */; }; + 739193811119FC73007D96F4 /* AutoCtrlPointCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */; }; + 739193821119FC73007D96F4 /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331120C4A8859006AA781 /* CommandHistory.cpp */; }; + 739193831119FC73007D96F4 /* CPEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */; }; + 739193841119FC73007D96F4 /* CPImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3310C0C4A8859006AA781 /* CPImageCtrl.cpp */; }; + 739193851119FC73007D96F4 /* CPListFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3310E0C4A8859006AA781 /* CPListFrame.cpp */; }; + 739193861119FC73007D96F4 /* CropPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331140C4A8859006AA781 /* CropPanel.cpp */; }; + 739193871119FC73007D96F4 /* HFOVDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331160C4A8859006AA781 /* HFOVDialog.cpp */; }; + 739193881119FC73007D96F4 /* huginApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3314F0C4A8859006AA781 /* huginApp.cpp */; }; + 739193891119FC73007D96F4 /* ImagesList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311B0C4A8859006AA781 /* ImagesList.cpp */; }; + 7391938A1119FC73007D96F4 /* ImagesPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311D0C4A8859006AA781 /* ImagesPanel.cpp */; }; + 7391938B1119FC73007D96F4 /* LensPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311F0C4A8859006AA781 /* LensPanel.cpp */; }; + 7391938C1119FC73007D96F4 /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331210C4A8859006AA781 /* LocalizedFileTipProvider.cpp */; }; + 7391938D1119FC73007D96F4 /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331230C4A8859006AA781 /* MainFrame.cpp */; }; + 7391938E1119FC73007D96F4 /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */; }; + 7391938F1119FC73007D96F4 /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312E0C4A8859006AA781 /* OptimizePhotometricPanel.cpp */; }; + 739193901119FC73007D96F4 /* PanoDruid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331340C4A8859006AA781 /* PanoDruid.cpp */; }; + 739193911119FC73007D96F4 /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331360C4A8859006AA781 /* PanoPanel.cpp */; }; + 739193921119FC73007D96F4 /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */; }; + 739193931119FC73007D96F4 /* PreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313C0C4A8859006AA781 /* PreviewFrame.cpp */; }; + 739193941119FC73007D96F4 /* PreviewPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313E0C4A8859006AA781 /* PreviewPanel.cpp */; }; + 739193951119FC73007D96F4 /* TextKillFocusHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331430C4A8859006AA781 /* TextKillFocusHandler.cpp */; }; + 739193961119FC73007D96F4 /* wxPanoCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3316A0C4A8859006AA781 /* wxPanoCommand.cpp */; }; + 739193971119FC73007D96F4 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */; }; + 739193981119FC73007D96F4 /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */; }; + 739193991119FC73007D96F4 /* GLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3B0EB3A20500CD7122 /* GLRenderer.cpp */; }; + 7391939A1119FC73007D96F4 /* GLViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3D0EB3A20500CD7122 /* GLViewer.cpp */; }; + 7391939B1119FC73007D96F4 /* MeshManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3F0EB3A20500CD7122 /* MeshManager.cpp */; }; + 7391939C1119FC73007D96F4 /* MeshRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA410EB3A20500CD7122 /* MeshRemapper.cpp */; }; + 7391939D1119FC73007D96F4 /* OutputProjectionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA430EB3A20500CD7122 /* OutputProjectionInfo.cpp */; }; + 7391939E1119FC73007D96F4 /* PreviewCropTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA450EB3A20500CD7122 /* PreviewCropTool.cpp */; }; + 7391939F1119FC73007D96F4 /* PreviewDifferenceTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA470EB3A20500CD7122 /* PreviewDifferenceTool.cpp */; }; + 739193A01119FC73007D96F4 /* PreviewDragTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA490EB3A20500CD7122 /* PreviewDragTool.cpp */; }; + 739193A11119FC73007D96F4 /* PreviewIdentifyTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4B0EB3A20500CD7122 /* PreviewIdentifyTool.cpp */; }; + 739193A21119FC73007D96F4 /* PreviewPanoMaskTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4D0EB3A20500CD7122 /* PreviewPanoMaskTool.cpp */; }; + 739193A31119FC73007D96F4 /* PreviewTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4F0EB3A20500CD7122 /* PreviewTool.cpp */; }; + 739193A41119FC73007D96F4 /* PreviewToolHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA510EB3A20500CD7122 /* PreviewToolHelper.cpp */; }; + 739193A51119FC73007D96F4 /* TexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA530EB3A20500CD7122 /* TexCoordRemapper.cpp */; }; + 739193A61119FC73007D96F4 /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA550EB3A20500CD7122 /* TextureManager.cpp */; }; + 739193A71119FC73007D96F4 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; }; + 739193A81119FC73007D96F4 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; }; + 739193A91119FC73007D96F4 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; }; + 739193AA1119FC73007D96F4 /* CPImagesComboBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57D5093A0F5942F200CCDCB5 /* CPImagesComboBox.cpp */; }; + 739193AB1119FC73007D96F4 /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; }; + 739193AC1119FC73007D96F4 /* CPDetectorConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FD5825101B3E7B0065B9E9 /* CPDetectorConfig.cpp */; }; + 739193AD1119FC73007D96F4 /* PreviewControlPointTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73C0DC6B104715E500CB55B7 /* PreviewControlPointTool.cpp */; }; + 739193AE1119FC73007D96F4 /* GreatCircles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73C0DC6E104715E500CB55B7 /* GreatCircles.cpp */; }; + 739193AF1119FC73007D96F4 /* HDRMergeOptionDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73411F131077B205001831AF /* HDRMergeOptionDialog.cpp */; }; + 739193B01119FC73007D96F4 /* NumTransDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7368E4631083ABF200519ED0 /* NumTransDialog.cpp */; }; + 739193B11119FC73007D96F4 /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738C044910A0A5D90061D144 /* AboutDialog.cpp */; }; + 739193B21119FC73007D96F4 /* LayoutRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 732927AB10E4C15700D3C8CB /* LayoutRemapper.cpp */; }; + 739193B31119FC73007D96F4 /* PreviewLayoutLinesTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 732927AD10E4C15700D3C8CB /* PreviewLayoutLinesTool.cpp */; }; + 739193B51119FC73007D96F4 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; + 739193B61119FC73007D96F4 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; }; + 739193B71119FC73007D96F4 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 739193B81119FC73007D96F4 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; + 739193B91119FC73007D96F4 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 739193BA1119FC73007D96F4 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; + 739193BB1119FC73007D96F4 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 739193BC1119FC73007D96F4 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 739193BD1119FC73007D96F4 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 739193BE1119FC73007D96F4 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 739193BF1119FC73007D96F4 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; + 739193C01119FC73007D96F4 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 739193C11119FC73007D96F4 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 739193C21119FC73007D96F4 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 739193C31119FC73007D96F4 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 739193C41119FC73007D96F4 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 739193C51119FC73007D96F4 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 739193C61119FC73007D96F4 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 739193C71119FC73007D96F4 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739193C81119FC73007D96F4 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739193C91119FC73007D96F4 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 739193CA1119FC73007D96F4 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; }; + 739193CB1119FC73007D96F4 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; + 739193CC1119FC73007D96F4 /* libhugin_celeste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */; }; + 739193CD1119FC73007D96F4 /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E864E2C510CE8437007AC6E4 /* liblcms.dylib */; }; + 739193CE1119FC73007D96F4 /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98410FB69FC00839DF3 /* libGLEW.dylib */; }; + 739193CF1119FC73007D96F4 /* libexiv2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98310FB69FC00839DF3 /* libexiv2.dylib */; }; + 739193D11119FC73007D96F4 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739193D21119FC73007D96F4 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739193D31119FC73007D96F4 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 739193D51119FC73007D96F4 /* align_image_stack in Resources */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; }; + 739193D61119FC73007D96F4 /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 57114EA006BC2301004F4FA7 /* Hugin.icns */; }; + 739193D71119FC73007D96F4 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5702996D07F967CB00F1FF15 /* HuginFiles.icns */; }; + 739193D81119FC73007D96F4 /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 5769F6300D23825700A6AD01 /* HuginStitchProject.app */; }; + 73919407111A058E007D96F4 /* autooptimiser in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */; }; + 73919408111A058E007D96F4 /* calibrate_lens in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 73C153681052E6DE00AE93C1 /* calibrate_lens */; }; + 73919409111A058E007D96F4 /* celeste_standalone in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; }; + 7391940A111A058E007D96F4 /* cpclean in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; }; + 7391940B111A058E007D96F4 /* deghosting_mask in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 7364217010763A22000121C5 /* deghosting_mask */; }; + 7391940C111A058E007D96F4 /* fulla in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9B310FB6F5A00839DF3 /* fulla */; }; + 7391940D111A058E007D96F4 /* matchpoint in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 7332AEAE0D8D4986002BF5FF /* matchpoint */; }; + 7391940E111A058E007D96F4 /* pano_trafo in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9B710FB6F5A00839DF3 /* pano_trafo */; }; + 7391940F111A058E007D96F4 /* pto2mk in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9BA10FB6F5A00839DF3 /* pto2mk */; }; + 73919410111A058E007D96F4 /* tca_correct in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9BE10FB6F5B00839DF3 /* tca_correct */; }; + 73919411111A058E007D96F4 /* vig_optimize in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9C210FB6F5B00839DF3 /* vig_optimize */; }; 739A0C1210FA524E00D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 739A0C1310FA524E00D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; 739A0C1410FA524E00D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; @@ -1151,6 +1252,10 @@ 73D24B8E1061561400B8A25D /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; 73D24B9B1061566B00B8A25D /* cpclean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24B9A1061566B00B8A25D /* cpclean.cpp */; }; 73D24BB9106159BA00B8A25D /* CleanCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24BB11061592C00B8A25D /* CleanCP.cpp */; }; + 73D6DF281108C0280099986A /* ImageTransformsGPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73C0DAD71046E9B000CB55B7 /* ImageTransformsGPU.cpp */; }; + 73D6DF291108C0660099986A /* auto_file.hxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0206BC2301004F4FA7 /* auto_file.hxx */; }; + 73D6DF2A1108C0660099986A /* diff2d.hxx in Sources */ = {isa = PBXBuildFile; fileRef = 573F32C009F79B730088B333 /* diff2d.hxx */; }; + 73D6DF2B1108C0660099986A /* error.hxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0906BC2301004F4FA7 /* error.hxx */; }; 73E488F910D5997300A083C8 /* CalculateOptimalROI.h in Headers */ = {isa = PBXBuildFile; fileRef = 73E488F710D5997300A083C8 /* CalculateOptimalROI.h */; }; 73E488FA10D5997300A083C8 /* CalculateOptimalROI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73E488F810D5997300A083C8 /* CalculateOptimalROI.cpp */; }; 73E488FB10D5997300A083C8 /* CalculateOptimalROI.h in Headers */ = {isa = PBXBuildFile; fileRef = 73E488F710D5997300A083C8 /* CalculateOptimalROI.h */; }; @@ -2030,6 +2135,48 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; + 739193771119FC73007D96F4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FC280D24A26400A6AD01; + remoteInfo = frameworks; + }; + 739193791119FC73007D96F4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5; + remoteInfo = celeste; + }; + 7391937B1119FC73007D96F4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769F5FF0D23825700A6AD01; + remoteInfo = StitchProject; + }; + 7391937D1119FC73007D96F4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 73E79F0C0D674EAC00C07126; + remoteInfo = "align_image_stack dynamic"; + }; + 739193EC1119FD60007D96F4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571046810D25F698006A3C69; + remoteInfo = "bundled tools"; + }; + 739193F11119FD77007D96F4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57D382C50E2369D000445A37; + remoteInfo = "tools - other dynamic"; + }; 739A0BED10FA4A5600D8E4C7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -2411,6 +2558,41 @@ name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + 739193D01119FC73007D96F4 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 739193D11119FC73007D96F4 /* HuginVigraImpex.framework in Copy Frameworks */, + 739193D21119FC73007D96F4 /* HuginBase.framework in Copy Frameworks */, + 739193D31119FC73007D96F4 /* HuginBaseWx.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + 73CC46C2111C86570080B322 /* Copy Extra tools into bundle */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 6; + files = ( + 73919407111A058E007D96F4 /* autooptimiser in Copy Extra tools into bundle */, + 73919408111A058E007D96F4 /* calibrate_lens in Copy Extra tools into bundle */, + 73919409111A058E007D96F4 /* celeste_standalone in Copy Extra tools into bundle */, + 7391940A111A058E007D96F4 /* cpclean in Copy Extra tools into bundle */, + 7391940B111A058E007D96F4 /* deghosting_mask in Copy Extra tools into bundle */, + 737E923C1125FE0E00773356 /* exiv2 in Copy Extra tools into bundle */, + 7391940C111A058E007D96F4 /* fulla in Copy Extra tools into bundle */, + 7391940D111A058E007D96F4 /* matchpoint in Copy Extra tools into bundle */, + 7391940E111A058E007D96F4 /* pano_trafo in Copy Extra tools into bundle */, + 7391940F111A058E007D96F4 /* pto2mk in Copy Extra tools into bundle */, + 73919410111A058E007D96F4 /* tca_correct in Copy Extra tools into bundle */, + 73919411111A058E007D96F4 /* vig_optimize in Copy Extra tools into bundle */, + ); + name = "Copy Extra tools into bundle"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -3070,10 +3252,16 @@ 7368E4631083ABF200519ED0 /* NumTransDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumTransDialog.cpp; sourceTree = "<group>"; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; 737E1C180EC9EC0300BA4D9B /* hugin_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_config.h; sourceTree = "<group>"; }; + 737E922D1125EC5F00773356 /* liblocalfeatures.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblocalfeatures.dylib; path = ../../ExternalPrograms/repository/lib/liblocalfeatures.dylib; sourceTree = SOURCE_ROOT; }; + 737E922F1125ED1900773356 /* keypoints */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = keypoints; path = ../../ExternalPrograms/repository/bin/keypoints; sourceTree = SOURCE_ROOT; }; + 737E92301125ED1900773356 /* patfree-panomatic */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "patfree-panomatic"; path = "../../ExternalPrograms/repository/bin/patfree-panomatic"; sourceTree = SOURCE_ROOT; }; + 737E923B1125FE0100773356 /* exiv2 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = exiv2; path = ../../ExternalPrograms/repository/bin/exiv2; sourceTree = SOURCE_ROOT; }; 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResetDialog.cpp; sourceTree = "<group>"; }; 7388EAFC0F6BFB1B001E08FA /* ResetDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetDialog.h; sourceTree = "<group>"; }; 738C044910A0A5D90061D144 /* AboutDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AboutDialog.cpp; sourceTree = "<group>"; }; 738C044A10A0A5D90061D144 /* AboutDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutDialog.h; sourceTree = "<group>"; }; + 739193E21119FC73007D96F4 /* Hugin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hugin.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 739193E81119FC73007D96F4 /* Hugin-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Hugin-Info copy.plist"; path = "../mac/Hugin-Info copy.plist"; sourceTree = "<group>"; }; 739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "complete-tools-package.sh"; sourceTree = "<group>"; }; 739A0DE710FA602200D8E4C7 /* pto2mk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pto2mk.cpp; sourceTree = "<group>"; }; 739A0EA410FA7A3100D8E4C7 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = "<group>"; }; @@ -3707,6 +3895,40 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739193B41119FC73007D96F4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 739193B51119FC73007D96F4 /* Carbon.framework in Frameworks */, + 739193B61119FC73007D96F4 /* libpthread.dylib in Frameworks */, + 739193B71119FC73007D96F4 /* libiconv.dylib in Frameworks */, + 739193B81119FC73007D96F4 /* libintl.dylib in Frameworks */, + 739193B91119FC73007D96F4 /* libz.dylib in Frameworks */, + 739193BA1119FC73007D96F4 /* libmx.dylib in Frameworks */, + 739193BB1119FC73007D96F4 /* libpano13.dylib in Frameworks */, + 739193BC1119FC73007D96F4 /* libpng.dylib in Frameworks */, + 739193BD1119FC73007D96F4 /* libtiff.dylib in Frameworks */, + 739193BE1119FC73007D96F4 /* libjpeg.dylib in Frameworks */, + 739193BF1119FC73007D96F4 /* libwx_macu-2.8.dylib in Frameworks */, + 739193C01119FC73007D96F4 /* libIex.dylib in Frameworks */, + 739193C11119FC73007D96F4 /* libIlmImf.dylib in Frameworks */, + 739193C21119FC73007D96F4 /* libIlmThread.dylib in Frameworks */, + 739193C31119FC73007D96F4 /* libImath.dylib in Frameworks */, + 739193C41119FC73007D96F4 /* libHalf.dylib in Frameworks */, + 739193C51119FC73007D96F4 /* libboost_thread.dylib in Frameworks */, + 739193C61119FC73007D96F4 /* libexpat.dylib in Frameworks */, + 739193C71119FC73007D96F4 /* HuginVigraImpex.framework in Frameworks */, + 739193C81119FC73007D96F4 /* HuginBase.framework in Frameworks */, + 739193C91119FC73007D96F4 /* HuginBaseWx.framework in Frameworks */, + 739193CA1119FC73007D96F4 /* OpenGL.framework in Frameworks */, + 739193CB1119FC73007D96F4 /* libwx_macu_gl-2.8.dylib in Frameworks */, + 739193CC1119FC73007D96F4 /* libhugin_celeste.a in Frameworks */, + 739193CD1119FC73007D96F4 /* liblcms.dylib in Frameworks */, + 739193CE1119FC73007D96F4 /* libGLEW.dylib in Frameworks */, + 739193CF1119FC73007D96F4 /* libexiv2.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 739A0C1110FA524E00D8E4C7 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3987,6 +4209,7 @@ 57DD345E0F5939D80030B958 /* celeste-Info.plist */, 576900AB0D24D29300A6AD01 /* hugin_base-Info.plist */, 576900E20D24D32C00A6AD01 /* base_wx-Info.plist */, + 739193E81119FC73007D96F4 /* Hugin-Info copy.plist */, ); path = mac; sourceTree = "<group>"; @@ -4289,6 +4512,10 @@ 5745FBE5094E1C4700E6B672 /* repository */ = { isa = PBXGroup; children = ( + 737E923B1125FE0100773356 /* exiv2 */, + 737E922F1125ED1900773356 /* keypoints */, + 737E92301125ED1900773356 /* patfree-panomatic */, + 737E922D1125EC5F00773356 /* liblocalfeatures.dylib */, 57989581068E2FD7009F90BF /* libiconv.dylib */, 570898E30D4CB635008949E7 /* gnumake */, 5769F7A10D239D6A00A6AD01 /* PTmender */, @@ -5105,6 +5332,7 @@ 574B81880E4198FE00644179 /* hugin */, 5745FC05094E1D5400E6B672 /* External */, 573B8F3E067BA2EB00B7B355 /* Product */, + 739193E21119FC73007D96F4 /* Hugin.app */, ); sourceTree = "<group>"; }; @@ -6443,6 +6671,36 @@ productReference = 7364217010763A22000121C5 /* deghosting_mask */; productType = "com.apple.product-type.tool"; }; + 739193751119FC73007D96F4 /* Hugin with tools */ = { + isa = PBXNativeTarget; + buildConfigurationList = 739193DE1119FC73007D96F4 /* Build configuration list for PBXNativeTarget "Hugin with tools" */; + buildPhases = ( + 7391937E1119FC73007D96F4 /* Sources */, + 739193B41119FC73007D96F4 /* Frameworks */, + 739193D01119FC73007D96F4 /* Copy Frameworks */, + 739193D41119FC73007D96F4 /* Resources */, + 73CC46C2111C86570080B322 /* Copy Extra tools into bundle */, + 739193D91119FC73007D96F4 /* Patch and Copy XRC */, + 739193DA1119FC73007D96F4 /* Locale Script */, + 739193DB1119FC73007D96F4 /* Localise Help */, + 739193DC1119FC73007D96F4 /* Complete Bundle */, + 739193DD1119FC73007D96F4 /* Complete Embedding */, + ); + buildRules = ( + ); + dependencies = ( + 739193761119FC73007D96F4 /* PBXTargetDependency */, + 739193781119FC73007D96F4 /* PBXTargetDependency */, + 7391937A1119FC73007D96F4 /* PBXTargetDependency */, + 7391937C1119FC73007D96F4 /* PBXTargetDependency */, + 739193ED1119FD60007D96F4 /* PBXTargetDependency */, + 739193F21119FD77007D96F4 /* PBXTargetDependency */, + ); + name = "Hugin with tools"; + productName = Hugin; + productReference = 739193E21119FC73007D96F4 /* Hugin.app */; + productType = "com.apple.product-type.application"; + }; 739A0C0910FA524E00D8E4C7 /* fulla dynamic */ = { isa = PBXNativeTarget; buildConfigurationList = 739A0C2010FA524E00D8E4C7 /* Build configuration list for PBXNativeTarget "fulla dynamic" */; @@ -6716,6 +6974,7 @@ 57E347300C4A8EDF006AA781 /* Apps */, 5769F5FF0D23825700A6AD01 /* StitchProject */, 57E3467D0C4A89B0006AA781 /* Hugin */, + 739193751119FC73007D96F4 /* Hugin with tools */, 57525A240C54BC4400BF8096 /* Nona */, 57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */, 57E347330C4A8EED006AA781 /* tools */, @@ -6845,6 +7104,19 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739193D41119FC73007D96F4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 737E92341125ED3000773356 /* keypoints in Resources */, + 737E92351125ED3000773356 /* patfree-panomatic in Resources */, + 739193D51119FC73007D96F4 /* align_image_stack in Resources */, + 739193D61119FC73007D96F4 /* Hugin.icns in Resources */, + 739193D71119FC73007D96F4 /* HuginFiles.icns in Resources */, + 739193D81119FC73007D96F4 /* HuginStitchProject.app in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -7114,6 +7386,80 @@ shellPath = /bin/sh; shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/\\${DISPLAY_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/\\${HUGIN_BUILDER}/$HUGIN_BUILDER/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; }; + 739193D91119FC73007D96F4 /* Patch and Copy XRC */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Patch and Copy XRC"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/patch-xrc.sh\nfi"; + }; + 739193DA1119FC73007D96F4 /* Locale Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Locale Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localised.sh\nfi"; + showEnvVarsInLog = 0; + }; + 739193DB1119FC73007D96F4 /* Localise Help */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Localise Help"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localise-help.sh\nfi"; + showEnvVarsInLog = 0; + }; + 739193DC1119FC73007D96F4 /* Complete Bundle */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete Bundle"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi"; + showEnvVarsInLog = 0; + }; + 739193DD1119FC73007D96F4 /* Complete Embedding */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete Embedding"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-embed.sh\nfi"; + showEnvVarsInLog = 0; + }; 739A0D4A10FA59E000D8E4C7 /* Complete tools package */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -7143,11 +7489,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 73D6DF291108C0660099986A /* auto_file.hxx in Sources */, + 73D6DF2A1108C0660099986A /* diff2d.hxx in Sources */, + 73D6DF2B1108C0660099986A /* error.hxx in Sources */, 571152F806BC6E4C004F4FA7 /* bmp.cxx in Sources */, 571152F906BC6E58004F4FA7 /* byteorder.cxx in Sources */, 571152FE06BC6E8E004F4FA7 /* codecmanager.cxx in Sources */, 57CBEE2C06BC713500C43FF5 /* gif.cxx in Sources */, 57CBEE2D06BC713C00C43FF5 /* imageinfo.cxx in Sources */, + 73D6DF281108C0280099986A /* ImageTransformsGPU.cpp in Sources */, 57CBEE2E06BC713F00C43FF5 /* jpeg.cxx in Sources */, 57CBEE2F06BC714900C43FF5 /* png.cxx in Sources */, 57CBEE3006BC714F00C43FF5 /* pnm.cxx in Sources */, @@ -7626,6 +7976,66 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7391937E1119FC73007D96F4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7391937F1119FC73007D96F4 /* CleanCP.cpp in Sources */, + 739193801119FC73007D96F4 /* AssistantPanel.cpp in Sources */, + 739193811119FC73007D96F4 /* AutoCtrlPointCreator.cpp in Sources */, + 739193821119FC73007D96F4 /* CommandHistory.cpp in Sources */, + 739193831119FC73007D96F4 /* CPEditorPanel.cpp in Sources */, + 739193841119FC73007D96F4 /* CPImageCtrl.cpp in Sources */, + 739193851119FC73007D96F4 /* CPListFrame.cpp in Sources */, + 739193861119FC73007D96F4 /* CropPanel.cpp in Sources */, + 739193871119FC73007D96F4 /* HFOVDialog.cpp in Sources */, + 739193881119FC73007D96F4 /* huginApp.cpp in Sources */, + 739193891119FC73007D96F4 /* ImagesList.cpp in Sources */, + 7391938A1119FC73007D96F4 /* ImagesPanel.cpp in Sources */, + 7391938B1119FC73007D96F4 /* LensPanel.cpp in Sources */, + 7391938C1119FC73007D96F4 /* LocalizedFileTipProvider.cpp in Sources */, + 7391938D1119FC73007D96F4 /* MainFrame.cpp in Sources */, + 7391938E1119FC73007D96F4 /* OptimizePanel.cpp in Sources */, + 7391938F1119FC73007D96F4 /* OptimizePhotometricPanel.cpp in Sources */, + 739193901119FC73007D96F4 /* PanoDruid.cpp in Sources */, + 739193911119FC73007D96F4 /* PanoPanel.cpp in Sources */, + 739193921119FC73007D96F4 /* PreferencesDialog.cpp in Sources */, + 739193931119FC73007D96F4 /* PreviewFrame.cpp in Sources */, + 739193941119FC73007D96F4 /* PreviewPanel.cpp in Sources */, + 739193951119FC73007D96F4 /* TextKillFocusHandler.cpp in Sources */, + 739193961119FC73007D96F4 /* wxPanoCommand.cpp in Sources */, + 739193971119FC73007D96F4 /* ChoosyRemapper.cpp in Sources */, + 739193981119FC73007D96F4 /* GLPreviewFrame.cpp in Sources */, + 739193991119FC73007D96F4 /* GLRenderer.cpp in Sources */, + 7391939A1119FC73007D96F4 /* GLViewer.cpp in Sources */, + 7391939B1119FC73007D96F4 /* MeshManager.cpp in Sources */, + 7391939C1119FC73007D96F4 /* MeshRemapper.cpp in Sources */, + 7391939D1119FC73007D96F4 /* OutputProjectionInfo.cpp in Sources */, + 7391939E1119FC73007D96F4 /* PreviewCropTool.cpp in Sources */, + 7391939F1119FC73007D96F4 /* PreviewDifferenceTool.cpp in Sources */, + 739193A01119FC73007D96F4 /* PreviewDragTool.cpp in Sources */, + 739193A11119FC73007D96F4 /* PreviewIdentifyTool.cpp in Sources */, + 739193A21119FC73007D96F4 /* PreviewPanoMaskTool.cpp in Sources */, + 739193A31119FC73007D96F4 /* PreviewTool.cpp in Sources */, + 739193A41119FC73007D96F4 /* PreviewToolHelper.cpp in Sources */, + 739193A51119FC73007D96F4 /* TexCoordRemapper.cpp in Sources */, + 739193A61119FC73007D96F4 /* TextureManager.cpp in Sources */, + 739193A71119FC73007D96F4 /* VertexCoordRemapper.cpp in Sources */, + 739193A81119FC73007D96F4 /* ViewState.cpp in Sources */, + 739193A91119FC73007D96F4 /* NonaOptionsDialog.cpp in Sources */, + 739193AA1119FC73007D96F4 /* CPImagesComboBox.cpp in Sources */, + 739193AB1119FC73007D96F4 /* ResetDialog.cpp in Sources */, + 739193AC1119FC73007D96F4 /* CPDetectorConfig.cpp in Sources */, + 739193AD1119FC73007D96F4 /* PreviewControlPointTool.cpp in Sources */, + 739193AE1119FC73007D96F4 /* GreatCircles.cpp in Sources */, + 739193AF1119FC73007D96F4 /* HDRMergeOptionDialog.cpp in Sources */, + 739193B01119FC73007D96F4 /* NumTransDialog.cpp in Sources */, + 739193B11119FC73007D96F4 /* AboutDialog.cpp in Sources */, + 739193B21119FC73007D96F4 /* LayoutRemapper.cpp in Sources */, + 739193B31119FC73007D96F4 /* PreviewLayoutLinesTool.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 739A0C0E10FA524E00D8E4C7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -8122,6 +8532,36 @@ target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; targetProxy = 7377C70810641712002EF919 /* PBXContainerItemProxy */; }; + 739193761119FC73007D96F4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FC280D24A26400A6AD01 /* frameworks */; + targetProxy = 739193771119FC73007D96F4 /* PBXContainerItemProxy */; + }; + 739193781119FC73007D96F4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57D50ACA0F596DB700CCDCB5 /* celeste */; + targetProxy = 739193791119FC73007D96F4 /* PBXContainerItemProxy */; + }; + 7391937A1119FC73007D96F4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769F5FF0D23825700A6AD01 /* StitchProject */; + targetProxy = 7391937B1119FC73007D96F4 /* PBXContainerItemProxy */; + }; + 7391937C1119FC73007D96F4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */; + targetProxy = 7391937D1119FC73007D96F4 /* PBXContainerItemProxy */; + }; + 739193ED1119FD60007D96F4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571046810D25F698006A3C69 /* bundled tools */; + targetProxy = 739193EC1119FD60007D96F4 /* PBXContainerItemProxy */; + }; + 739193F21119FD77007D96F4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57D382C50E2369D000445A37 /* tools - other dynamic */; + targetProxy = 739193F11119FD77007D96F4 /* PBXContainerItemProxy */; + }; 739A0BEE10FA4A5600D8E4C7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 73EBC08F0EC9E0B20068B821 /* celeste dynamic */; @@ -8498,6 +8938,14 @@ 5745FC17094E1E6400E6B672 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + /usr/include, + /Developer/Headers/FlatCarbon, + "$(REPOSITORY_DIR)/include", + "$(REPOSITORY_DIR)/include/OpenEXR", + ../src, + ../src/foreign/vigra, + ); PRODUCT_NAME = hugin_vigra_impex; USER_HEADER_SEARCH_PATHS = "../src/foreign/vigra $(inherited)"; }; @@ -8577,7 +9025,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = ""; - GCC_OPTIMIZATION_LEVEL = 2; + GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(DEBUG_MACRO)", @@ -10833,6 +11281,142 @@ }; name = Release; }; + 739193DF1119FC73007D96F4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(WX_ARCH)"; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src/celeste, + ../src/hugin_base, + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin1, + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + "$(inherited)", + ); + INFOPLIST_FILE = "/Users/Shared/development/hugin_related/hugin/mac/../mac/Hugin-Info copy.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = Hugin; + }; + name = Debug; + }; + 739193E01119FC73007D96F4 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(WX_ARCH)"; + DEPLOYMENT_POSTPROCESSING = NO; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src/celeste, + ../src/hugin_base, + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin1, + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + "$(inherited)", + ); + INFOPLIST_FILE = "/Users/Shared/development/hugin_related/hugin/mac/../mac/Hugin-Info copy.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = Hugin; + }; + name = Development; + }; + 739193E11119FC73007D96F4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(WX_ARCH)"; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src/celeste, + ../src/hugin_base, + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin1, + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + "$(inherited)", + ); + INFOPLIST_FILE = "/Users/Shared/development/hugin_related/hugin/mac/../mac/Hugin-Info copy.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = Hugin; + }; + name = Release; + }; 739A0C0110FA510400D8E4C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -12138,6 +12722,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 739193DE1119FC73007D96F4 /* Build configuration list for PBXNativeTarget "Hugin with tools" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 739193DF1119FC73007D96F4 /* Debug */, + 739193E01119FC73007D96F4 /* Development */, + 739193E11119FC73007D96F4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 739A0C0610FA513500D8E4C7 /* Build configuration list for PBXAggregateTarget "Separate tools package" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2010-02-14 13:14:01 UTC (rev 4975) +++ hugin/trunk/mac/complete-bundle.sh 2010-02-14 13:15:41 UTC (rev 4976) @@ -10,9 +10,9 @@ App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv" +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv liblocalfeatures" -binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin* $App/Contents/Resources/align_image_stack" +binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin* $App/Contents/Resources/align_image_stack $App/Contents/Resources/keypoints $App/Contents/Resources/patfree-panomatic" #------------------------------------------------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-03-13 12:39:41
|
Revision: 5061 http://hugin.svn.sourceforge.net/hugin/?rev=5061&view=rev Author: harryvanderwolf Date: 2010-03-13 12:39:30 +0000 (Sat, 13 Mar 2010) Log Message: ----------- [OSX] XCode: cleanup, make project and scripts more robust when environment not completely "reliable" Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/localised.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-03-11 20:59:50 UTC (rev 5060) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-03-13 12:39:30 UTC (rev 5061) @@ -2617,7 +2617,7 @@ 57098D770C453E6600BD1C53 /* panodata.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = panodata.pch; sourceTree = "<group>"; }; 5709939D0D2E449400499A34 /* platform.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = platform.cpp; sourceTree = "<group>"; }; 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = autooptimiser.cpp; sourceTree = "<group>"; }; - 5709A0890C4543E100BD1C53 /* autooptimiser-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "autooptimiser-static"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5709A0890C4543E100BD1C53 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; }; 570D581A082A9ED50030E768 /* enblend */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = enblend; path = bin/enblend; sourceTree = "<group>"; }; 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Hugin-Info.plist"; sourceTree = "<group>"; }; 57114EA006BC2301004F4FA7 /* Hugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Hugin.icns; sourceTree = "<group>"; }; @@ -2825,8 +2825,8 @@ 5759EF260C32B1740043F754 /* ControlPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ControlPoint.h; sourceTree = "<group>"; }; 5759EF770C32B69F0043F754 /* Lens.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Lens.cpp; sourceTree = "<group>"; }; 5759EF780C32B69F0043F754 /* Lens.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Lens.h; sourceTree = "<group>"; }; - 576482BE0C469052003AFC2F /* fulla-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "fulla-static"; sourceTree = BUILT_PRODUCTS_DIR; }; - 576482E20C469056003AFC2F /* vig_optimize-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "vig_optimize-static"; sourceTree = BUILT_PRODUCTS_DIR; }; + 576482BE0C469052003AFC2F /* fulla */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fulla; sourceTree = BUILT_PRODUCTS_DIR; }; + 576482E20C469056003AFC2F /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; }; 576482E80C469093003AFC2F /* fulla.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fulla.cpp; sourceTree = "<group>"; }; 576482E90C469093003AFC2F /* vig_optimize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vig_optimize.cpp; sourceTree = "<group>"; }; 576900800D24D14500A6AD01 /* vigra_impex-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "vigra_impex-Info.plist"; sourceTree = "<group>"; }; @@ -2980,15 +2980,15 @@ 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.dylib; path = lib/libjpeg.dylib; sourceTree = "<group>"; }; 57D18D8E0E13BD340054A523 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; }; 57D18D8F0E13BD340054A523 /* SVN-rev.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "SVN-rev.xcconfig"; sourceTree = "<group>"; }; - 57D382EB0E2369FC00445A37 /* nona-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "nona-static"; sourceTree = BUILT_PRODUCTS_DIR; }; - 57D3830D0E236A0800445A37 /* matchpoint-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "matchpoint-static"; sourceTree = BUILT_PRODUCTS_DIR; }; + 57D382EB0E2369FC00445A37 /* nona */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = BUILT_PRODUCTS_DIR; }; + 57D3830D0E236A0800445A37 /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; }; 57D475B60D3CE0AB003CF158 /* translations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = translations; sourceTree = "<group>"; }; 57D5093A0F5942F200CCDCB5 /* CPImagesComboBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPImagesComboBox.cpp; sourceTree = "<group>"; }; 57D5093B0F5942F300CCDCB5 /* CPImagesComboBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPImagesComboBox.h; sourceTree = "<group>"; }; 57D50A620F595A6300CCDCB5 /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57D50A640F595A6300CCDCB5 /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; }; 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_celeste.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 57D50B520F5971A600CCDCB5 /* celeste_standalone-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "celeste_standalone-static"; sourceTree = BUILT_PRODUCTS_DIR; }; + 57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 4; languageSpecificationIdentifier = c.cpp; path = hugin_config_mac.h; sourceTree = "<group>"; }; 57DD345E0F5939D80030B958 /* celeste-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "celeste-Info.plist"; sourceTree = "<group>"; }; @@ -3001,7 +3001,7 @@ 57DD34990F5940840030B958 /* FeatureMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureMatcher.h; sourceTree = "<group>"; }; 57E122010D2BDBF300743A93 /* BuildConfig.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BuildConfig.xcconfig; sourceTree = SOURCE_ROOT; }; 57E122480D2BE45700743A93 /* hugin_version.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = hugin_version.h; sourceTree = "<group>"; }; - 57E122580D2BE4E900743A93 /* align_image_stack-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "align_image_stack-static"; sourceTree = BUILT_PRODUCTS_DIR; }; + 57E122580D2BE4E900743A93 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; 57E32FAF0C4A87F1006AA781 /* ImageGraph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageGraph.h; sourceTree = "<group>"; }; 57E32FB00C4A87F1006AA781 /* PTOptimise.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTOptimise.h; sourceTree = "<group>"; }; 57E32FB10C4A87F1006AA781 /* PanoCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoCommand.h; sourceTree = "<group>"; }; @@ -3137,8 +3137,8 @@ 57FD5825101B3E7B0065B9E9 /* CPDetectorConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPDetectorConfig.cpp; sourceTree = "<group>"; }; 57FD5827101B3E840065B9E9 /* CPDetectorConfig_default.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDetectorConfig_default.h; sourceTree = "<group>"; }; 57FD5828101B3E840065B9E9 /* CPDetectorConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDetectorConfig.h; sourceTree = "<group>"; }; - 730B1AE81139B2B20014462B /* MaskLoadDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MaskLoadDialog.h; path = ../src/hugin1/hugin/MaskLoadDialog.h; sourceTree = SOURCE_ROOT; }; - 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MaskLoadDialog.cpp; path = ../src/hugin1/hugin/MaskLoadDialog.cpp; sourceTree = SOURCE_ROOT; }; + 730B1AE81139B2B20014462B /* MaskLoadDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaskLoadDialog.h; sourceTree = "<group>"; }; + 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MaskLoadDialog.cpp; sourceTree = "<group>"; }; 7329278310E4A7AE00D3C8CB /* image_variables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image_variables.h; sourceTree = "<group>"; }; 7329278410E4A7AE00D3C8CB /* ImageVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageVariable.h; sourceTree = "<group>"; }; 7329278510E4A7AE00D3C8CB /* ImageVariableGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageVariableGroup.cpp; sourceTree = "<group>"; }; @@ -3270,10 +3270,10 @@ 737E923B1125FE0100773356 /* exiv2 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = exiv2; path = ../../ExternalPrograms/repository/bin/exiv2; sourceTree = SOURCE_ROOT; }; 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResetDialog.cpp; sourceTree = "<group>"; }; 7388EAFC0F6BFB1B001E08FA /* ResetDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetDialog.h; sourceTree = "<group>"; }; - 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MaskEditorPanel.cpp; path = ../src/hugin1/hugin/MaskEditorPanel.cpp; sourceTree = SOURCE_ROOT; }; - 738A773B112B4507004E3612 /* MaskEditorPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MaskEditorPanel.h; path = ../src/hugin1/hugin/MaskEditorPanel.h; sourceTree = SOURCE_ROOT; }; - 738A773C112B4507004E3612 /* MaskImageCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MaskImageCtrl.cpp; path = ../src/hugin1/hugin/MaskImageCtrl.cpp; sourceTree = SOURCE_ROOT; }; - 738A773D112B4507004E3612 /* MaskImageCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MaskImageCtrl.h; path = ../src/hugin1/hugin/MaskImageCtrl.h; sourceTree = SOURCE_ROOT; }; + 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MaskEditorPanel.cpp; sourceTree = "<group>"; }; + 738A773B112B4507004E3612 /* MaskEditorPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaskEditorPanel.h; sourceTree = "<group>"; }; + 738A773C112B4507004E3612 /* MaskImageCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MaskImageCtrl.cpp; sourceTree = "<group>"; }; + 738A773D112B4507004E3612 /* MaskImageCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaskImageCtrl.h; sourceTree = "<group>"; }; 738A7749112B4869004E3612 /* Mask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mask.cpp; path = ../src/hugin_base/panodata/Mask.cpp; sourceTree = SOURCE_ROOT; }; 738A774A112B4869004E3612 /* Mask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mask.h; path = ../src/hugin_base/panodata/Mask.h; sourceTree = SOURCE_ROOT; }; 738C044910A0A5D90061D144 /* AboutDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AboutDialog.cpp; sourceTree = "<group>"; }; @@ -3318,7 +3318,7 @@ 73C153971052E7BB00AE93C1 /* Straighten.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Straighten.cpp; sourceTree = "<group>"; }; 73C153981052E7BB00AE93C1 /* Straighten.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Straighten.h; sourceTree = "<group>"; }; 73C153991052E7BB00AE93C1 /* test_lensFunc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_lensFunc.cpp; sourceTree = "<group>"; }; - 73C959140DA2C9DB00E19110 /* tca_correct-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "tca_correct-static"; sourceTree = BUILT_PRODUCTS_DIR; }; + 73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; 73D24B4E106152CD00B8A25D /* cpclean */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cpclean; sourceTree = BUILT_PRODUCTS_DIR; }; 73D24B641061556700B8A25D /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; }; 73D24B9A1061566B00B8A25D /* cpclean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpclean.cpp; sourceTree = "<group>"; }; @@ -3326,7 +3326,7 @@ 73D24BB21061592C00B8A25D /* CleanCP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CleanCP.h; sourceTree = "<group>"; }; 73E488F710D5997300A083C8 /* CalculateOptimalROI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CalculateOptimalROI.h; path = algorithms/basic/CalculateOptimalROI.h; sourceTree = "<group>"; }; 73E488F810D5997300A083C8 /* CalculateOptimalROI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CalculateOptimalROI.cpp; path = algorithms/basic/CalculateOptimalROI.cpp; sourceTree = "<group>"; }; - 73E6770010F8BF18001807AB /* libhugin_base.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_base.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 73E6770010F8BF18001807AB /* libhugin_algorithms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_algorithms.a; sourceTree = BUILT_PRODUCTS_DIR; }; 73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; 73EAB5280E86CF120020D514 /* libboost_thread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libboost_thread.a; sourceTree = "<group>"; }; 73EAB5290E86CF120020D514 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libexiv2.a; sourceTree = "<group>"; }; @@ -4461,7 +4461,7 @@ 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */, 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */, 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */, - 73E6770010F8BF18001807AB /* libhugin_base.a */, + 73E6770010F8BF18001807AB /* libhugin_algorithms.a */, 5771F5D70C3006E900736343 /* libhugin_utils.a */, 5771F77A0C30216F00736343 /* libhugin_math.a */, 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */, @@ -4983,14 +4983,14 @@ 57D18D880E13BC8A0054A523 /* tools-static */ = { isa = PBXGroup; children = ( - 57E122580D2BE4E900743A93 /* align_image_stack-static */, - 5709A0890C4543E100BD1C53 /* autooptimiser-static */, - 57D50B520F5971A600CCDCB5 /* celeste_standalone-static */, - 576482BE0C469052003AFC2F /* fulla-static */, - 57D3830D0E236A0800445A37 /* matchpoint-static */, - 57D382EB0E2369FC00445A37 /* nona-static */, - 73C959140DA2C9DB00E19110 /* tca_correct-static */, - 576482E20C469056003AFC2F /* vig_optimize-static */, + 57E122580D2BE4E900743A93 /* align_image_stack */, + 5709A0890C4543E100BD1C53 /* autooptimiser */, + 57D50B520F5971A600CCDCB5 /* celeste */, + 576482BE0C469052003AFC2F /* fulla */, + 57D3830D0E236A0800445A37 /* matchpoint */, + 57D382EB0E2369FC00445A37 /* nona */, + 73C959140DA2C9DB00E19110 /* tca_correct */, + 576482E20C469056003AFC2F /* vig_optimize */, ); name = "tools-static"; sourceTree = "<group>"; @@ -5158,6 +5158,14 @@ 57E330FE0C4A8859006AA781 /* hugin */ = { isa = PBXGroup; children = ( + 730B1AE81139B2B20014462B /* MaskLoadDialog.h */, + 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */, + 738A7749112B4869004E3612 /* Mask.cpp */, + 738A774A112B4869004E3612 /* Mask.h */, + 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */, + 738A773B112B4507004E3612 /* MaskEditorPanel.h */, + 738A773C112B4507004E3612 /* MaskImageCtrl.cpp */, + 738A773D112B4507004E3612 /* MaskImageCtrl.h */, 738C044910A0A5D90061D144 /* AboutDialog.cpp */, 738C044A10A0A5D90061D144 /* AboutDialog.h */, 7368E4621083ABF200519ED0 /* NumTransDialog.h */, @@ -5346,14 +5354,6 @@ 57FC3ABD0675E43600C3E0AC = { isa = PBXGroup; children = ( - 730B1AE81139B2B20014462B /* MaskLoadDialog.h */, - 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */, - 738A7749112B4869004E3612 /* Mask.cpp */, - 738A774A112B4869004E3612 /* Mask.h */, - 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */, - 738A773B112B4507004E3612 /* MaskEditorPanel.h */, - 738A773C112B4507004E3612 /* MaskImageCtrl.cpp */, - 738A773D112B4507004E3612 /* MaskImageCtrl.h */, 57E34AC90C4ACE1C006AA781 /* math.h */, 574B81880E4198FE00644179 /* hugin */, 5745FC05094E1D5400E6B672 /* External */, @@ -6105,7 +6105,7 @@ ); name = "autooptimiser static"; productName = "sample open_close"; - productReference = 5709A0890C4543E100BD1C53 /* autooptimiser-static */; + productReference = 5709A0890C4543E100BD1C53 /* autooptimiser */; productType = "com.apple.product-type.tool"; }; 5711524906BC6709004F4FA7 /* vigra_impex */ = { @@ -6237,7 +6237,7 @@ ); name = "fulla static"; productName = "sample open_close"; - productReference = 576482BE0C469052003AFC2F /* fulla-static */; + productReference = 576482BE0C469052003AFC2F /* fulla */; productType = "com.apple.product-type.tool"; }; 576482C00C469056003AFC2F /* vig_optimize static */ = { @@ -6254,7 +6254,7 @@ ); name = "vig_optimize static"; productName = "sample open_close"; - productReference = 576482E20C469056003AFC2F /* vig_optimize-static */; + productReference = 576482E20C469056003AFC2F /* vig_optimize */; productType = "com.apple.product-type.tool"; }; 576900A90D24D29300A6AD01 /* hugin_base Framework */ = { @@ -6465,7 +6465,7 @@ ); name = "nona static"; productName = "sample open_close"; - productReference = 57D382EB0E2369FC00445A37 /* nona-static */; + productReference = 57D382EB0E2369FC00445A37 /* nona */; productType = "com.apple.product-type.tool"; }; 57D382ED0E236A0800445A37 /* matchpoint static */ = { @@ -6482,7 +6482,7 @@ ); name = "matchpoint static"; productName = align_image_stack; - productReference = 57D3830D0E236A0800445A37 /* matchpoint-static */; + productReference = 57D3830D0E236A0800445A37 /* matchpoint */; productType = "com.apple.product-type.tool"; }; 57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */ = { @@ -6546,7 +6546,7 @@ ); name = "celeste static"; productName = celeste_standalone; - productReference = 57D50B520F5971A600CCDCB5 /* celeste_standalone-static */; + productReference = 57D50B520F5971A600CCDCB5 /* celeste */; productType = "com.apple.product-type.tool"; }; 57E122570D2BE4E800743A93 /* align_image_stack static */ = { @@ -6563,7 +6563,7 @@ ); name = "align_image_stack static"; productName = align_image_stack; - productReference = 57E122580D2BE4E900743A93 /* align_image_stack-static */; + productReference = 57E122580D2BE4E900743A93 /* align_image_stack */; productType = "com.apple.product-type.tool"; }; 57E3467D0C4A89B0006AA781 /* Hugin */ = { @@ -6855,7 +6855,7 @@ ); name = "tca_correct static"; productName = "sample open_close"; - productReference = 73C959140DA2C9DB00E19110 /* tca_correct-static */; + productReference = 73C959140DA2C9DB00E19110 /* tca_correct */; productType = "com.apple.product-type.tool"; }; 73D24B4D106152CD00B8A25D /* cpclean */ = { @@ -6890,7 +6890,7 @@ ); name = hugin_base; productName = algorithms; - productReference = 73E6770010F8BF18001807AB /* libhugin_base.a */; + productReference = 73E6770010F8BF18001807AB /* libhugin_algorithms.a */; productType = "com.apple.product-type.library.static"; }; 73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */ = { @@ -7380,7 +7380,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ -f \"../mac/SVN-rev.xcconfig\" ]\nthen\n if [ \"$(svnversion -n \"../\")\" != \"exported\" ]\n then\n if [ \"${HUGIN_PRERELEASE_VERSION_TAG}\" = '-svn'$(svnversion -n \"../\") ]\n then\n exit 0\n fi\n else\n if [ ${HUGIN_WC_REVISION} != \"\" ]\n then\n exit 0\n fi\n fi\nfi\n\nif [ \"$(svnversion -n \"../\")\" != \"exported\" ]\nthen\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_DEVELOPMENT_VERSION = 1' >> \"../mac/SVN-rev.xcconfig\"\nelse\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\n echo 'Need to set SVN revision ${HUGIN_WC_REVISION} manually in Version.xcconfig.' >&2\n exit 1\nfi"; + shellScript = "# First export a path. On some systems the environment is not correctly set/used/\nexport PATH=/opt/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/sw/bin\n\nif [ -f \"../mac/SVN-rev.xcconfig\" ]\nthen\n if [ \"$(svnversion -n \"../\")\" != \"exported\" ]\n then\n if [ \"${HUGIN_PRERELEASE_VERSION_TAG}\" = '-svn'$(svnversion -n \"../\") ]\n then\n exit 0\n fi\n else\n if [ ${HUGIN_WC_REVISION} != \"\" ]\n then\n exit 0\n fi\n fi\nelse\n touch ../mac/SVN-rev.xcconfig\nfi\n\nif [ \"$(svnversion -n \"../\")\" != \"exported\" ]\nthen\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n# echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\") > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\" | grep -o '^[0-9]*') >> \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_DEVELOPMENT_VERSION = 1' >> \"../mac/SVN-rev.xcconfig\"\nelse\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\n echo 'Need to set SVN revision ${HUGIN_WC_REVISION} manually in Version.xcconfig.' >&2\n exit 1\nfi\n\n\n\n#if [ $ACTION = \"build\" ]\n#then\n# sh ../mac/set-svnrevision.sh\n#fi\n"; }; 57FF7DBA0E6919F400553709 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; Modified: hugin/trunk/mac/localised.sh =================================================================== --- hugin/trunk/mac/localised.sh 2010-03-11 20:59:50 UTC (rev 5060) +++ hugin/trunk/mac/localised.sh 2010-03-13 12:39:30 UTC (rev 5061) @@ -2,6 +2,10 @@ # $Id: localised.sh 2004 2007-05-11 00:17:50Z ippei $ +# First export a path. On some systems the environment is not correctly set/used/ +export PATH=/opt/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/sw/bin + + wxWidgetsLocaleDir="$WX_LOCALE_DIR" resdir="$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources" huginsrcdir="../src/hugin1/hugin" @@ -43,7 +47,7 @@ fi echo "$lang/hugin.mo from $lang.po" - /opt/local/bin/msgfmt -v -o "$localedir/hugin.mo" "$translationsdir/$lang.po" + msgfmt -v -o "$localedir/hugin.mo" "$translationsdir/$lang.po" echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$lang.po" if [ -f "$wxWidgetsLocaleDir/$lang.po" ] @@ -56,7 +60,7 @@ echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$parentLang.po" if [ -f "$wxWidgetsLocaleDir/$parentLang.po" ] then - /opt/local/bin/msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$parentLang.po" + msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$parentLang.po" else echo "$parentLang.po not found;" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-04-21 14:23:22
|
Revision: 5118 http://hugin.svn.sourceforge.net/hugin/?rev=5118&view=rev Author: harryvanderwolf Date: 2010-04-21 14:23:14 +0000 (Wed, 21 Apr 2010) Log Message: ----------- [OSX] Several fixes and changes to XCode project for 64bit; added pto_merge and pano_modify to XCode; updated libxmi.sh for 64bit; added new tools script for 32bit and 64bit builds Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/trunk/mac/copyTools.sh Modified: hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh 2010-04-20 20:49:25 UTC (rev 5117) +++ hugin/trunk/mac/ExternalPrograms/scripts/libxmi.sh 2010-04-21 14:23:14 UTC (rev 5118) @@ -20,6 +20,7 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100111.0 sg Script enhanced to build dynamic library +# 20100419.0 hvdw Changes to fix 64bit build # ------------------------------- # init @@ -85,17 +86,19 @@ # take the extra time and do it right (x86_64 build reuses ppc64 settings.) [ -f config.cache ] && rm config.cache + [ -f config.h ] && rm config.h env \ CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --host="$TARGET" --target="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --enable-static --enable-shared; + [ -f libtool.bak ] && rm libtool.bak mv libtool libtool.bak sed -e "s@\(^[ ]\{4\}linkopts=\)@\1\"-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind\"@" libtool.bak >libtool @@ -151,4 +154,4 @@ ln -sfn "libxmi.$XMI_FULL_VSN.dylib" "$REPOSITORYDIR/lib/libxmi.$XMI_VSN.dylib"; ln -sfn "libxmi.$XMI_FULL_VSN.dylib" "$REPOSITORYDIR/lib/libxmi.dylib"; fi - \ No newline at end of file + Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-04-20 20:49:25 UTC (rev 5117) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-04-21 14:23:14 UTC (rev 5118) @@ -62,8 +62,10 @@ 73FC2AF0110057CB00EAB009 /* PBXTargetDependency */, 73FC2AF2110057CB00EAB009 /* PBXTargetDependency */, 73FC2AF4110057CB00EAB009 /* PBXTargetDependency */, + 733DF684117F24ED002EC787 /* PBXTargetDependency */, 73FC2AF6110057CB00EAB009 /* PBXTargetDependency */, 73FC2AF8110057CB00EAB009 /* PBXTargetDependency */, + 733DF686117F2531002EC787 /* PBXTargetDependency */, 73FC2AFA110057CB00EAB009 /* PBXTargetDependency */, 73FC2AFC110057CB00EAB009 /* PBXTargetDependency */, ); @@ -837,7 +839,6 @@ 57E346AB0C4A89E6006AA781 /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331230C4A8859006AA781 /* MainFrame.cpp */; }; 57E346B30C4A89E6006AA781 /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */; }; 57E346B50C4A89E6006AA781 /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312E0C4A8859006AA781 /* OptimizePhotometricPanel.cpp */; }; - 57E346BB0C4A89E6006AA781 /* PanoDruid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331340C4A8859006AA781 /* PanoDruid.cpp */; }; 57E346BD0C4A89E6006AA781 /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331360C4A8859006AA781 /* PanoPanel.cpp */; }; 57E346C10C4A89E6006AA781 /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */; }; 57E346C30C4A89E6006AA781 /* PreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313C0C4A8859006AA781 /* PreviewFrame.cpp */; }; @@ -908,6 +909,38 @@ 7332AEC00D8D4C45002BF5FF /* APImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE560D8D491B002BF5FF /* APImage.cpp */; }; 7332AEC30D8D4C45002BF5FF /* Descriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE790D8D491B002BF5FF /* Descriptor.cpp */; }; 7332AEC40D8D4C45002BF5FF /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; }; + 733DF62C117F2268002EC787 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 733DF62D117F2268002EC787 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 733DF62E117F2268002EC787 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 733DF62F117F2268002EC787 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 733DF630117F2268002EC787 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 733DF631117F2268002EC787 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 733DF632117F2268002EC787 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 733DF633117F2268002EC787 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 733DF634117F2268002EC787 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 733DF635117F2268002EC787 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 733DF636117F2268002EC787 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 733DF637117F2268002EC787 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 733DF638117F2268002EC787 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 733DF639117F2268002EC787 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; }; + 733DF63A117F2268002EC787 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; }; + 733DF64D117F22F9002EC787 /* pano_modify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BBCD39117E2D3600E37B36 /* pano_modify.cpp */; }; + 733DF65B117F2384002EC787 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 733DF65C117F2384002EC787 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 733DF65D117F2384002EC787 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 733DF65E117F2384002EC787 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 733DF65F117F2384002EC787 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 733DF660117F2384002EC787 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 733DF661117F2384002EC787 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 733DF662117F2384002EC787 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 733DF663117F2384002EC787 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 733DF664117F2384002EC787 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 733DF665117F2384002EC787 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 733DF666117F2384002EC787 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 733DF667117F2384002EC787 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 733DF668117F2384002EC787 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; }; + 733DF669117F2384002EC787 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; }; + 733DF67F117F2462002EC787 /* pto_merge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BBCD38117E2D3600E37B36 /* pto_merge.cpp */; }; 73411F151077B205001831AF /* HDRMergeOptionDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73411F131077B205001831AF /* HDRMergeOptionDialog.cpp */; }; 73437AC410BD9C7D0014F41D /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; 734FBA5B0EB3A20500CD7122 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */; }; @@ -979,7 +1012,6 @@ 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; 737E92341125ED3000773356 /* keypoints in Resources */ = {isa = PBXBuildFile; fileRef = 737E922F1125ED1900773356 /* keypoints */; }; 737E92351125ED3000773356 /* patfree-panomatic in Resources */ = {isa = PBXBuildFile; fileRef = 737E92301125ED1900773356 /* patfree-panomatic */; }; - 737E923C1125FE0E00773356 /* exiv2 in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 737E923B1125FE0100773356 /* exiv2 */; }; 7388EAFD0F6BFB1B001E08FA /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; }; 738A773E112B4508004E3612 /* MaskEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */; }; 738A773F112B4508004E3612 /* MaskImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A773C112B4507004E3612 /* MaskImageCtrl.cpp */; }; @@ -1076,17 +1108,6 @@ 739193D61119FC73007D96F4 /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 57114EA006BC2301004F4FA7 /* Hugin.icns */; }; 739193D71119FC73007D96F4 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5702996D07F967CB00F1FF15 /* HuginFiles.icns */; }; 739193D81119FC73007D96F4 /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 5769F6300D23825700A6AD01 /* HuginStitchProject.app */; }; - 73919407111A058E007D96F4 /* autooptimiser in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */; }; - 73919408111A058E007D96F4 /* calibrate_lens in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 73C153681052E6DE00AE93C1 /* calibrate_lens */; }; - 73919409111A058E007D96F4 /* celeste_standalone in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; }; - 7391940A111A058E007D96F4 /* cpclean in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; }; - 7391940B111A058E007D96F4 /* deghosting_mask in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 7364217010763A22000121C5 /* deghosting_mask */; }; - 7391940C111A058E007D96F4 /* fulla in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9B310FB6F5A00839DF3 /* fulla */; }; - 7391940D111A058E007D96F4 /* matchpoint in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = 7332AEAE0D8D4986002BF5FF /* matchpoint */; }; - 7391940E111A058E007D96F4 /* pano_trafo in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9B710FB6F5A00839DF3 /* pano_trafo */; }; - 7391940F111A058E007D96F4 /* pto2mk in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9BA10FB6F5A00839DF3 /* pto2mk */; }; - 73919410111A058E007D96F4 /* tca_correct in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9BE10FB6F5B00839DF3 /* tca_correct */; }; - 73919411111A058E007D96F4 /* vig_optimize in Copy Extra tools into bundle */ = {isa = PBXBuildFile; fileRef = E8A7D9C210FB6F5B00839DF3 /* vig_optimize */; }; 7393CEC8115BF296002F3DCA /* hugin_shared.h in Headers */ = {isa = PBXBuildFile; fileRef = 7393CEC7115BF296002F3DCA /* hugin_shared.h */; }; 7393CEC9115BF296002F3DCA /* hugin_shared.h in Headers */ = {isa = PBXBuildFile; fileRef = 7393CEC7115BF296002F3DCA /* hugin_shared.h */; }; 739A0C1210FA524E00D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; @@ -2097,6 +2118,48 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; + 733DF625117F2268002EC787 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 733DF627117F2268002EC787 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; + 733DF655117F2384002EC787 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 733DF657117F2384002EC787 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; + 733DF683117F24ED002EC787 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 733DF623117F2268002EC787 /* pano_modify */; + remoteInfo = pano_modify; + }; + 733DF685117F2531002EC787 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 733DF653117F2384002EC787 /* pto_merge */; + remoteInfo = pto_merge; + }; 73573E2D10F9EEA300CF0ECD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -2582,28 +2645,6 @@ name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - 73CC46C2111C86570080B322 /* Copy Extra tools into bundle */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 6; - files = ( - 73919407111A058E007D96F4 /* autooptimiser in Copy Extra tools into bundle */, - 73919408111A058E007D96F4 /* calibrate_lens in Copy Extra tools into bundle */, - 73919409111A058E007D96F4 /* celeste_standalone in Copy Extra tools into bundle */, - 7391940A111A058E007D96F4 /* cpclean in Copy Extra tools into bundle */, - 7391940B111A058E007D96F4 /* deghosting_mask in Copy Extra tools into bundle */, - 737E923C1125FE0E00773356 /* exiv2 in Copy Extra tools into bundle */, - 7391940C111A058E007D96F4 /* fulla in Copy Extra tools into bundle */, - 7391940D111A058E007D96F4 /* matchpoint in Copy Extra tools into bundle */, - 7391940E111A058E007D96F4 /* pano_trafo in Copy Extra tools into bundle */, - 7391940F111A058E007D96F4 /* pto2mk in Copy Extra tools into bundle */, - 73919410111A058E007D96F4 /* tca_correct in Copy Extra tools into bundle */, - 73919411111A058E007D96F4 /* vig_optimize in Copy Extra tools into bundle */, - ); - name = "Copy Extra tools into bundle"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -3174,6 +3215,8 @@ 7332AE8E0D8D491C002BF5FF /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; 7332AE8F0D8D491C002BF5FF /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; 7332AEAE0D8D4986002BF5FF /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; }; + 733DF63F117F2268002EC787 /* pano_modify */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pano_modify; sourceTree = BUILT_PRODUCTS_DIR; }; + 733DF66E117F2384002EC787 /* pto_merge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_merge; sourceTree = BUILT_PRODUCTS_DIR; }; 73411F131077B205001831AF /* HDRMergeOptionDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDRMergeOptionDialog.cpp; sourceTree = "<group>"; }; 73411F141077B205001831AF /* HDRMergeOptionDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRMergeOptionDialog.h; sourceTree = "<group>"; }; 73482F5B0FD97B3900B6088C /* libboost_thread-1_40.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libboost_thread-1_40.a"; sourceTree = "<group>"; }; @@ -3291,6 +3334,9 @@ 73BB09320FACC59E00B04997 /* PanoToolsUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PanoToolsUtils.h; sourceTree = "<group>"; }; 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PanoToolsUtils.cpp; sourceTree = "<group>"; }; 73BB093C0FACC71200B04997 /* PanoToolsUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PanoToolsUtils.h; sourceTree = "<group>"; }; + 73BBCD38117E2D3600E37B36 /* pto_merge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pto_merge.cpp; sourceTree = "<group>"; }; + 73BBCD39117E2D3600E37B36 /* pano_modify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pano_modify.cpp; sourceTree = "<group>"; }; + 73BBCD3A117E2D3600E37B36 /* ExtractPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtractPoints.h; sourceTree = "<group>"; }; 73C0DAD01046E94100CB55B7 /* PanoToolsTransformGPU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PanoToolsTransformGPU.cpp; sourceTree = "<group>"; }; 73C0DAD71046E9B000CB55B7 /* ImageTransformsGPU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageTransformsGPU.cpp; sourceTree = "<group>"; }; 73C0DAD81046E9B000CB55B7 /* ImageTransformsGPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageTransformsGPU.h; sourceTree = "<group>"; }; @@ -3838,6 +3884,50 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 733DF62B117F2268002EC787 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 733DF62C117F2268002EC787 /* HuginBase.framework in Frameworks */, + 733DF62D117F2268002EC787 /* HuginVigraImpex.framework in Frameworks */, + 733DF62E117F2268002EC787 /* libpano13.dylib in Frameworks */, + 733DF62F117F2268002EC787 /* libz.dylib in Frameworks */, + 733DF630117F2268002EC787 /* libboost_thread.dylib in Frameworks */, + 733DF631117F2268002EC787 /* libHalf.dylib in Frameworks */, + 733DF632117F2268002EC787 /* libIex.dylib in Frameworks */, + 733DF633117F2268002EC787 /* libIlmImf.dylib in Frameworks */, + 733DF634117F2268002EC787 /* libIlmThread.dylib in Frameworks */, + 733DF635117F2268002EC787 /* libImath.dylib in Frameworks */, + 733DF636117F2268002EC787 /* libjpeg.dylib in Frameworks */, + 733DF637117F2268002EC787 /* libpng.dylib in Frameworks */, + 733DF638117F2268002EC787 /* libtiff.dylib in Frameworks */, + 733DF639117F2268002EC787 /* AGL.framework in Frameworks */, + 733DF63A117F2268002EC787 /* OpenGL.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 733DF65A117F2384002EC787 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 733DF65B117F2384002EC787 /* HuginBase.framework in Frameworks */, + 733DF65C117F2384002EC787 /* HuginVigraImpex.framework in Frameworks */, + 733DF65D117F2384002EC787 /* libpano13.dylib in Frameworks */, + 733DF65E117F2384002EC787 /* libz.dylib in Frameworks */, + 733DF65F117F2384002EC787 /* libboost_thread.dylib in Frameworks */, + 733DF660117F2384002EC787 /* libHalf.dylib in Frameworks */, + 733DF661117F2384002EC787 /* libIex.dylib in Frameworks */, + 733DF662117F2384002EC787 /* libIlmImf.dylib in Frameworks */, + 733DF663117F2384002EC787 /* libIlmThread.dylib in Frameworks */, + 733DF664117F2384002EC787 /* libImath.dylib in Frameworks */, + 733DF665117F2384002EC787 /* libjpeg.dylib in Frameworks */, + 733DF666117F2384002EC787 /* libpng.dylib in Frameworks */, + 733DF667117F2384002EC787 /* libtiff.dylib in Frameworks */, + 733DF668117F2384002EC787 /* AGL.framework in Frameworks */, + 733DF669117F2384002EC787 /* OpenGL.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 734BDF590EB8EC19007EBA09 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -4586,6 +4676,9 @@ 57460AB30C4E7BD5004507F7 /* tools */ = { isa = PBXGroup; children = ( + 73BBCD38117E2D3600E37B36 /* pto_merge.cpp */, + 73BBCD39117E2D3600E37B36 /* pano_modify.cpp */, + 73BBCD3A117E2D3600E37B36 /* ExtractPoints.h */, 739A0DE710FA602200D8E4C7 /* pto2mk.cpp */, 73573E5110F9EEF400CF0ECD /* pano_trafo.cpp */, 736421DF10763FCD000121C5 /* hugin_hdrmerge.cpp */, @@ -5362,6 +5455,8 @@ 5745FC05094E1D5400E6B672 /* External */, 573B8F3E067BA2EB00B7B355 /* Product */, 739193E21119FC73007D96F4 /* Hugin.app */, + 733DF63F117F2268002EC787 /* pano_modify */, + 733DF66E117F2384002EC787 /* pto_merge */, ); sourceTree = "<group>"; }; @@ -6649,6 +6744,42 @@ productReference = 7332AEAE0D8D4986002BF5FF /* matchpoint */; productType = "com.apple.product-type.tool"; }; + 733DF623117F2268002EC787 /* pano_modify */ = { + isa = PBXNativeTarget; + buildConfigurationList = 733DF63B117F2268002EC787 /* Build configuration list for PBXNativeTarget "pano_modify" */; + buildPhases = ( + 733DF628117F2268002EC787 /* Sources */, + 733DF62B117F2268002EC787 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 733DF624117F2268002EC787 /* PBXTargetDependency */, + 733DF626117F2268002EC787 /* PBXTargetDependency */, + ); + name = pano_modify; + productName = cpclean; + productReference = 733DF63F117F2268002EC787 /* pano_modify */; + productType = "com.apple.product-type.tool"; + }; + 733DF653117F2384002EC787 /* pto_merge */ = { + isa = PBXNativeTarget; + buildConfigurationList = 733DF66A117F2384002EC787 /* Build configuration list for PBXNativeTarget "pto_merge" */; + buildPhases = ( + 733DF658117F2384002EC787 /* Sources */, + 733DF65A117F2384002EC787 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 733DF654117F2384002EC787 /* PBXTargetDependency */, + 733DF656117F2384002EC787 /* PBXTargetDependency */, + ); + name = pto_merge; + productName = cpclean; + productReference = 733DF66E117F2384002EC787 /* pto_merge */; + productType = "com.apple.product-type.tool"; + }; 734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */ = { isa = PBXNativeTarget; buildConfigurationList = 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher dynamic" */; @@ -6712,7 +6843,7 @@ 739193B41119FC73007D96F4 /* Frameworks */, 739193D01119FC73007D96F4 /* Copy Frameworks */, 739193D41119FC73007D96F4 /* Resources */, - 73CC46C2111C86570080B322 /* Copy Extra tools into bundle */, + 733DF61B117F1EC2002EC787 /* Copy extra tools into bundle */, 739193D91119FC73007D96F4 /* Patch and Copy XRC */, 739193DA1119FC73007D96F4 /* Locale Script */, 739193DB1119FC73007D96F4 /* Localise Help */, @@ -7001,7 +7132,9 @@ 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */, 5796FA730C4395CC006B7C6E /* nona dynamic */, 73573E2B10F9EEA300CF0ECD /* pano_trafo */, + 733DF623117F2268002EC787 /* pano_modify */, 739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */, + 733DF653117F2384002EC787 /* pto_merge */, 739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */, 739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */, 57E347300C4A8EDF006AA781 /* Apps */, @@ -7385,7 +7518,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# First export a path. On some systems the environment is not correctly set/used/\nexport PATH=/opt/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/sw/bin\n\nif [ -f \"../mac/SVN-rev.xcconfig\" ]\nthen\n if [ \"$(svnversion -n \"../\")\" != \"exported\" ]\n then\n if [ \"${HUGIN_PRERELEASE_VERSION_TAG}\" = '-svn'$(svnversion -n \"../\") ]\n then\n exit 0\n fi\n else\n if [ ${HUGIN_WC_REVISION} != \"\" ]\n then\n exit 0\n fi\n fi\nelse\n touch ../mac/SVN-rev.xcconfig\nfi\n\nif [ \"$(svnversion -n \"../\")\" != \"exported\" ]\nthen\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n# echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\") > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\" | grep -o '^[0-9]*') >> \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_DEVELOPMENT_VERSION = 1' >> \"../mac/SVN-rev.xcconfig\"\nelse\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\n echo 'Need to set SVN revision ${HUGIN_WC_REVISION} manually in Version.xcconfig.' >&2\n exit 1\nfi\n\n\n\n#if [ $ACTION = \"build\" ]\n#then\n# sh ../mac/set-svnrevision.sh\n#fi\n"; + shellScript = "# First export a path. On some systems the environment is not correctly set/used\nexport PATH=/opt/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/sw/bin\n\nif [ -f \"../mac/SVN-rev.xcconfig\" ]\nthen\n if [ \"$(svnversion -n \"../\")\" != \"exported\" ]\n then\n if [ \"${HUGIN_PRERELEASE_VERSION_TAG}\" = '-svn'$(svnversion -n \"../\") ]\n then\n exit 0\n fi\n else\n if [ ${HUGIN_WC_REVISION} != \"\" ]\n then\n exit 0\n fi\n fi\nelse\n touch ../mac/SVN-rev.xcconfig\nfi\n\nif [ \"$(svnversion -n \"../\")\" != \"exported\" ]\nthen\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n# echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\") > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\" | grep -o '^[0-9]*') >> \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_DEVELOPMENT_VERSION = 1' >> \"../mac/SVN-rev.xcconfig\"\nelse\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\n echo 'Need to set SVN revision ${HUGIN_WC_REVISION} manually in Version.xcconfig.' >&2\n exit 1\nfi\n\n\n\n#if [ $ACTION = \"build\" ]\n#then\n# sh ../mac/set-svnrevision.sh\n#fi\n"; }; 57FF7DBA0E6919F400553709 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -7419,6 +7552,21 @@ shellPath = /bin/sh; shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/\\${DISPLAY_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/\\${HUGIN_BUILDER}/$HUGIN_BUILDER/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; }; + 733DF61B117F1EC2002EC787 /* Copy extra tools into bundle */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + comments = "This is a shell script copy as a normal XCode project doesnt recognise different external directories"; + files = ( + ); + inputPaths = ( + ); + name = "Copy extra tools into bundle"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/copyTools.sh\nfi"; + }; 739193D91119FC73007D96F4 /* Patch and Copy XRC */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -7894,7 +8042,6 @@ 57E346AB0C4A89E6006AA781 /* MainFrame.cpp in Sources */, 57E346B30C4A89E6006AA781 /* OptimizePanel.cpp in Sources */, 57E346B50C4A89E6006AA781 /* OptimizePhotometricPanel.cpp in Sources */, - 57E346BB0C4A89E6006AA781 /* PanoDruid.cpp in Sources */, 57E346BD0C4A89E6006AA781 /* PanoPanel.cpp in Sources */, 57E346C10C4A89E6006AA781 /* PreferencesDialog.cpp in Sources */, 57E346C30C4A89E6006AA781 /* PreviewFrame.cpp in Sources */, @@ -7986,6 +8133,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 733DF628117F2268002EC787 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 733DF64D117F22F9002EC787 /* pano_modify.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 733DF658117F2384002EC787 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 733DF67F117F2462002EC787 /* pto_merge.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 734BDF580EB8EC19007EBA09 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -8537,6 +8700,36 @@ target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; targetProxy = 7332AE950D8D4986002BF5FF /* PBXContainerItemProxy */; }; + 733DF624117F2268002EC787 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 733DF625117F2268002EC787 /* PBXContainerItemProxy */; + }; + 733DF626117F2268002EC787 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 733DF627117F2268002EC787 /* PBXContainerItemProxy */; + }; + 733DF654117F2384002EC787 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 733DF655117F2384002EC787 /* PBXContainerItemProxy */; + }; + 733DF656117F2384002EC787 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 733DF657117F2384002EC787 /* PBXContainerItemProxy */; + }; + 733DF684117F24ED002EC787 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 733DF623117F2268002EC787 /* pano_modify */; + targetProxy = 733DF683117F24ED002EC787 /* PBXContainerItemProxy */; + }; + 733DF686117F2531002EC787 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 733DF653117F2384002EC787 /* pto_merge */; + targetProxy = 733DF685117F2531002EC787 /* PBXContainerItemProxy */; + }; 73573E2C10F9EEA300CF0ECD /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; @@ -9065,7 +9258,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = ""; - GCC_OPTIMIZATION_LEVEL = 3; + GCC_OPTIMIZATION_LEVEL = 2; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(DEBUG_MACRO)", @@ -11016,6 +11209,198 @@ }; name = Release; }; + 733DF63C117F2268002EC787 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = cpclean; + }; + name = Debug; + }; + 733DF63D117F2268002EC787 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = cpclean; + }; + name = Development; + }; + 733DF63E117F2268002EC787 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + HEADER_SEARCH_PATHS = ( + ../src/tools, + /usr/include, + "$(REPOSITORY_DIR)/include", + "$(REPOSITORY_DIR)/include/OpenEXR", + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + INSTALL_PATH = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = pano_modify; + SEPARATE_STRIP = YES; + STRIP_INSTALLED_PRODUCT = YES; + ZERO_LINK = NO; + }; + name = Release; + }; + 733DF66B117F2384002EC787 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = cpclean; + }; + name = Debug; + }; + 733DF66C117F2384002EC787 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = cpclean; + }; + name = Development; + }; + 733DF66D117F2384002EC787 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + HEADER_SEARCH_PATHS = ( + ../src/tools, + /usr/include, + "$(REPOSITORY_DIR)/include", + "$(REPOSITORY_DIR)/include/OpenEXR", + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + INSTALL_PATH = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = pto_merge; + SEPARATE_STRIP = YES; + STRIP_INSTALLED_PRODUCT = YES; + ZERO_LINK = NO; + }; + name = Release; + }; 734BDF5D0EB8EC1A007EBA09 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -12732,6 +13117,26 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 733DF63B117F2268002EC787 /* Build configuration list for PBXNativeTarget "pano_modify" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 733DF63C117F2268002EC787 /* Debug */, + 733DF63D117F2268002EC787 /* Development */, + 733DF63E117F2268002EC787 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 733DF66A117F2384002EC787 /* Build configuration list for PBXNativeTarget "pto_merge" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 733DF66B117F2384002EC787 /* Debug */, + 733DF66C117F2384002EC787 /* Development */, + 733DF66D117F2384002EC787 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher dynamic" */ = { isa = XCConfigurationList; buildConfigurations = ( Added: hugin/trunk/mac/copyTools.sh =================================================================== --- hugin/trunk/mac/copyTools.sh (rev 0) +++ hugin/trunk/mac/copyTools.sh 2010-04-21 14:23:14 UTC (rev 5118) @@ -0,0 +1,34 @@ +#!/bin/sh + +# $Id: copyTools.sh $ + +# This script will copy all necessary tools to either the MacOS folder +# inside Hugin.app or to the HuginStitchProject.app MacOS folder + +bin_dir="$REPOSITORY_DIR/bin" +App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" +HSPAppPath="$App/Contents/Resources/HuginStitchProject.app/Contents/MacOS" + + +Hbins="celeste_standalone pano_trafo vig_optimize autooptimiser cpclean fulla pto2mk calibrate_lens deghosting_mask matchpoint tca_correct pano_modify pto_merge" +HSPbins="PTmender enblend PTblender PTroller enfuse PTmasker gnumake exiv2" +HSPBins2="hugin_hdrmerge nona cplean" + +# Copy to MacOS folder in Hugin.app +for bins in $Hbins +do + cp -Rf $TARGET_BUILD_DIR/$bins "$App/Contents/MacOS/" +done + +# Copy to MacOS folder in HuginStitchProject.app from External folder +for bins in $HSPbins +do + cp -Rf $bin_dir/$bins "$HSPAppPath" +done + +# Copy to MacOS folder in HuginStitchProject.app from Build dir +for bins in $HSPbins2 +do + cp -Rf $TARGET_BUILD_DIR/$bins "$HSPAppPath" +done + Property changes on: hugin/trunk/mac/copyTools.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-05-14 17:29:04
|
Revision: 5157 http://hugin.svn.sourceforge.net/hugin/?rev=5157&view=rev Author: harryvanderwolf Date: 2010-05-14 17:28:58 +0000 (Fri, 14 May 2010) Log Message: ----------- [OSX] facilitate automatic 32bit or 32/64bit build of PTBatcherGui.app bundle Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/trunk/mac/copyPTBatcherGuiBins.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-05-14 08:58:14 UTC (rev 5156) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-05-14 17:28:58 UTC (rev 5157) @@ -781,15 +781,6 @@ 57D50A4A0F595A6300CCDCB5 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; 57D50A4B0F595A6300CCDCB5 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; 57D50A4C0F595A6300CCDCB5 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; - 57D50A4E0F595A6300CCDCB5 /* nona in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5796FA950C4395CC006B7C6E /* nona */; }; - 57D50A4F0F595A6300CCDCB5 /* hugin_hdrmerge in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */; }; - 57D50A500F595A6300CCDCB5 /* enblend in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 570D581A082A9ED50030E768 /* enblend */; }; - 57D50A510F595A6300CCDCB5 /* enfuse in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F79E0D239D6A00A6AD01 /* enfuse */; }; - 57D50A520F595A6300CCDCB5 /* PTblender in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F79F0D239D6A00A6AD01 /* PTblender */; }; - 57D50A530F595A6300CCDCB5 /* PTmasker in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F7A00D239D6A00A6AD01 /* PTmasker */; }; - 57D50A540F595A6300CCDCB5 /* PTmender in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F7A10D239D6A00A6AD01 /* PTmender */; }; - 57D50A550F595A6300CCDCB5 /* PTroller in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F7A20D239D6A00A6AD01 /* PTroller */; }; - 57D50A560F595A6300CCDCB5 /* gnumake in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 570898E30D4CB635008949E7 /* gnumake */; }; 57D50A580F595A6300CCDCB5 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; 57D50A590F595A6300CCDCB5 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; 57D50A5A0F595A6300CCDCB5 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; @@ -2741,25 +2732,6 @@ name = "Copy Executable Files"; runOnlyForDeploymentPostprocessing = 0; }; - 57D50A4D0F595A6300CCDCB5 /* Copy Executable Files */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 6; - files = ( - 57D50A4E0F595A6300CCDCB5 /* nona in Copy Executable Files */, - 57D50A4F0F595A6300CCDCB5 /* hugin_hdrmerge in Copy Executable Files */, - 57D50A500F595A6300CCDCB5 /* enblend in Copy Executable Files */, - 57D50A510F595A6300CCDCB5 /* enfuse in Copy Executable Files */, - 57D50A520F595A6300CCDCB5 /* PTblender in Copy Executable Files */, - 57D50A530F595A6300CCDCB5 /* PTmasker in Copy Executable Files */, - 57D50A540F595A6300CCDCB5 /* PTmender in Copy Executable Files */, - 57D50A550F595A6300CCDCB5 /* PTroller in Copy Executable Files */, - 57D50A560F595A6300CCDCB5 /* gnumake in Copy Executable Files */, - ); - name = "Copy Executable Files"; - runOnlyForDeploymentPostprocessing = 0; - }; 57D50A570F595A6300CCDCB5 /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -3743,6 +3715,7 @@ 73D24B9A1061566B00B8A25D /* cpclean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpclean.cpp; sourceTree = "<group>"; }; 73D24BB11061592C00B8A25D /* CleanCP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CleanCP.cpp; sourceTree = "<group>"; }; 73D24BB21061592C00B8A25D /* CleanCP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CleanCP.h; sourceTree = "<group>"; }; + 73DAADC9119DB8DC002149AC /* copyPTBatcherGuiBins.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = copyPTBatcherGuiBins.sh; sourceTree = "<group>"; }; 73E488F710D5997300A083C8 /* CalculateOptimalROI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CalculateOptimalROI.h; path = algorithms/basic/CalculateOptimalROI.h; sourceTree = "<group>"; }; 73E488F810D5997300A083C8 /* CalculateOptimalROI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CalculateOptimalROI.cpp; path = algorithms/basic/CalculateOptimalROI.cpp; sourceTree = "<group>"; }; 73E6770010F8BF18001807AB /* libhugin_base.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_base.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -4716,6 +4689,7 @@ 73138A2B1183358100DCF373 /* copyTools.sh */, 571D8C910E213879006D0305 /* localise-help.sh */, 571D8C700E213216006D0305 /* patch-xrc.sh */, + 73DAADC9119DB8DC002149AC /* copyPTBatcherGuiBins.sh */, 57A2BC2E0D45422800E9FFEC /* copyExifTool.sh */, 576902090D24DBA100A6AD01 /* complete-bundle.sh */, 739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */, @@ -7558,7 +7532,7 @@ buildPhases = ( 57D50A360F595A6300CCDCB5 /* Sources */, 57D50A380F595A6300CCDCB5 /* Frameworks */, - 57D50A4D0F595A6300CCDCB5 /* Copy Executable Files */, + 73DAADCE119DB90B002149AC /* Copy Excecutable files */, 57D50A570F595A6300CCDCB5 /* Copy Frameworks */, 57D50A5B0F595A6300CCDCB5 /* Locale Script */, 57D50A5C0F595A6300CCDCB5 /* Copy ExifTool */, @@ -8714,6 +8688,20 @@ shellPath = /bin/sh; shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-tools-package.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME/Libraries/*.dylib\nfi"; }; + 73DAADCE119DB90B002149AC /* Copy Excecutable files */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Excecutable files"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/copyPTBatcherGuiBins.sh\nfi"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ Added: hugin/trunk/mac/copyPTBatcherGuiBins.sh =================================================================== --- hugin/trunk/mac/copyPTBatcherGuiBins.sh (rev 0) +++ hugin/trunk/mac/copyPTBatcherGuiBins.sh 2010-05-14 17:28:58 UTC (rev 5157) @@ -0,0 +1,27 @@ +#!/bin/sh + +# $Id: copyPTBatcherGuibin.sh $ + +# This script will copy the necessary binaries to the MacOS folder +# inside PTBatcherGui.app +# This replaces the original copy step in XCode to facilate 32bits builds +# as well as 32/64bit builds. + +bin_dir="$REPOSITORY_DIR/bin" +App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" + + +extbins="PTblender PTmasker PTmender PTroller PTroller enfuse enblend gnumake" +intbins="hugin_hdrmerge nona" + +# Copy external binaries to MacOS folder in PTBatcherGui.app +for bins in $extbins +do + cp -Rf $bin_dir/$bins "$App/Contents/MacOS/" +done + +# Copy internal binaries to MacOS folder in PTBatcherGui.app +for bins in $intbins +do + cp -Rf $TARGET_BUILD_DIR/$bins "$App/Contents/MacOS/" +done Property changes on: hugin/trunk/mac/copyPTBatcherGuiBins.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |