Hugin

Revision: 3541
          http://hugin.svn.sourceforge.net/hugin/?rev=3541&view=rev
Author:   harryvanderwolf
Date:     2008-11-10 17:25:05 +0000 (Mon, 10 Nov 2008)

Log Message:
-----------
Ugly hack to get correct celeste.dylib into bundle

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	2008-11-10 14:28:22 UTC (rev 3540)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2008-11-10 17:25:05 UTC (rev 3541)
@@ -888,8 +888,51 @@
 		734FBA6B0EB3A20500CD7122 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; };
 		734FBA6C0EB3A20500CD7122 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; };
 		734FBA850EB3A40300CD7122 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; };
+		739CADC80EC86F44002FD3AF /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
+		739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; };
+		739CADCA0EC86F44002FD3AF /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; };
+		739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; };
+		739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; };
+		739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; };
+		739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; };
+		739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; };
+		739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; };
+		739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; };
+		739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; };
+		739CADD30EC86F44002FD3AF /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; };
+		739CADD40EC86F44002FD3AF /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; };
+		739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; };
+		739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; };
+		739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; };
+		739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; };
+		739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; };
+		739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; };
+		739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; };
+		739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; };
+		739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; };
+		739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; };
+		739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; };
+		739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; };
 		739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
+		739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		739F84D10EC77EB6004771D6 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739F84D20EC77EB6004771D6 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739F84D30EC77EB6004771D6 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		739F84D40EC77EB6004771D6 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; };
+		739F84D50EC77EB6004771D6 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		739F84D60EC77EB6004771D6 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		739F84D70EC77EB6004771D6 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		739F84D80EC77EB6004771D6 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		739F84D90EC77EB6004771D6 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		739F84DA0EC77EB6004771D6 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		739F84DB0EC77EB6004771D6 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		739F84DC0EC77EB6004771D6 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		739F84DD0EC77EB6004771D6 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		739F84DE0EC77EB6004771D6 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
+		739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
 		73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
 		73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
@@ -1441,6 +1484,20 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
+		739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		739F84FF0EC7803F004771D6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
 		73C958F60DA2C9DB00E19110 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1526,9 +1583,10 @@
 		739F84940EC75736004771D6 /* Copy libraries */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = ../Libraries;
-			dstSubfolderSpec = 16;
+			dstPath = "";
+			dstSubfolderSpec = 7;
 			files = (
+				739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */,
 			);
 			name = "Copy libraries";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2175,6 +2233,9 @@
 		734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonaOptionsDialog.cpp; sourceTree = "<group>"; };
 		734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonaOptionsDialog.h; sourceTree = "<group>"; };
 		736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; };
+		739CADAA0EC86B30002FD3AF /* celeste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = celeste.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste Framework-Info.plist"; sourceTree = "<group>"; };
+		739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste2 Framework-Info.plist"; sourceTree = "<group>"; };
 		739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "../../ExternalPrograms/repository/lib/libwx_macu_gl-2.8.dylib"; sourceTree = SOURCE_ROOT; };
 		73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2603,6 +2664,24 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */,
+				739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */,
+				739F84D10EC77EB6004771D6 /* HuginBase.framework in Frameworks */,
+				739F84D20EC77EB6004771D6 /* HuginVigraImpex.framework in Frameworks */,
+				739F84D30EC77EB6004771D6 /* libboost_thread.dylib in Frameworks */,
+				739F84D40EC77EB6004771D6 /* libexiv2.a in Frameworks */,
+				739F84D50EC77EB6004771D6 /* libexpat.dylib in Frameworks */,
+				739F84D60EC77EB6004771D6 /* libHalf.dylib in Frameworks */,
+				739F84D70EC77EB6004771D6 /* libiconv.dylib in Frameworks */,
+				739F84D80EC77EB6004771D6 /* libIex.dylib in Frameworks */,
+				739F84D90EC77EB6004771D6 /* libIlmImf.dylib in Frameworks */,
+				739F84DA0EC77EB6004771D6 /* libIlmThread.dylib in Frameworks */,
+				739F84DB0EC77EB6004771D6 /* libImath.dylib in Frameworks */,
+				739F84DC0EC77EB6004771D6 /* libjpeg.dylib in Frameworks */,
+				739F84DD0EC77EB6004771D6 /* libpano13.dylib in Frameworks */,
+				739F84DE0EC77EB6004771D6 /* libpng.dylib in Frameworks */,
+				739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */,
+				739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2613,6 +2692,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		739CADA80EC86B30002FD3AF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73C958F90DA2C9DB00E19110 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -3726,6 +3812,9 @@
 				573B8F3E067BA2EB00B7B355 /* Product */,
 				734FB8D00EB38AB600CD7122 /* libceleste.dylib */,
 				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
+				739CADAA0EC86B30002FD3AF /* celeste.framework */,
+				739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */,
+				739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -4319,6 +4408,26 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		739CADA50EC86B30002FD3AF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739CADC80EC86F44002FD3AF /* Celeste.h in Headers */,
+				739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */,
+				739CADCA0EC86F44002FD3AF /* Config.h in Headers */,
+				739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */,
+				739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */,
+				739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */,
+				739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */,
+				739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */,
+				739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */,
+				739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */,
+				739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */,
+				739CADD30EC86F44002FD3AF /* svm.h in Headers */,
+				739CADD40EC86F44002FD3AF /* Utilities.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -4838,6 +4947,8 @@
 			buildRules = (
 			);
 			dependencies = (
+				739F84FE0EC7803F004771D6 /* PBXTargetDependency */,
+				739F85000EC7803F004771D6 /* PBXTargetDependency */,
 			);
 			name = PTBatcher;
 			productName = PTBatcher;
@@ -4861,6 +4972,24 @@
 			productReference = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
+		739CADA90EC86B30002FD3AF /* celeste Framework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */;
+			buildPhases = (
+				739CADA50EC86B30002FD3AF /* Headers */,
+				739CADA60EC86B30002FD3AF /* Resources */,
+				739CADA70EC86B30002FD3AF /* Sources */,
+				739CADA80EC86B30002FD3AF /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "celeste Framework";
+			productName = "celeste Framework";
+			productReference = 739CADAA0EC86B30002FD3AF /* celeste.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 		73C958F40DA2C9DB00E19110 /* tca_correct static */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */;
@@ -4954,6 +5083,7 @@
 				5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */,
 				576900A90D24D29300A6AD01 /* hugin_base Framework */,
 				576900D70D24D32C00A6AD01 /* base_wx Framework */,
+				739CADA90EC86B30002FD3AF /* celeste Framework */,
 				571046810D25F698006A3C69 /* bundled tools */,
 				5796FA730C4395CC006B7C6E /* nona dynamic */,
 				5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */,
@@ -5082,6 +5212,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		739CADA60EC86B30002FD3AF /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -5711,6 +5848,24 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		739CADA70EC86B30002FD3AF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */,
+				739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */,
+				739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */,
+				739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */,
+				739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */,
+				739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */,
+				739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */,
+				739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */,
+				739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */,
+				739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */,
+				739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73C958F70DA2C9DB00E19110 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6015,6 +6170,16 @@
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 7332AE950D8D4986002BF5FF /* PBXContainerItemProxy */;
 		};
+		739F84FE0EC7803F004771D6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */;
+		};
+		739F85000EC7803F004771D6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 739F84FF0EC7803F004771D6 /* PBXContainerItemProxy */;
+		};
 		73C958F50DA2C9DB00E19110 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 57E3470D0C4A8E95006AA781 /* lib static */;
@@ -7872,6 +8037,13 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				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\"";
 				PREBINDING = NO;
 				PRODUCT_NAME = PTBatcher;
 			};
@@ -7887,6 +8059,13 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				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\"";
 				PREBINDING = NO;
 				PRODUCT_NAME = PTBatcher;
 			};
@@ -7901,6 +8080,8 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				HEADER_SEARCH_PATHS = (
+					../src/hugin1/base_wx,
+					../src/foreign/vigra,
 					"$(REPOSITORY_DIR)/include",
 					../src/PTBatcher,
 					"$(inherited)",
@@ -7908,6 +8089,7 @@
 					"$(WX_INCLUDE_DIR_LIB)",
 				);
 				INSTALL_PATH = /usr/local/bin;
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PREBINDING = NO;
 				PRODUCT_NAME = PTBatcher;
 				ZERO_LINK = NO;
@@ -7986,6 +8168,94 @@
 			};
 			name = Release;
 		};
+		739CADAF0EC86B30002FD3AF /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_VERSION = A;
+				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/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "celeste Framework-Info.plist";
+				INSTALL_PATH = "$(HOME)/Library/Frameworks";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = "celeste Framework";
+			};
+			name = Debug;
+		};
+		739CADB00EC86B30002FD3AF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_VERSION = A;
+				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/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "celeste Framework-Info.plist";
+				INSTALL_PATH = "$(HOME)/Library/Frameworks";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = "celeste Framework";
+			};
+			name = Development;
+		};
+		739CADB10EC86B30002FD3AF /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DYLIB_COMPATIBILITY_VERSION = 0;
+				DYLIB_CURRENT_VERSION = 0;
+				FRAMEWORK_VERSION = A;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					/usr/include,
+					"$(REPOSITORY_DIR)/include",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "celeste Framework-Info.plist";
+				INSTALL_PATH = "@executable_path/../Frameworks";
+				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
+				OTHER_LDFLAGS = (
+					"-flat_namespace",
+					"-framework",
+					Carbon,
+					"-undefined",
+					suppress,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = celeste;
+				USER_HEADER_SEARCH_PATHS = "$(inherited)";
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 		73C959100DA2C9DB00E19110 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8517,6 +8787,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				739CADAF0EC86B30002FD3AF /* Debug */,
+				739CADB00EC86B30002FD3AF /* Development */,
+				739CADB10EC86B30002FD3AF /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Modified: hugin/trunk/mac/complete-bundle.sh
===================================================================
--- hugin/trunk/mac/complete-bundle.sh	2008-11-10 14:28:22 UTC (rev 3540)
+++ hugin/trunk/mac/complete-bundle.sh	2008-11-10 17:25:05 UTC (rev 3541)
@@ -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 libceleste libGLEW" 
+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 libGLEW" 
 
 binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*"
 
@@ -23,6 +23,12 @@
  cp -Rf $dylib_dir/$dylib.*ylib "$App/Contents/$dylib_install_loc/"
 done
 
+# Temporary fix. Move libcelste.dylib from Resource to $dylib_install_loc
+mv "$App/Contents/Resources/libceleste.dylib" "$App/Contents/$dylib_install_loc/"   
+
+# We need to specify this line again, now with libceleste added
+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 libceleste libGLEW"
+
 #replace any "$old_install_name_dirname[/*]/" in install_name to "$new_install_name_dirname/"
  
 for exec_file in $binaries


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3591
          http://hugin.svn.sourceforge.net/hugin/?rev=3591&view=rev
Author:   harryvanderwolf
Date:     2009-01-25 14:33:45 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
Minor XCode improvements; also adding first PtBatcherGui build

Modified Paths:
--------------
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj

Added Paths:
-----------
    hugin/trunk/mac/celeste-Config.h

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-01-24 22:45:41 UTC (rev 3590)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-01-25 14:33:45 UTC (rev 3591)
@@ -144,6 +144,29 @@
 			name = "configure hugin_version.h";
 			productName = "configure hugin_version.h";
 		};
+		733490BB0ECB2B99006309E3 /* Dylibs */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 733490C10ECB2BDA006309E3 /* Build configuration list for PBXAggregateTarget "Dylibs" */;
+			buildPhases = (
+			);
+			dependencies = (
+				73F800130F2CABCA00C22CB9 /* PBXTargetDependency */,
+				733490C00ECB2BB9006309E3 /* PBXTargetDependency */,
+			);
+			name = Dylibs;
+			productName = Dylibs;
+		};
+		73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 73F800110F2CAB7200C22CB9 /* Build configuration list for PBXAggregateTarget "Copy celeste config.h" */;
+			buildPhases = (
+				73F8000C0F2CAB5300C22CB9 /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = "Copy celeste config.h";
+			productName = "Copy celeste config.h";
+		};
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
@@ -819,6 +842,17 @@
 		57FEE0FF0D28835400DAF7A4 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
 		57FEE1000D28835400DAF7A4 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
 		57FEE1010D28835400DAF7A4 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		732A11920EDA092E00EB5159 /* RunStitchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF6D0EB8EC7B007EBA09 /* RunStitchFrame.h */; };
+		732A11D60EDA987B00EB5159 /* Batch.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF630EB8EC7B007EBA09 /* Batch.h */; };
+		732A11D70EDA987B00EB5159 /* ProjectArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF660EB8EC7B007EBA09 /* ProjectArray.h */; };
+		732A11D80EDA98C500EB5159 /* BatchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2D0EB39F5100CD7122 /* BatchFrame.h */; };
+		732A11D90EDA98C500EB5159 /* DirTraverser.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2F0EB39F5100CD7122 /* DirTraverser.h */; };
+		732A11DA0EDA98C500EB5159 /* ProjectListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA310EB39F5100CD7122 /* ProjectListBox.h */; };
+		732A11DB0EDA98C500EB5159 /* PTBatcherGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA340EB39F5100CD7122 /* PTBatcherGUI.h */; };
+		732A11DC0EDA993500EB5159 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF620EB8EC7B007EBA09 /* Batch.cpp */; };
+		732A11DD0EDA993500EB5159 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; };
+		732A11DE0EDA993500EB5159 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; };
+		732A11DF0EDA998500EB5159 /* PTBatcherGUI_rc.rc in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA360EB39F5200CD7122 /* PTBatcherGUI_rc.rc */; };
 		7332AE990D8D4986002BF5FF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		7332AE9C0D8D4986002BF5FF /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
 		7332AE9D0D8D4986002BF5FF /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
@@ -888,6 +922,7 @@
 		734FBA6B0EB3A20500CD7122 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; };
 		734FBA6C0EB3A20500CD7122 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; };
 		734FBA850EB3A40300CD7122 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; };
+		7358165D0ECA0D98009E94DC /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; };
 		737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
 		7394A2020EC8A8F000DCEE85 /* celeste.model in Resources */ = {isa = PBXBuildFile; fileRef = 734FB8E80EB38B9400CD7122 /* celeste.model */; };
 		739CADC80EC86F44002FD3AF /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
@@ -935,6 +970,31 @@
 		739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
 		739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
 		739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
+		73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; };
+		73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		73C0B5760ED024CE00A33108 /* hugin_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E122480D2BE45700743A93 /* hugin_version.h */; };
+		73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; };
+		73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		73C3C94C0ECCB40900A3089A /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		73C3C94D0ECCB40900A3089A /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
+		73C3C94E0ECCB40900A3089A /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
+		73C3C94F0ECCB40900A3089A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		73C3C9500ECCB4AA00A3089A /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */; };
+		73C3C9510ECCB4AA00A3089A /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */; };
+		73C3C9520ECCB4AA00A3089A /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */; };
 		73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
 		73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
@@ -1500,11 +1560,25 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
+		733490BF0ECB2BB9006309E3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 734FB8CF0EB38AB600CD7122;
+			remoteInfo = celeste;
+		};
+		733490C40ECB2BE9006309E3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 733490BB0ECB2B99006309E3;
+			remoteInfo = Dylibs;
+		};
 		737E1C1F0EC9EC5100BA4D9B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1 /* configure */;
+			remoteGlobalIDString = 57C486290C3121E8002D79F1;
 			remoteInfo = configure;
 		};
 		739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */ = {
@@ -1521,6 +1595,13 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
+		73C3C93C0ECCB3EB00A3089A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FC280D24A26400A6AD01;
+			remoteInfo = frameworks;
+		};
 		73C958F60DA2C9DB00E19110 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1542,6 +1623,13 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
+		73F800120F2CABCA00C22CB9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73F8000D0F2CAB5300C22CB9;
+			remoteInfo = "Copy celeste config.h";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1614,6 +1702,19 @@
 			name = "Copy libraries";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73B9576B0EFADC4200CB2012 /* Copy Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */,
+				73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */,
+				73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */,
+			);
+			name = "Copy Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -2255,13 +2356,16 @@
 		734FBA5A0EB3A20500CD7122 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; };
 		734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonaOptionsDialog.cpp; sourceTree = "<group>"; };
 		734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonaOptionsDialog.h; sourceTree = "<group>"; };
+		7358165C0ECA0D98009E94DC /* CelesteDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteDebug.h; 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>"; };
-		739CADAA0EC86B30002FD3AF /* celeste Framework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "celeste Framework.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste Framework-Info.plist"; sourceTree = "<group>"; };
 		739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste2 Framework-Info.plist"; sourceTree = "<group>"; };
 		739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "../../ExternalPrograms/repository/lib/libwx_macu_gl-2.8.dylib"; sourceTree = SOURCE_ROOT; };
+		73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		73C3C9340ECCB39700A3089A /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; };
+		73C3C98E0ECCC9DE00A3089A /* celeste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = celeste.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; 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; };
 		73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-xgcc40-mt-1_36.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-xgcc40-mt-1_36.a"; sourceTree = SOURCE_ROOT; };
@@ -2724,6 +2828,31 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C3C9300ECCB39700A3089A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */,
+				73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */,
+				73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */,
+				73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */,
+				73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */,
+				73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */,
+				73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */,
+				73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */,
+				73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */,
+				73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */,
+				73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */,
+				73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */,
+				73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */,
+				73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */,
+				73C3C94C0ECCB40900A3089A /* libtiff.dylib in Frameworks */,
+				73C3C94D0ECCB40900A3089A /* libwx_macu-2.8.dylib in Frameworks */,
+				73C3C94E0ECCB40900A3089A /* libwx_macu_gl-2.8.dylib in Frameworks */,
+				73C3C94F0ECCB40900A3089A /* libz.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73C958F90DA2C9DB00E19110 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -3858,10 +3987,12 @@
 				573B8F3E067BA2EB00B7B355 /* Product */,
 				734FB8D00EB38AB600CD7122 /* libceleste.dylib */,
 				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
-				739CADAA0EC86B30002FD3AF /* celeste Framework.framework */,
 				739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */,
 				739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */,
 				73EBC0900EC9E0B20068B821 /* celeste_standalone */,
+				73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */,
+				73C3C9340ECCB39700A3089A /* PTBatcherGUI-Info.plist */,
+				73C3C98E0ECCC9DE00A3089A /* celeste.framework */,
 			);
 			sourceTree = "<group>";
 		};
@@ -3948,6 +4079,7 @@
 		734FB8DC0EB38B9400CD7122 /* celeste */ = {
 			isa = PBXGroup;
 			children = (
+				7358165C0ECA0D98009E94DC /* CelesteDebug.h */,
 				734FB8DD0EB38B9400CD7122 /* Celeste.cpp */,
 				734FB8DE0EB38B9400CD7122 /* Celeste.h */,
 				734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */,
@@ -4475,11 +4607,27 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C0B5780ED024EC00A33108 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				732A11D80EDA98C500EB5159 /* BatchFrame.h in Headers */,
+				732A11D90EDA98C500EB5159 /* DirTraverser.h in Headers */,
+				732A11DA0EDA98C500EB5159 /* ProjectListBox.h in Headers */,
+				732A11DB0EDA98C500EB5159 /* PTBatcherGUI.h in Headers */,
+				732A11D60EDA987B00EB5159 /* Batch.h in Headers */,
+				732A11D70EDA987B00EB5159 /* ProjectArray.h in Headers */,
+				732A11920EDA092E00EB5159 /* RunStitchFrame.h in Headers */,
+				73C0B5760ED024CE00A33108 /* hugin_version.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73EBC0CF0EC9E4A00068B821 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */,
+				7358165D0ECA0D98009E94DC /* CelesteDebug.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4933,6 +5081,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				733490C50ECB2BE9006309E3 /* PBXTargetDependency */,
 				576901B80D24D61C00A6AD01 /* PBXTargetDependency */,
 				5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */,
 			);
@@ -5042,9 +5191,34 @@
 			);
 			name = "celeste Framework";
 			productName = "celeste Framework";
-			productReference = 739CADAA0EC86B30002FD3AF /* celeste Framework.framework */;
+			productReference = 73C3C98E0ECCC9DE00A3089A /* celeste.framework */;
 			productType = "com.apple.product-type.framework";
 		};
+		73C3C9310ECCB39700A3089A /* PTBatcherGUI */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 73C3C9380ECCB39900A3089A /* Build configuration list for PBXNativeTarget "PTBatcherGUI" */;
+			buildPhases = (
+				73C3C92E0ECCB39700A3089A /* Resources */,
+				73C3C92F0ECCB39700A3089A /* Sources */,
+				73C3C9300ECCB39700A3089A /* Frameworks */,
+				73C0B5780ED024EC00A33108 /* Headers */,
+				73B9576B0EFADC4200CB2012 /* Copy Frameworks */,
+				73B9574D0EFAD9E500CB2012 /* Patch XRC */,
+				73B957560EFADA8D00CB2012 /* Locale Script */,
+				73B9575A0EFADAE100CB2012 /* Localise Help */,
+				73B957490EFAD9C000CB2012 /* Complete Bundle */,
+				73B957620EFADB6500CB2012 /* Complete Embedding */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				73C3C93D0ECCB3EB00A3089A /* PBXTargetDependency */,
+			);
+			name = PTBatcherGUI;
+			productName = PTBatcherGUI;
+			productReference = 73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */;
+			productType = "com.apple.product-type.application";
+		};
 		73C958F40DA2C9DB00E19110 /* tca_correct static */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */;
@@ -5136,7 +5310,9 @@
 				57FF7DA00E6917BF00553709 /* set svn revision */,
 				57FF7DC10E691A1800553709 /* configure hugin_version.h */,
 				57FF7DBB0E6919F400553709 /* copy hugin_config.h */,
+				73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */,
 				57E3470D0C4A8E95006AA781 /* lib static */,
+				733490BB0ECB2B99006309E3 /* Dylibs */,
 				5720E4720BD456CD00E63404 /* levmar */,
 				734FB8CF0EB38AB600CD7122 /* celeste */,
 				5749F8A2067B60CA00A6EDD4 /* jhead */,
@@ -5164,6 +5340,7 @@
 				5769F5FF0D23825700A6AD01 /* StitchProject */,
 				57E3467D0C4A89B0006AA781 /* Hugin */,
 				57525A240C54BC4400BF8096 /* Nona */,
+				73C3C9310ECCB39700A3089A /* PTBatcherGUI */,
 				57E347330C4A8EED006AA781 /* tools */,
 				57D382D00E2369FC00445A37 /* nona static */,
 				57D382ED0E236A0800445A37 /* matchpoint static */,
@@ -5294,6 +5471,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C3C92E0ECCB39700A3089A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -5475,6 +5659,93 @@
 			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/^.*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";
 		};
+		73B957490EFAD9C000CB2012 /* 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;
+		};
+		73B9574D0EFAD9E500CB2012 /* Patch XRC */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Patch XRC";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/patch-xrc.sh\nfi";
+		};
+		73B957560EFADA8D00CB2012 /* 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;
+		};
+		73B9575A0EFADAE100CB2012 /* 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;
+		};
+		73B957620EFADB6500CB2012 /* 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;
+		};
+		73F8000C0F2CAB5300C22CB9 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -5941,6 +6212,20 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C3C92F0ECCB39700A3089A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				732A11DC0EDA993500EB5159 /* Batch.cpp in Sources */,
+				732A11DF0EDA998500EB5159 /* PTBatcherGUI_rc.rc in Sources */,
+				732A11DD0EDA993500EB5159 /* ProjectArray.cpp in Sources */,
+				732A11DE0EDA993500EB5159 /* RunStitchFrame.cpp in Sources */,
+				73C3C9500ECCB4AA00A3089A /* BatchFrame.cpp in Sources */,
+				73C3C9510ECCB4AA00A3089A /* ProjectListBox.cpp in Sources */,
+				73C3C9520ECCB4AA00A3089A /* PTBatcherGUI.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73C958F70DA2C9DB00E19110 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6253,6 +6538,16 @@
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 7332AE950D8D4986002BF5FF /* PBXContainerItemProxy */;
 		};
+		733490C00ECB2BB9006309E3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 734FB8CF0EB38AB600CD7122 /* celeste */;
+			targetProxy = 733490BF0ECB2BB9006309E3 /* PBXContainerItemProxy */;
+		};
+		733490C50ECB2BE9006309E3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 733490BB0ECB2B99006309E3 /* Dylibs */;
+			targetProxy = 733490C40ECB2BE9006309E3 /* PBXContainerItemProxy */;
+		};
 		737E1C200EC9EC5100BA4D9B /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 57C486290C3121E8002D79F1 /* configure */;
@@ -6268,6 +6563,11 @@
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 739F84FF0EC7803F004771D6 /* PBXContainerItemProxy */;
 		};
+		73C3C93D0ECCB3EB00A3089A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FC280D24A26400A6AD01 /* frameworks */;
+			targetProxy = 73C3C93C0ECCB3EB00A3089A /* PBXContainerItemProxy */;
+		};
 		73C958F50DA2C9DB00E19110 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 57E3470D0C4A8E95006AA781 /* lib static */;
@@ -6283,6 +6583,11 @@
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 73E79F340D674EF400C07126 /* PBXContainerItemProxy */;
 		};
+		73F800130F2CABCA00C22CB9 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */;
+			targetProxy = 73F800120F2CABCA00C22CB9 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -8115,6 +8420,37 @@
 			};
 			name = Release;
 		};
+		733490BC0ECB2B9B006309E3 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = Dylibs;
+			};
+			name = Debug;
+		};
+		733490BD0ECB2B9B006309E3 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = Dylibs;
+			};
+			name = Development;
+		};
+		733490BE0ECB2B9B006309E3 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				PRODUCT_NAME = Dylibs;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 		734BDF5D0EB8EC1A007EBA09 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8166,19 +8502,50 @@
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_MODEL_TUNING = G5;
+				GCC_MODEL_TUNING = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					WX_PRECOMP,
+					__WXMAC__,
+					"_FILE_OFFSET_BITS=64",
+					_LARGE_FILES,
+					NO_GCC_PRAGMA,
+				);
 				HEADER_SEARCH_PATHS = (
+					../src/PTBatcher,
 					../src/hugin1/base_wx,
 					../src/foreign/vigra,
+					../src/foreign/vigra/vigra,
+					../src/hugin_base/vigra_ext,
+					../src/hugin_base/panodata,
 					"$(REPOSITORY_DIR)/include",
-					../src/PTBatcher,
 					"$(inherited)",
 					"$(WX_INCLUDE_DIR)",
 					"$(WX_INCLUDE_DIR_LIB)",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
 				);
 				INSTALL_PATH = /usr/local/bin;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				PREBINDING = NO;
+				OTHER_CFLAGS = (
+					"-I$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-2.8",
+					"-I$(REPOSITORY_DIR)/include/wx-2.8",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_1)",
+					"$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_2)",
+					"$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_3)",
+					"$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_4)",
+					"-dead-strip",
+					"-lwx_macu-2.8",
+				);
+				OTHER_LDFLAGS_QUOTED_FOR_TARGET_1 = "\"$(REPOSITORY_DIR)/lib\"";
+				OTHER_LDFLAGS_QUOTED_FOR_TARGET_2 = "\"$(REPOSITORY_DIR)/include\"";
+				OTHER_LDFLAGS_QUOTED_FOR_TARGET_3 = "\"$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-2.8\"";
+				OTHER_LDFLAGS_QUOTED_FOR_TARGET_4 = "\"$(REPOSITORY_DIR)/include/wx-2.8\"";
+				PREBINDING = YES;
 				PRODUCT_NAME = PTBatcher;
 				ZERO_LINK = NO;
 			};
@@ -8230,7 +8597,6 @@
 				HEADER_SEARCH_PATHS = (
 					../src/foreign,
 					../src/foreign/vigra,
-					../src/foreign/vigra/vigra,
 					../src/hugin_base,
 					"$(REPOSITORY_DIR)/include",
 					/usr/include,
@@ -8247,7 +8613,7 @@
 					"-undefined",
 					suppress,
 				);
-				PREBINDING = YES;
+				PREBINDING = NO;
 				PRIVATE_HEADERS_FOLDER_PATH = "";
 				PRODUCT_NAME = celeste;
 				PUBLIC_HEADERS_FOLDER_PATH = "";
@@ -8316,12 +8682,13 @@
 				DYLIB_CURRENT_VERSION = 0;
 				FRAMEWORK_VERSION = A;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_MODEL_TUNING = G5;
+				GCC_MODEL_TUNING = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				GCC_PREFIX_HEADER = "";
 				HEADER_SEARCH_PATHS = (
 					../src/foreign,
 					../src/foreign/vigra,
+					../src/foreign/vigra/vigra,
 					../src/hugin_base,
 					/usr/include,
 					"$(REPOSITORY_DIR)/include",
@@ -8330,6 +8697,11 @@
 				INFOPLIST_FILE = "celeste Framework-Info.plist";
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
+				LIBRARY_SEARCH_PATHS = (
+					/usr/lib,
+					"$(value)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-framework",
@@ -8344,6 +8716,126 @@
 			};
 			name = Release;
 		};
+		73C3C9350ECCB39900A3089A /* 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/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "PTBatcherGUI-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = PTBatcherGUI;
+			};
+			name = Debug;
+		};
+		73C3C9360ECCB39900A3089A /* 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/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "PTBatcherGUI-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = PTBatcherGUI;
+			};
+			name = Development;
+		};
+		73C3C9370ECCB39900A3089A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = "$(WX_ARCH)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEPLOYMENT_POSTPROCESSING = NO;
+				GCC_DEBUGGING_SYMBOLS = default;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = "";
+				GCC_PRECOMPILE_PREFIX_HEADER = 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,
+					../src/hugin_base,
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/celeste,
+					"$(REPOSITORY_DIR)/include",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+					"$(WX_INCLUDE_DIR)",
+					"$(WX_INCLUDE_DIR_LIB)",
+					../src/hugin1,
+				);
+				INFOPLIST_FILE = "../mac/PTBatcherGUI-Info.plist";
+				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 = (
+					"-flat_namespace",
+					"-undefined",
+					suppress,
+					"-lwx_macu_gl-2.8",
+					"-lwx_macu-2.8",
+				);
+				PREBINDING = YES;
+				PRODUCT_NAME = PTBatcherGUI;
+				STRIP_INSTALLED_PRODUCT = YES;
+				STRIP_STYLE = "non-global";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 		73C959100DA2C9DB00E19110 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8530,6 +9022,37 @@
 			};
 			name = Release;
 		};
+		73F8000E0F2CAB5300C22CB9 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = "Copy celeste config.h";
+			};
+			name = Debug;
+		};
+		73F8000F0F2CAB5300C22CB9 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = "Copy celeste config.h";
+			};
+			name = Development;
+		};
+		73F800100F2CAB5300C22CB9 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				PRODUCT_NAME = "Copy celeste config.h";
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -8933,6 +9456,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		733490C10ECB2BDA006309E3 /* Build configuration list for PBXAggregateTarget "Dylibs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				733490BC0ECB2B9B006309E3 /* Debug */,
+				733490BD0ECB2B9B006309E3 /* Development */,
+				733490BE0ECB2B9B006309E3 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -8963,6 +9496,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		73C3C9380ECCB39900A3089A /* Build configuration list for PBXNativeTarget "PTBatcherGUI" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				73C3C9350ECCB39900A3089A /* Debug */,
+				73C3C9360ECCB39900A3089A /* Development */,
+				73C3C9370ECCB39900A3089A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -8993,6 +9536,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		73F800110F2CAB7200C22CB9 /* Build configuration list for PBXAggregateTarget "Copy celeste config.h" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				73F8000E0F2CAB5300C22CB9 /* Debug */,
+				73F8000F0F2CAB5300C22CB9 /* Development */,
+				73F800100F2CAB5300C22CB9 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 57FC3AC10675E43600C3E0AC /* Project object */;

Added: hugin/trunk/mac/celeste-Config.h
===================================================================
--- hugin/trunk/mac/celeste-Config.h	                        (rev 0)
+++ hugin/trunk/mac/celeste-Config.h	2009-01-25 14:33:45 UTC (rev 3591)
@@ -0,0 +1,4 @@
+#ifndef __CELESTE_CONFIG__
+#define __CELESTE_CONFIG__
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3682
          http://hugin.svn.sourceforge.net/hugin/?rev=3682&view=rev
Author:   ippei
Date:     2009-02-28 13:31:12 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Mac: compilation fixed for celeste and PTBatcherGUI.

Modified Paths:
--------------
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
    hugin/trunk/mac/complete-bundle.sh
    hugin/trunk/mac/copyExifTool.sh
    hugin/trunk/mac/patch-xrc.sh

Added Paths:
-----------
    hugin/trunk/mac/PTBatcherGUI-Info.plist
    hugin/trunk/mac/celeste-Info.plist

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-02-28 12:40:28 UTC (rev 3681)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-02-28 13:31:12 UTC (rev 3682)
@@ -144,29 +144,6 @@
 			name = "configure hugin_version.h";
 			productName = "configure hugin_version.h";
 		};
-		733490BB0ECB2B99006309E3 /* Dylibs */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 733490C10ECB2BDA006309E3 /* Build configuration list for PBXAggregateTarget "Dylibs" */;
-			buildPhases = (
-			);
-			dependencies = (
-				73F800130F2CABCA00C22CB9 /* PBXTargetDependency */,
-				733490C00ECB2BB9006309E3 /* PBXTargetDependency */,
-			);
-			name = Dylibs;
-			productName = Dylibs;
-		};
-		73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 73F800110F2CAB7200C22CB9 /* Build configuration list for PBXAggregateTarget "Copy celeste config.h" */;
-			buildPhases = (
-				73F8000C0F2CAB5300C22CB9 /* ShellScript */,
-			);
-			dependencies = (
-			);
-			name = "Copy celeste config.h";
-			productName = "Copy celeste config.h";
-		};
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
@@ -779,10 +756,106 @@
 		57D3832B0E236B1D00445A37 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
 		57D3832C0E236B1D00445A37 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; };
 		57D3832D0E236B1D00445A37 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; };
+		57D5093C0F5942FB00CCDCB5 /* CPImagesComboBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57D5093A0F5942F200CCDCB5 /* CPImagesComboBox.cpp */; };
+		57D50A390F595A6300CCDCB5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; };
+		57D50A3A0F595A6300CCDCB5 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; };
+		57D50A3B0F595A6300CCDCB5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		57D50A3C0F595A6300CCDCB5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		57D50A3D0F595A6300CCDCB5 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; };
+		57D50A3E0F595A6300CCDCB5 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		57D50A3F0F595A6300CCDCB5 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		57D50A400F595A6300CCDCB5 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		57D50A410F595A6300CCDCB5 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		57D50A420F595A6300CCDCB5 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
+		57D50A430F595A6300CCDCB5 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		57D50A440F595A6300CCDCB5 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		57D50A450F595A6300CCDCB5 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		57D50A460F595A6300CCDCB5 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		57D50A470F595A6300CCDCB5 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		57D50A480F595A6300CCDCB5 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		57D50A490F595A6300CCDCB5 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		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 */; };
+		57D50A660F595AD500CCDCB5 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF620EB8EC7B007EBA09 /* Batch.cpp */; };
+		57D50A670F595AD500CCDCB5 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; };
+		57D50A680F595AD500CCDCB5 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; };
+		57D50A690F595AD500CCDCB5 /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */; };
+		57D50A6A0F595AD500CCDCB5 /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */; };
+		57D50A6B0F595AD500CCDCB5 /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */; };
+		57D50AC20F596D4900CCDCB5 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; };
+		57D50AC70F596D6900CCDCB5 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; };
+		57D50ADC0F596E3D00CCDCB5 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
+		57D50ADD0F596E3D00CCDCB5 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; };
+		57D50ADE0F596E3D00CCDCB5 /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; };
+		57D50ADF0F596E3D00CCDCB5 /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; };
+		57D50AE00F596E3D00CCDCB5 /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; };
+		57D50AE10F596E3D00CCDCB5 /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; };
+		57D50AE20F596E3D00CCDCB5 /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; };
+		57D50AE30F596E3D00CCDCB5 /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; };
+		57D50AE40F596E3D00CCDCB5 /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; };
+		57D50AE50F596E3D00CCDCB5 /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; };
+		57D50AE60F596E3D00CCDCB5 /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; };
+		57D50AE70F596E3D00CCDCB5 /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; };
+		57D50AE80F596E3D00CCDCB5 /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; };
+		57D50AE90F596E5300CCDCB5 /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; };
+		57D50AEA0F596E5300CCDCB5 /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; };
+		57D50AEB0F596E5300CCDCB5 /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; };
+		57D50AEC0F596E5300CCDCB5 /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; };
+		57D50AED0F596E5300CCDCB5 /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; };
+		57D50AEE0F596E5300CCDCB5 /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; };
+		57D50AEF0F596E5300CCDCB5 /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; };
+		57D50AF00F596E5300CCDCB5 /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; };
+		57D50AF10F596E5300CCDCB5 /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; };
+		57D50AF20F596E5300CCDCB5 /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; };
+		57D50AF30F596E5300CCDCB5 /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; };
+		57D50B060F59715000CCDCB5 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; };
+		57D50B3C0F5971A600CCDCB5 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F60EB38B9500CD7122 /* Main.cpp */; };
+		57D50B400F5971A600CCDCB5 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; };
+		57D50B410F5971A600CCDCB5 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		57D50B420F5971A600CCDCB5 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		57D50B430F5971A600CCDCB5 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		57D50B440F5971A600CCDCB5 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		57D50B450F5971A600CCDCB5 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		57D50B460F5971A600CCDCB5 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		57D50B470F5971A600CCDCB5 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		57D50B480F5971A600CCDCB5 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		57D50B490F5971A600CCDCB5 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		57D50B4A0F5971A600CCDCB5 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		57D50B4C0F5971A600CCDCB5 /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
+		57D50B4D0F5971A600CCDCB5 /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; };
+		57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libceleste.a */; };
+		57D50B610F59725E00CCDCB5 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
+		57D50B620F59725E00CCDCB5 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; };
+		57D50B630F59725E00CCDCB5 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; };
+		57D50B640F59725E00CCDCB5 /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; };
+		57D50B650F59725E00CCDCB5 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; };
+		57D50B660F59725E00CCDCB5 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; };
+		57D50B670F59725E00CCDCB5 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; };
+		57D50B680F59725E00CCDCB5 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; };
+		57D50B690F59725E00CCDCB5 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; };
+		57D50B6A0F59725E00CCDCB5 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; };
+		57D50B6B0F59725E00CCDCB5 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; };
+		57D50B6C0F59725E00CCDCB5 /* libhugin_app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhugin_app.a */; };
 		57DB9BC10C454BA2004957C2 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; };
 		57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; };
 		57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; };
 		57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; };
+		57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; };
+		57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; };
+		57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		57E1225C0D2BE50700743A93 /* align_image_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5769F83B0D23A98400A6AD01 /* align_image_stack.cpp */; };
 		57E346880C4A89E6006AA781 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331010C4A8859006AA781 /* AssistantPanel.cpp */; };
 		57E3468A0C4A89E6006AA781 /* AutoCtrlPointCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */; };
@@ -842,17 +915,6 @@
 		57FEE0FF0D28835400DAF7A4 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
 		57FEE1000D28835400DAF7A4 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
 		57FEE1010D28835400DAF7A4 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
-		732A11920EDA092E00EB5159 /* RunStitchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF6D0EB8EC7B007EBA09 /* RunStitchFrame.h */; };
-		732A11D60EDA987B00EB5159 /* Batch.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF630EB8EC7B007EBA09 /* Batch.h */; };
-		732A11D70EDA987B00EB5159 /* ProjectArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF660EB8EC7B007EBA09 /* ProjectArray.h */; };
-		732A11D80EDA98C500EB5159 /* BatchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2D0EB39F5100CD7122 /* BatchFrame.h */; };
-		732A11D90EDA98C500EB5159 /* DirTraverser.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2F0EB39F5100CD7122 /* DirTraverser.h */; };
-		732A11DA0EDA98C500EB5159 /* ProjectListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA310EB39F5100CD7122 /* ProjectListBox.h */; };
-		732A11DB0EDA98C500EB5159 /* PTBatcherGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA340EB39F5100CD7122 /* PTBatcherGUI.h */; };
-		732A11DC0EDA993500EB5159 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF620EB8EC7B007EBA09 /* Batch.cpp */; };
-		732A11DD0EDA993500EB5159 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; };
-		732A11DE0EDA993500EB5159 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; };
-		732A11DF0EDA998500EB5159 /* PTBatcherGUI_rc.rc in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA360EB39F5200CD7122 /* PTBatcherGUI_rc.rc */; };
 		7332AE990D8D4986002BF5FF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		7332AE9C0D8D4986002BF5FF /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
 		7332AE9D0D8D4986002BF5FF /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
@@ -876,33 +938,7 @@
 		734BDF6F0EB8EC7B007EBA09 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; };
 		734BDF700EB8EC7B007EBA09 /* PTBatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF670EB8EC7B007EBA09 /* PTBatcher.cpp */; };
 		734BDF710EB8EC7B007EBA09 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; };
-		734FB9060EB38B9500CD7122 /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; };
-		734FB9070EB38B9500CD7122 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
-		734FB9080EB38B9500CD7122 /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; };
-		734FB9090EB38B9500CD7122 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; };
-		734FB90A0EB38B9500CD7122 /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; };
-		734FB90B0EB38B9500CD7122 /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; };
-		734FB90C0EB38B9500CD7122 /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; };
-		734FB90D0EB38B9500CD7122 /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; };
-		734FB90E0EB38B9500CD7122 /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; };
-		734FB90F0EB38B9500CD7122 /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; };
-		734FB9100EB38B9500CD7122 /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; };
-		734FB9110EB38B9500CD7122 /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; };
-		734FB9120EB38B9500CD7122 /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; };
-		734FB9130EB38B9500CD7122 /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; };
-		734FB9140EB38B9500CD7122 /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; };
-		734FB9150EB38B9500CD7122 /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; };
-		734FB9160EB38B9500CD7122 /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; };
-		734FB9170EB38B9500CD7122 /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; };
-		734FB9190EB38B9500CD7122 /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; };
-		734FB91A0EB38B9500CD7122 /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; };
-		734FB91B0EB38B9500CD7122 /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; };
-		734FB91C0EB38B9500CD7122 /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; };
-		734FB91F0EB38B9500CD7122 /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; };
-		734FB9200EB38B9500CD7122 /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; };
-		734FB9A70EB3914E00CD7122 /* libceleste.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; };
 		734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB9B20EB3929500CD7122 /* libGLEW.a */; };
-		734FB9B50EB3929500CD7122 /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB9B30EB3929500CD7122 /* libGLEW.dylib */; };
 		734FBA5B0EB3A20500CD7122 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */; };
 		734FBA5C0EB3A20500CD7122 /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */; };
 		734FBA5D0EB3A20500CD7122 /* GLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3B0EB3A20500CD7122 /* GLRenderer.cpp */; };
@@ -949,7 +985,6 @@
 		739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; };
 		739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; };
 		739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; };
-		739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; };
 		739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
 		739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
@@ -970,31 +1005,6 @@
 		739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
 		739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
 		739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
-		73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
-		73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; };
-		73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
-		73C0B5760ED024CE00A33108 /* hugin_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E122480D2BE45700743A93 /* hugin_version.h */; };
-		73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
-		73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
-		73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
-		73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; };
-		73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
-		73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
-		73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
-		73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
-		73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
-		73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
-		73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
-		73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
-		73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
-		73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
-		73C3C94C0ECCB40900A3089A /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
-		73C3C94D0ECCB40900A3089A /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
-		73C3C94E0ECCB40900A3089A /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
-		73C3C94F0ECCB40900A3089A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
-		73C3C9500ECCB4AA00A3089A /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */; };
-		73C3C9510ECCB4AA00A3089A /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */; };
-		73C3C9520ECCB4AA00A3089A /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */; };
 		73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
 		73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
@@ -1063,8 +1073,6 @@
 		73EBC09F0EC9E2BD0068B821 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
 		73EBC0A00EC9E2BD0068B821 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
 		73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
-		73EBC0A30EC9E2ED0068B821 /* libceleste.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; };
-		73EBC0A90EC9E3260068B821 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; };
 		73EBC0AC0EC9E3540068B821 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
 		73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
 /* End PBXBuildFile section */
@@ -1308,6 +1316,76 @@
 			remoteGlobalIDString = 57D382ED0E236A0800445A37;
 			remoteInfo = "matchpoint static";
 		};
+		57D50A310F595A6300CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FC280D24A26400A6AD01;
+			remoteInfo = frameworks;
+		};
+		57D50A330F595A6300CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5796FA730C4395CC006B7C6E;
+			remoteInfo = "tools nona";
+		};
+		57D50A350F595A6300CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769F8460D23AA5D00A6AD01;
+			remoteInfo = "tools hugin_hdrmerge";
+		};
+		57D50A6E0F595BDE00CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */;
+			remoteInfo = "celeste Framework";
+		};
+		57D50B010F59714100CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900D70D24D32C00A6AD01 /* base_wx Framework */;
+			remoteInfo = "base_wx Framework";
+		};
+		57D50B3A0F5971A600CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57C486290C3121E8002D79F1;
+			remoteInfo = configure;
+		};
+		57D50B540F5971F600CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */;
+			remoteInfo = "celeste Framework";
+		};
+		57D50B560F5971F600CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FC280D24A26400A6AD01 /* frameworks */;
+			remoteInfo = frameworks;
+		};
+		57D50B580F59720700CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5 /* celeste */;
+			remoteInfo = celeste;
+		};
+		57D50B5A0F59720C00CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */;
+			remoteInfo = "lib static";
+		};
 		57E347120C4A8EB6006AA781 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1560,20 +1638,6 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
-		733490BF0ECB2BB9006309E3 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 734FB8CF0EB38AB600CD7122;
-			remoteInfo = celeste;
-		};
-		733490C40ECB2BE9006309E3 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 733490BB0ECB2B99006309E3;
-			remoteInfo = Dylibs;
-		};
 		737E1C1F0EC9EC5100BA4D9B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1595,13 +1659,6 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
-		73C3C93C0ECCB3EB00A3089A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 5769FC280D24A26400A6AD01;
-			remoteInfo = frameworks;
-		};
 		73C958F60DA2C9DB00E19110 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1623,13 +1680,6 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
-		73F800120F2CABCA00C22CB9 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 73F8000D0F2CAB5300C22CB9;
-			remoteInfo = "Copy celeste config.h";
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1652,6 +1702,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */,
 				576901C40D24D7DB00A6AD01 /* HuginVigraImpex.framework in Copy Frameworks */,
 				576901C50D24D7DB00A6AD01 /* HuginBase.framework in Copy Frameworks */,
 				576901C60D24D7DB00A6AD01 /* HuginBaseWx.framework in Copy Frameworks */,
@@ -1691,26 +1742,34 @@
 			name = "Copy Executable Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		739F84940EC75736004771D6 /* Copy libraries */ = {
+		57D50A4D0F595A6300CCDCB5 /* Copy Executable Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
-			dstSubfolderSpec = 7;
+			dstSubfolderSpec = 6;
 			files = (
-				739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */,
+				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 libraries";
+			name = "Copy Executable Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		73B9576B0EFADC4200CB2012 /* Copy Frameworks */ = {
+		57D50A570F595A6300CCDCB5 /* Copy Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */,
-				73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */,
-				73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */,
+				57D50A580F595A6300CCDCB5 /* HuginVigraImpex.framework in Copy Frameworks */,
+				57D50A590F595A6300CCDCB5 /* HuginBase.framework in Copy Frameworks */,
+				57D50A5A0F595A6300CCDCB5 /* HuginBaseWx.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2092,8 +2151,22 @@
 		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 /* libceleste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libceleste.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = "<group>"; };
 		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>"; };
+		57DD34930F5940840030B958 /* APSIFTFeatureExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APSIFTFeatureExtractor.cpp; sourceTree = "<group>"; };
+		57DD34940F5940840030B958 /* APSIFTFeatureExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APSIFTFeatureExtractor.h; sourceTree = "<group>"; };
+		57DD34950F5940840030B958 /* FeatureExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FeatureExtractor.cpp; sourceTree = "<group>"; };
+		57DD34960F5940840030B958 /* FeatureExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureExtractor.h; sourceTree = "<group>"; };
+		57DD34970F5940840030B958 /* FeatureExtractorZoran.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureExtractorZoran.h; sourceTree = "<group>"; };
+		57DD34980F5940840030B958 /* FeatureMatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FeatureMatcher.cpp; sourceTree = "<group>"; };
+		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 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2255,17 +2328,12 @@
 		734BDF5B0EB8EC19007EBA09 /* PTBatcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = PTBatcher; sourceTree = BUILT_PRODUCTS_DIR; };
 		734BDF620EB8EC7B007EBA09 /* Batch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Batch.cpp; sourceTree = "<group>"; };
 		734BDF630EB8EC7B007EBA09 /* Batch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Batch.h; sourceTree = "<group>"; };
-		734BDF640EB8EC7B007EBA09 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
 		734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectArray.cpp; sourceTree = "<group>"; };
 		734BDF660EB8EC7B007EBA09 /* ProjectArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectArray.h; sourceTree = "<group>"; };
 		734BDF670EB8EC7B007EBA09 /* PTBatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PTBatcher.cpp; sourceTree = "<group>"; };
-		734BDF680EB8EC7B007EBA09 /* PTBatcher.desktop */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcher.desktop; sourceTree = "<group>"; };
 		734BDF690EB8EC7B007EBA09 /* PTBatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PTBatcher.h; sourceTree = "<group>"; };
-		734BDF6A0EB8EC7B007EBA09 /* PTBatcher_rc.aps */ = {isa = PBXFileReference; lastKnownFileType = file; path = PTBatcher_rc.aps; sourceTree = "<group>"; };
-		734BDF6B0EB8EC7B007EBA09 /* PTBatcher_rc.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcher_rc.rc; sourceTree = "<group>"; };
 		734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunStitchFrame.cpp; sourceTree = "<group>"; };
 		734BDF6D0EB8EC7B007EBA09 /* RunStitchFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunStitchFrame.h; sourceTree = "<group>"; };
-		734FB8D00EB38AB600CD7122 /* libceleste.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libceleste.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		734FB8DD0EB38B9400CD7122 /* Celeste.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Celeste.cpp; sourceTree = "<group>"; };
 		734FB8DE0EB38B9400CD7122 /* Celeste.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Celeste.h; sourceTree = "<group>"; };
 		734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CelesteGlobals.cpp; sourceTree = "<group>"; };
@@ -2305,19 +2373,14 @@
 		734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = svm_learn_class_10_fold.pl; sourceTree = "<group>"; };
 		734FB9040EB38B9500CD7122 /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utilities.cpp; sourceTree = "<group>"; };
 		734FB9050EB38B9500CD7122 /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; };
-		734FB9B20EB3929500CD7122 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = ../../ExternalPrograms/repository/lib/libGLEW.a; sourceTree = SOURCE_ROOT; };
-		734FB9B30EB3929500CD7122 /* libGLEW.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLEW.dylib; path = ../../ExternalPrograms/repository/lib/libGLEW.dylib; sourceTree = SOURCE_ROOT; };
+		734FB9B20EB3929500CD7122 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = lib/libGLEW.a; sourceTree = "<group>"; };
 		734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BatchFrame.cpp; sourceTree = "<group>"; };
 		734FBA2D0EB39F5100CD7122 /* BatchFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BatchFrame.h; sourceTree = "<group>"; };
-		734FBA2E0EB39F5100CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
 		734FBA2F0EB39F5100CD7122 /* DirTraverser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirTraverser.h; sourceTree = "<group>"; };
 		734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectListBox.cpp; sourceTree = "<group>"; };
 		734FBA310EB39F5100CD7122 /* ProjectListBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectListBox.h; sourceTree = "<group>"; };
 		734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PTBatcherGUI.cpp; sourceTree = "<group>"; };
-		734FBA330EB39F5100CD7122 /* PTBatcherGUI.desktop */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcherGUI.desktop; sourceTree = "<group>"; };
 		734FBA340EB39F5100CD7122 /* PTBatcherGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PTBatcherGUI.h; sourceTree = "<group>"; };
-		734FBA350EB39F5200CD7122 /* PTBatcherGUI_rc.aps */ = {isa = PBXFileReference; lastKnownFileType = file; path = PTBatcherGUI_rc.aps; sourceTree = "<group>"; };
-		734FBA360EB39F5200CD7122 /* PTBatcherGUI_rc.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcherGUI_rc.rc; sourceTree = "<group>"; };
 		734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChoosyRemapper.cpp; sourceTree = "<group>"; };
 		734FBA380EB3A20500CD7122 /* ChoosyRemapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChoosyRemapper.h; sourceTree = "<group>"; };
 		734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GLPreviewFrame.cpp; sourceTree = "<group>"; };
@@ -2359,13 +2422,9 @@
 		7358165C0ECA0D98009E94DC /* CelesteDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteDebug.h; 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>"; };
-		739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste Framework-Info.plist"; sourceTree = "<group>"; };
-		739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste2 Framework-Info.plist"; sourceTree = "<group>"; };
 		739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "../../ExternalPrograms/repository/lib/libwx_macu_gl-2.8.dylib"; sourceTree = SOURCE_ROOT; };
-		73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		73C3C9340ECCB39700A3089A /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; };
-		73C3C98E0ECCC9DE00A3089A /* celeste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = celeste.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "lib/libwx_macu_gl-2.8.dylib"; sourceTree = "<group>"; };
+		73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginCleste.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; 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; };
 		73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-xgcc40-mt-1_36.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-xgcc40-mt-1_36.a"; sourceTree = SOURCE_ROOT; };
@@ -2390,7 +2449,7 @@
 		73EAB53A0E86CF130020D514 /* IlmBase.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IlmBase.pc; sourceTree = "<group>"; };
 		73EAB53B0E86CF130020D514 /* OpenEXR.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenEXR.pc; sourceTree = "<group>"; };
 		73EAB5400E86CF130020D514 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; };
-		73EBC0900EC9E0B20068B821 /* celeste_standalone */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste_standalone; sourceTree = BUILT_PRODUCTS_DIR; };
+		73EBC0900EC9E0B20068B821 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2699,6 +2758,64 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		57D50A380F595A6300CCDCB5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D50A390F595A6300CCDCB5 /* Carbon.framework in Frameworks */,
+				57D50A3A0F595A6300CCDCB5 /* libpthread.dylib in Frameworks */,
+				57D50A3B0F595A6300CCDCB5 /* libiconv.dylib in Frameworks */,
+				57D50A3C0F595A6300CCDCB5 /* libz.dylib in Frameworks */,
+				57D50A3D0F595A6300CCDCB5 /* libmx.dylib in Frameworks */,
+				57D50A3E0F595A6300CCDCB5 /* libpano13.dylib in Frameworks */,
+				57D50A3F0F595A6300CCDCB5 /* libpng.dylib in Frameworks */,
+				57D50A400F595A6300CCDCB5 /* libtiff.dylib in Frameworks */,
+				57D50A410F595A6300CCDCB5 /* libjpeg.dylib in Frameworks */,
+				57D50A420F595A6300CCDCB5 /* libwx_macu-2.8.dylib in Frameworks */,
+				57D50A430F595A6300CCDCB5 /* libIex.dylib in Frameworks */,
+				57D50A440F595A6300CCDCB5 /* libIlmImf.dylib in Frameworks */,
+				57D50A450F595A6300CCDCB5 /* libIlmThread.dylib in Frameworks */,
+				57D50A460F595A6300CCDCB5 /* libImath.dylib in Frameworks */,
+				57D50A470F595A6300CCDCB5 /* libHalf.dylib in Frameworks */,
+				57D50A480F595A6300CCDCB5 /* libboost_thread.dylib in Frameworks */,
+				57D50A490F595A6300CCDCB5 /* libexpat.dylib in Frameworks */,
+				57D50A4A0F595A6300CCDCB5 /* HuginVigraImpex.framework in Frameworks */,
+				57D50A4B0F595A6300CCDCB5 /* HuginBase.framework in Frameworks */,
+				57D50A4C0F595A6300CCDCB5 /* HuginBaseWx.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		57D50B3D0F5971A600CCDCB5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D50B610F59725E00CCDCB5 /* libhugin_levmar.a in Frameworks */,
+				57D50B620F59725E00CCDCB5 /* libhugin_jhead.a in Frameworks */,
+				57D50B630F59725E00CCDCB5 /* libhugin_vigra_impex.a in Frameworks */,
+				57D50B640F59725E00CCDCB5 /* libhugin_vigra_ext.a in Frameworks */,
+				57D50B650F59725E00CCDCB5 /* libhugin_utils.a in Frameworks */,
+				57D50B660F59725E00CCDCB5 /* libhugin_math.a in Frameworks */,
+				57D50B670F59725E00CCDCB5 /* libhugin_appbase.a in Frameworks */,
+				57D50B680F59725E00CCDCB5 /* libhugin_panodata.a in Frameworks */,
+				57D50B690F59725E00CCDCB5 /* libhugin_panotools.a in Frameworks */,
+				57D50B6A0F59725E00CCDCB5 /* libhugin_nona.a in Frameworks */,
+				57D50B6B0F59725E00CCDCB5 /* libhugin_algorithms.a in Frameworks */,
+				57D50B6C0F59725E00CCDCB5 /* libhugin_app.a in Frameworks */,
+				57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */,
+				57D50B400F5971A600CCDCB5 /* libexiv2.a in Frameworks */,
+				57D50B410F5971A600CCDCB5 /* libpano13.dylib in Frameworks */,
+				57D50B420F5971A600CCDCB5 /* libboost_thread.dylib in Frameworks */,
+				57D50B430F5971A600CCDCB5 /* libHalf.dylib in Frameworks */,
+				57D50B440F5971A600CCDCB5 /* libIex.dylib in Frameworks */,
+				57D50B450F5971A600CCDCB5 /* libIlmImf.dylib in Frameworks */,
+				57D50B460F5971A600CCDCB5 /* libIlmThread.dylib in Frameworks */,
+				57D50B470F5971A600CCDCB5 /* libImath.dylib in Frameworks */,
+				57D50B480F5971A600CCDCB5 /* libjpeg.dylib in Frameworks */,
+				57D50B490F5971A600CCDCB5 /* libpng.dylib in Frameworks */,
+				57D50B4A0F5971A600CCDCB5 /* libtiff.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		57E122560D2BE4E800743A93 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2748,7 +2865,6 @@
 				57E346E10C4A8AB3006AA781 /* libz.dylib in Frameworks */,
 				57E346E20C4A8AB3006AA781 /* libmx.dylib in Frameworks */,
 				57E346E30C4A8AC2006AA781 /* libpano13.dylib in Frameworks */,
-				734FB9A70EB3914E00CD7122 /* libceleste.dylib in Frameworks */,
 				57E346E40C4A8AC2006AA781 /* libpng.dylib in Frameworks */,
 				57E346E50C4A8AC2006AA781 /* libtiff.dylib in Frameworks */,
 				57E346E60C4A8AC2006AA781 /* libjpeg.dylib in Frameworks */,
@@ -2764,8 +2880,8 @@
 				576901EC0D24D95100A6AD01 /* HuginBase.framework in Frameworks */,
 				576901ED0D24D95100A6AD01 /* HuginBaseWx.framework in Frameworks */,
 				5731C7820D553C3D00605D22 /* libhugin_jhead.a in Frameworks */,
+				57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */,
 				734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */,
-				734FB9B50EB3929500CD7122 /* libGLEW.dylib in Frameworks */,
 				739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */,
 				739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */,
 			);
@@ -2793,6 +2909,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				57D50B060F59715000CCDCB5 /* HuginBaseWx.framework in Frameworks */,
 				739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */,
 				739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */,
 				739F84D10EC77EB6004771D6 /* HuginBase.framework in Frameworks */,
@@ -2814,45 +2931,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		734FB8CE0EB38AB600CD7122 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		739CADA80EC86B30002FD3AF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		73C3C9300ECCB39700A3089A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */,
-				73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */,
-				73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */,
-				73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */,
-				73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */,
-				73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */,
-				73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */,
-				73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */,
-				73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */,
-				73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */,
-				73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */,
-				73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */,
-				73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */,
-				73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */,
-				73C3C94C0ECCB40900A3089A /* libtiff.dylib in Frameworks */,
-				73C3C94D0ECCB40900A3089A /* libwx_macu-2.8.dylib in Frameworks */,
-				73C3C94E0ECCB40900A3089A /* libwx_macu_gl-2.8.dylib in Frameworks */,
-				73C3C94F0ECCB40900A3089A /* libz.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73C958F90DA2C9DB00E19110 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2909,11 +2995,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				57D50AC20F596D4900CCDCB5 /* HuginCleste.framework in Frameworks */,
+				73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */,
+				57D50AC70F596D6900CCDCB5 /* libexiv2.a in Frameworks */,
 				73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */,
 				73EBC0AC0EC9E3540068B821 /* libboost_thread.dylib in Frameworks */,
-				73EBC0A90EC9E3260068B821 /* libexiv2.a in Frameworks */,
-				73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */,
-				73EBC0A30EC9E2ED0068B821 /* libceleste.dylib in Frameworks */,
 				73EBC0990EC9E2BD0068B821 /* libHalf.dylib in Frameworks */,
 				73EBC09A0EC9E2BD0068B821 /* libIex.dylib in Frameworks */,
 				73EBC09B0EC9E2BD0068B821 /* libIlmImf.dylib in Frameworks */,
@@ -2947,6 +3033,7 @@
 				57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */,
 				57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */,
 				5769F6320D23825700A6AD01 /* hugin_stitch_project-Info.plist */,
+				57D50A640F595A6300CCDCB5 /* PTBatcherGUI-Info.plist */,
 				57114EA006BC2301004F4FA7 /* Hugin.icns */,
 				5702996D07F967CB00F1FF15 /* HuginFiles.icns */,
 				57B8C693083AB7F400283C06 /* localised.sh */,
@@ -2959,6 +3046,7 @@
 				573E2E5E0B76AD0100E86281 /* Documents */,
 				57701A750E5B036A00E5026B /* autopano-complete-mac.sh */,
 				576900800D24D14500A6AD01 /* vigra_impex-Info.plist */,
+				57DD345E0F5939D80030B958 /* celeste-Info.plist */,
 				576900AB0D24D29300A6AD01 /* hugin_base-Info.plist */,
 				576900E20D24D32C00A6AD01 /* base_wx-Info.plist */,
 			);
@@ -3201,6 +3289,7 @@
 				57EA83860C3A798A00E4965E /* libhugin_algorithms.a */,
 				576EC4990C3FC9300076A417 /* libhugin_app.a */,
 				57E34A5C0C4ACAA1006AA781 /* libhugin_wxbase.a */,
+				57D50ADB0F596DB700CCDCB5 /* libceleste.a */,
 			);
 			name = "lib-static";
 			sourceTree = "<group>";
@@ -3212,6 +3301,8 @@
 				5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */,
 				73E79F300D674EAC00C07126 /* align_image_stack */,
 				7332AEAE0D8D4986002BF5FF /* matchpoint */,
+				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
+				73EBC0900EC9E0B20068B821 /* celeste */,
 			);
 			name = "tools-dynamic";
 			sourceTree = "<group>";
@@ -3247,9 +3338,6 @@
 		5745FBE5094E1C4700E6B672 /* repository */ = {
 			isa = PBXGroup;
 			children = (
-				734FB9B20EB3929500CD7122 /* libGLEW.a */,
-				734FB9B30EB3929500CD7122 /* libGLEW.dylib */,
-				73EAB5250E86CEA90020D514 /* lib-static */,
 				570898E30D4CB635008949E7 /* gnumake */,
 				5769F7A10D239D6A00A6AD01 /* PTmender */,
 				5769F79F0D239D6A00A6AD01 /* PTblender */,
@@ -3258,6 +3346,7 @@
 				570D581A082A9ED50030E768 /* enblend */,
 				5769F79E0D239D6A00A6AD01 /* enfuse */,
 				57565A640D088DAD00344F55 /* libboost_thread.dylib */,
+				734FB9B20EB3929500CD7122 /* libGLEW.a */,
 				573B8F85067BAAB900B7B355 /* libpano13.dylib */,
 				577092FA06BD7388004058A1 /* libpng.dylib */,
 				577092FB06BD7388004058A1 /* libtiff.dylib */,
@@ -3281,6 +3370,7 @@
 			isa = PBXGroup;
 			children = (
 				5749F84D067B601A00A6EDD4 /* Mac OS SDK */,
+				73EAB5250E86CEA90020D514 /* repository-static */,
 				5745FBE5094E1C4700E6B672 /* repository */,
 			);
 			name = External;
@@ -3434,6 +3524,7 @@
 		5769FD140D24B3D400A6AD01 /* frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */,
 				5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */,
 				576900AA0D24D29300A6AD01 /* HuginBase.framework */,
 				576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */,
@@ -3625,18 +3716,18 @@
 			isa = PBXGroup;
 			children = (
 				737E1C180EC9EC0300BA4D9B /* hugin_config.h */,
-				734BDF610EB8EC7B007EBA09 /* PTBatcher */,
-				734FB8DC0EB38B9400CD7122 /* celeste */,
 				57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */,
 				57E122480D2BE45700743A93 /* hugin_version.h */,
 				5771F5E60C3007B300736343 /* hugin_base */,
+				57E32FAB0C4A87F1006AA781 /* hugin1 */,
 				57114EC106BC2301004F4FA7 /* foreign */,
 				57460AB30C4E7BD5004507F7 /* tools */,
-				57E32FAB0C4A87F1006AA781 /* hugin1 */,
+				734FB8DC0EB38B9400CD7122 /* celeste */,
 				5769F83C0D23A9F400A6AD01 /* deghosting */,
 				7332AE550D8D491B002BF5FF /* matchpoint */,
+				734BDF610EB8EC7B007EBA09 /* PTBatcher */,
+				734FBA2B0EB39F5100CD7122 /* PTBatcherGUI */,
 				57D475B60D3CE0AB003CF158 /* translations */,
-				734FBA2B0EB39F5100CD7122 /* PTBatcherGUI */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -3655,6 +3746,7 @@
 				57E3467E0C4A89B0006AA781 /* Hugin.app */,
 				5769F6300D23825700A6AD01 /* HuginStitchProject.app */,
 				57525A250C54BC4400BF8096 /* Nona.app */,
+				57D50A620F595A6300CCDCB5 /* PTBatcherGUI.app */,
 			);
 			name = "Mac OS X";
 			sourceTree = "<group>";
@@ -3669,10 +3761,26 @@
 				576482BE0C469052003AFC2F /* fulla */,
 				576482E20C469056003AFC2F /* vig_optimize */,
 				73C959140DA2C9DB00E19110 /* tca_correct */,
+				57D50B520F5971A600CCDCB5 /* celeste */,
 			);
 			name = "tools-static";
 			sourceTree = "<group>";
 		};
+		57DD34920F5940840030B958 /* control_points */ = {
+			isa = PBXGroup;
+			children = (
+				57DD34930F5940840030B958 /* APSIFTFeatureExtractor.cpp */,
+				57DD34940F5940840030B958 /* APSIFTFeatureExtractor.h */,
+				57DD34950F5940840030B958 /* FeatureExtractor.cpp */,
+				57DD34960F5940840030B958 /* FeatureExtractor.h */,
+				57DD34970F5940840030B958 /* FeatureExtractorZoran.h */,
+				57DD34980F5940840030B958 /* FeatureMatcher.cpp */,
+				57DD34990F5940840030B958 /* FeatureMatcher.h */,
+			);
+			name = control_points;
+			path = algorithms/control_points;
+			sourceTree = "<group>";
+		};
 		57E32FAB0C4A87F1006AA781 /* hugin1 */ = {
 			isa = PBXGroup;
 			children = (
@@ -3869,6 +3977,8 @@
 				57E3310E0C4A8859006AA781 /* CPListFrame.cpp */,
 				57E3310F0C4A8859006AA781 /* CPListFrame.h */,
 				57E331120C4A8859006AA781 /* CommandHistory.cpp */,
+				57D5093A0F5942F200CCDCB5 /* CPImagesComboBox.cpp */,
+				57D5093B0F5942F300CCDCB5 /* CPImagesComboBox.h */,
 				57E331130C4A8859006AA781 /* CommandHistory.h */,
 				57E331140C4A8859006AA781 /* CropPanel.cpp */,
 				57E331150C4A8859006AA781 /* CropPanel.h */,
@@ -3968,6 +4078,7 @@
 		57EA83A40C3A7CD700E4965E /* algorithms */ = {
 			isa = PBXGroup;
 			children = (
+				57DD34920F5940840030B958 /* control_points */,
 				57EA83990C3A7A9500E4965E /* basic */,
 				571DD7DC0C3E93340027A85E /* external */,
 				5785A3080C3BE6AF00DD8BD8 /* nona */,
@@ -3985,14 +4096,6 @@
 				574B81880E4198FE00644179 /* hugin */,
 				5745FC05094E1D5400E6B672 /* External */,
 				573B8F3E067BA2EB00B7B355 /* Product */,
-				734FB8D00EB38AB600CD7122 /* libceleste.dylib */,
-				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
-				739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */,
-				739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */,
-				73EBC0900EC9E0B20068B821 /* celeste_standalone */,
-				73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */,
-				73C3C9340ECCB39700A3089A /* PTBatcherGUI-Info.plist */,
-				73C3C98E0ECCC9DE00A3089A /* celeste.framework */,
 			);
 			sourceTree = "<group>";
 		};
@@ -4062,14 +4165,10 @@
 			children = (
 				734BDF620EB8EC7B007EBA09 /* Batch.cpp */,
 				734BDF630EB8EC7B007EBA09 /* Batch.h */,
-				734BDF640EB8EC7B007EBA09 /* CMakeLists.txt */,
 				734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */,
 				734BDF660EB8EC7B007EBA09 /* ProjectArray.h */,
 				734BDF670EB8EC7B007EBA09 /* PTBatcher.cpp */,
-				734BDF680EB8EC7B007EBA09 /* PTBatcher.desktop */,
 				734BDF690EB8EC7B007EBA09 /* PTBatcher.h */,
-				734BDF6A0EB8EC7B007EBA09 /* PTBatcher_rc.aps */,
-				734BDF6B0EB8EC7B007EBA09 /* PTBatcher_rc.rc */,
 				734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */,
 				734BDF6D0EB8EC7B007EBA09 /* RunStitchFrame.h */,
 			);
@@ -4144,20 +4243,16 @@
 			children = (
 				734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */,
 				734FBA2D0EB39F5100CD7122 /* BatchFrame.h */,
-				734FBA2E0EB39F5100CD7122 /* CMakeLists.txt */,
 				734FBA2F0EB39F5100CD7122 /* DirTraverser.h */,
 				734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */,
 				734FBA310EB39F5100CD7122 /* ProjectListBox.h */,
 				734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */,
-				734FBA330EB39F5100CD7122 /* PTBatcherGUI.desktop */,
 				734FBA340EB39F5100CD7122 /* PTBatcherGUI.h */,
-				734FBA350EB39F5200CD7122 /* PTBatcherGUI_rc.aps */,
-				734FBA360EB39F5200CD7122 /* PTBatcherGUI_rc.rc */,
 			);
 			path = PTBatcherGUI;
 			sourceTree = "<group>";
 		};
-		73EAB5250E86CEA90020D514 /* lib-static */ = {
+		73EAB5250E86CEA90020D514 /* repository-static */ = {
 			isa = PBXGroup;
 			children = (
 				73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */,
@@ -4181,7 +4276,8 @@
 				73EAB5380E86CF120020D514 /* pkgconfig */,
 				73EAB53C0E86CF130020D514 /* wx */,
 			);
-			name = "lib-static";
+			name = "repository-static";
+			path = ExternalPrograms/repository;
 			sourceTree = "<group>";
 		};
 		73EAB5380E86CF120020D514 /* pkgconfig */ = {
@@ -4515,6 +4611,35 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		57D50ACB0F596DB700CCDCB5 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D50ADC0F596E3D00CCDCB5 /* Celeste.h in Headers */,
+				57D50ADD0F596E3D00CCDCB5 /* CelesteGlobals.h in Headers */,
+				57D50ADE0F596E3D00CCDCB5 /* Config.h in Headers */,
+				57D50ADF0F596E3D00CCDCB5 /* ContrastFilter.h in Headers */,
+				57D50AE00F596E3D00CCDCB5 /* Gabor.h in Headers */,
+				57D50AE10F596E3D00CCDCB5 /* GaborFilter.h in Headers */,
+				57D50AE20F596E3D00CCDCB5 /* GaborGlobal.h in Headers */,
+				57D50AE30F596E3D00CCDCB5 /* GaborJet.h in Headers */,
+				57D50AE40F596E3D00CCDCB5 /* ImageFile.h in Headers */,
+				57D50AE50F596E3D00CCDCB5 /* LogPolar.h in Headers */,
+				57D50AE60F596E3D00CCDCB5 /* PGMImage.h in Headers */,
+				57D50AE70F596E3D00CCDCB5 /* svm.h in Headers */,
+				57D50AE80F596E3D00CCDCB5 /* Utilities.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		57D50B4B0F5971A600CCDCB5 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D50B4C0F5971A600CCDCB5 /* hugin_config.h in Headers */,
+				57D50B4D0F5971A600CCDCB5 /* CelesteDebug.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		57E34A580C4ACAA1006AA781 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -4567,26 +4692,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		734FB8CC0EB38AB600CD7122 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				734FB9070EB38B9500CD7122 /* Celeste.h in Headers */,
-				734FB9090EB38B9500CD7122 /* CelesteGlobals.h in Headers */,
-				734FB90A0EB38B9500CD7122 /* Config.h in Headers */,
-				734FB90C0EB38B9500CD7122 /* ContrastFilter.h in Headers */,
-				734FB90E0EB38B9500CD7122 /* Gabor.h in Headers */,
-				734FB9100EB38B9500CD7122 /* GaborFilter.h in Headers */,
-				734FB9110EB38B9500CD7122 /* GaborGlobal.h in Headers */,
-				734FB9130EB38B9500CD7122 /* GaborJet.h in Headers */,
-				734FB9150EB38B9500CD7122 /* ImageFile.h in Headers */,
-				734FB9170EB38B9500CD7122 /* LogPolar.h in Headers */,
-				734FB91A0EB38B9500CD7122 /* PGMImage.h in Headers */,
-				734FB91C0EB38B9500CD7122 /* svm.h in Headers */,
-				734FB9200EB38B9500CD7122 /* Utilities.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		739CADA50EC86B30002FD3AF /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -4607,21 +4712,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		73C0B5780ED024EC00A33108 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				732A11D80EDA98C500EB5159 /* BatchFrame.h in Headers */,
-				732A11D90EDA98C500EB5159 /* DirTraverser.h in Headers */,
-				732A11DA0EDA98C500EB5159 /* ProjectListBox.h in Headers */,
-				732A11DB0EDA98C500EB5159 /* PTBatcherGUI.h in Headers */,
-				732A11D60EDA987B00EB5159 /* Batch.h in Headers */,
-				732A11D70EDA987B00EB5159 /* ProjectArray.h in Headers */,
-				732A11920EDA092E00EB5159 /* RunStitchFrame.h in Headers */,
-				73C0B5760ED024CE00A33108 /* hugin_version.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73EBC0CF0EC9E4A00068B821 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -5046,6 +5136,69 @@
 			productReference = 57D3830D0E236A0800445A37 /* matchpoint */;
 			productType = "com.apple.product-type.tool";
 		};
+		57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 57D50A5E0F595A6300CCDCB5 /* Build configuration list for PBXNativeTarget "PTBatcherGUI" */;
+			buildPhases = (
+				57D50A360F595A6300CCDCB5 /* Sources */,
+				57D50A380F595A6300CCDCB5 /* Frameworks */,
+				57D50A4D0F595A6300CCDCB5 /* Copy Executable Files */,
+				57D50A570F595A6300CCDCB5 /* Copy Frameworks */,
+				57D50A5B0F595A6300CCDCB5 /* Locale Script */,
+				57D50A5C0F595A6300CCDCB5 /* Copy ExifTool */,
+				57D50A720F595D0E00CCDCB5 /* Patch XRC */,
+				57D50A940F59631C00CCDCB5 /* Localise Help */,
+				57D50A5D0F595A6300CCDCB5 /* Complete Bundle */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				57D50A300F595A6300CCDCB5 /* PBXTargetDependency */,
+				57D50A320F595A6300CCDCB5 /* PBXTargetDependency */,
+				57D50A340F595A6300CCDCB5 /* PBXTargetDependency */,
+			);
+			name = PTBatcherGUI;
+			productName = Nona;
+			productReference = 57D50A620F595A6300CCDCB5 /* PTBatcherGUI.app */;
+			productType = "com.apple.product-type.application";
+		};
+		57D50ACA0F596DB700CCDCB5 /* celeste */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 57D50AD70F596DB700CCDCB5 /* Build configuration list for PBXNativeTarget "celeste" */;
+			buildPhases = (
+				57D50AF80F596E9600CCDCB5 /* Copy celeste config.h */,
+				57D50ACB0F596DB700CCDCB5 /* Headers */,
+				57D50AD00F596DB700CCDCB5 /* Sources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = celeste;
+			productName = nona;
+			productReference = 57D50ADB0F596DB700CCDCB5 /* libceleste.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		57D50B380F5971A600CCDCB5 /* celeste static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 57D50B4E0F5971A600CCDCB5 /* Build configuration list for PBXNativeTarget "celeste static" */;
+			buildPhases = (
+				57D50B3B0F5971A600CCDCB5 /* Sources */,
+				57D50B3D0F5971A600CCDCB5 /* Frameworks */,
+				57D50B4B0F5971A600CCDCB5 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				57D50B390F5971A600CCDCB5 /* PBXTargetDependency */,
+				57D50B5B0F59720C00CCDCB5 /* PBXTargetDependency */,
+				57D50B590F59720700CCDCB5 /* PBXTargetDependency */,
+			);
+			name = "celeste static";
+			productName = celeste_standalone;
+			productReference = 57D50B520F5971A600CCDCB5 /* celeste */;
+			productType = "com.apple.product-type.tool";
+		};
 		57E122570D2BE4E800743A93 /* align_image_stack static */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 57E122620D2BE51000743A93 /* Build configuration list for PBXNativeTarget "align_image_stack static" */;
@@ -5070,7 +5223,6 @@
 				57E3467B0C4A89B0006AA781 /* Sources */,
 				57E3467C0C4A89B0006AA781 /* Frameworks */,
 				576901E60D24D93300A6AD01 /* Copy Frameworks */,
-				739F84940EC75736004771D6 /* Copy libraries */,
 				57E3467A0C4A89B0006AA781 /* Resources */,
 				571D8C740E2132DE006D0305 /* Patch XRC */,
 				57E347640C4A8F9F006AA781 /* Locale Script */,
@@ -5081,8 +5233,8 @@
 			buildRules = (
 			);
 			dependencies = (
-				733490C50ECB2BE9006309E3 /* PBXTargetDependency */,
 				576901B80D24D61C00A6AD01 /* PBXTargetDependency */,
+				57D50A6F0F595BDE00CCDCB5 /* PBXTargetDependency */,
 				5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */,
 			);
 			name = Hugin;
@@ -5141,9 +5293,9 @@
 			productReference = 7332AEAE0D8D4986002BF5FF /* matchpoint */;
 			productType = "com.apple.product-type.tool";
 		};
-		734BDF5A0EB8EC19007EBA09 /* PTBatcher */ = {
+		734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher" */;
+			buildConfigurationList = 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher dynamic" */;
 			buildPhases = (
 				734BDF580EB8EC19007EBA09 /* Sources */,
 				734BDF590EB8EC19007EBA09 /* Frameworks */,
@@ -5153,35 +5305,19 @@
 			dependencies = (
 				739F84FE0EC7803F004771D6 /* PBXTargetDependency */,
 				739F85000EC7803F004771D6 /* PBXTargetDependency */,
+				57D50B020F59714100CCDCB5 /* PBXTargetDependency */,
 			);
-			name = PTBatcher;
+			name = "PTBatcher dynamic";
 			productName = PTBatcher;
 			productReference = 734BDF5B0EB8EC19007EBA09 /* PTBatcher */;
 			productType = "com.apple.product-type.tool";
 		};
-		734FB8CF0EB38AB600CD7122 /* celeste */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 734FB8D40EB38B0300CD7122 /* Build configuration list for PBXNativeTarget "celeste" */;
-			buildPhases = (
-				734FB8CC0EB38AB600CD7122 /* Headers */,
-				734FB8CD0EB38AB600CD7122 /* Sources */,
-				734FB8CE0EB38AB600CD7122 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = celeste;
-			productName = celeste;
-			productReference = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
 		739CADA90EC86B30002FD3AF /* celeste Framework */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */;
 			buildPhases = (
+				57D50AA90F59661200CCDCB5 /* Copy celeste config.h */,
 				739CADA50EC86B30002FD3AF /* Headers */,
-				739CADA60EC86B30002FD3AF /* Resources */,
 				739CADA70EC86B30002FD3AF /* Sources */,
 				739CADA80EC86B30002FD3AF /* Frameworks */,
 			);
@@ -5191,34 +5327,9 @@
 			);
 			name = "celeste Framework";
 			productName = "celeste Framework";
-			productReference = 73C3C98E0ECCC9DE00A3089A /* celeste.framework */;
+			productReference = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		73C3C9310ECCB39700A3089A /* PTBatcherGUI */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 73C3C9380ECCB39900A3089A /* Build configuration list for PBXNativeTarget "PTBatcherGUI" */;
-			buildPhases = (
-				73C3C92E0ECCB39700A3089A /* Resources */,
-				73C3C92F0ECCB39700A3089A /* Sources */,
-				73C3C9300ECCB39700A3089A /* Frameworks */,
-				73C0B5780ED024EC00A33108 /* Headers */,
-				73B9576B0EFADC4200CB2012 /* Copy Frameworks */,
-				73B9574D0EFAD9E500CB2012 /* Patch XRC */,
-				73B957560EFADA8D00CB2012 /* Locale Script */,
-				73B9575A0EFADAE100CB2012 /* Localise Help */,
-				73B957490EFAD9C000CB2012 /* Complete Bundle */,
-				73B957620EFADB6500CB2012 /* Complete Embedding */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				73C3C93D0ECCB3EB00A3089A /* PBXTargetDependency */,
-			);
-			name = PTBatcherGUI;
-			productName = PTBatcherGUI;
-			productReference = 73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */;
-			productType = "com.apple.product-type.application";
-		};
 		73C958F40DA2C9DB00E19110 /* tca_correct static */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */;
@@ -5254,9 +5365,9 @@
 			productReference = 73E79F300D674EAC00C07126 /* align_image_stack */;
 			productType = "com.apple.product-type.tool";
 		};
-		73EBC08F0EC9E0B20068B821 /* celeste_standalone */ = {
+		73EBC08F0EC9E0B20068B821 /* celeste dynamic */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 73EBC0970EC9E0D70068B821 /* Build configuration list for PBXNativeTarget "celeste_standalone" */;
+			buildConfigurationList = 73EBC0970EC9E0D70068B821 /* Build configuration list for PBXNativeTarget "celeste dynamic" */;
 			buildPhases = (
 				73EBC08D0EC9E0B20068B821 /* Sources */,
 				73EBC08E0EC9E0B20068B821 /* Frameworks */,
@@ -5266,10 +5377,12 @@
 			);
 			dependencies = (
 				737E1C200EC9EC5100BA4D9B /* PBXTargetDependency */,
+				57D50B570F5971F600CCDCB5 /* PBXTargetDependency */,
+				57D50B550F5971F600CCDCB5 /* PBXTargetDependency */,
 			);
-			name = celeste_standalone;
+			name = "celeste dynamic";
 			productName = celeste_standalone;
-			productReference = 73EBC0900EC9E0B20068B821 /* celeste_standalone */;
+			productReference = 73EBC0900EC9E0B20068B821 /* celeste */;
 			productType = "com.apple.product-type.tool";
 		};
 /* End PBXNativeTarget section */
@@ -5310,11 +5423,8 @@
 				57FF7DA00E6917BF00553709 /* set svn revision */,
 				57FF7DC10E691A1800553709 /* configure hugin_version.h */,
 				57FF7DBB0E6919F400553709 /* copy hugin_config.h */,
-				73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */,
 				57E3470D0C4A8E95006AA781 /* lib static */,
-				733490BB0ECB2B99006309E3 /* Dylibs */,
 				5720E4720BD456CD00E63404 /* levmar */,
-				734FB8CF0EB38AB600CD7122 /* celeste */,
 				5749F8A2067B60CA00A6EDD4 /* jhead */,
 				5771F8140C30268F00736343 /* PTLensDB */,
 				5711524906BC6709004F4FA7 /* vigra_impex */,
@@ -5327,20 +5437,21 @@
 				574092290C393E6600D16607 /* nona */,
 				57EA83850C3A798A00E4965E /* algorithms */,
 				576EC4980C3FC9300076A417 /* huginapp */,
+				57D50ACA0F596DB700CCDCB5 /* celeste */,
 				57E34A5B0C4ACAA1006AA781 /* wxbase */,
 				5769FC280D24A26400A6AD01 /* frameworks */,
 				5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */,
 				576900A90D24D29300A6AD01 /* hugin_base Framework */,
 				576900D70D24D32C00A6AD01 /* base_wx Framework */,
-				739CADA90EC86B30002FD3AF /* celeste Framework */,
 				571046810D25F698006A3C69 /* bundled tools */,
 				5796FA730C4395CC006B7C6E /* nona dynamic */,
 				5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */,
 				57E347300C4A8EDF006AA781 /* app */,
 				5769F5FF0D23825700A6AD01 /* StitchProject */,
+				739CADA90EC86B30002FD3AF /* celeste Framework */,
 				57E3467D0C4A89B0006AA781 /* Hugin */,
 				57525A240C54BC4400BF8096 /* Nona */,
-				73C3C9310ECCB39700A3089A /* PTBatcherGUI */,
+				57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */,
 				57E347330C4A8EED006AA781 /* tools */,
 				57D382D00E2369FC00445A37 /* nona static */,
 				57D382ED0E236A0800445A37 /* matchpoint static */,
@@ -5349,11 +5460,12 @@
 				5764829C0C469052003AFC2F /* fulla static */,
 				576482C00C469056003AFC2F /* vig_optimize static */,
 				73C958F40DA2C9DB00E19110 /* tca_correct static */,
+				57D50B380F5971A600CCDCB5 /* celeste static */,
 				57D382C50E2369D000445A37 /* tools - other dynamic */,
 				73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */,
 				7332AE910D8D4986002BF5FF /* matchpoint dynamic */,
-				734BDF5A0EB8EC19007EBA09 /* PTBatcher */,
-				73EBC08F0EC9E0B20068B821 /* celeste_standalone */,
+				734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */,
+				73EBC08F0EC9E0B20068B821 /* celeste dynamic */,
 			);
 		};
 /* End PBXProject section */
@@ -5464,20 +5576,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		739CADA60EC86B30002FD3AF /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		73C3C92E0ECCB39700A3089A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -5598,7 +5696,7 @@
 			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/copyExifTool.sh\nfi";
 			showEnvVarsInLog = 0;
 		};
-		57E347640C4A8F9F006AA781 /* Locale Script */ = {
+		57D50A5B0F595A6300CCDCB5 /* Locale Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -5611,84 +5709,98 @@
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localised.sh\nfi";
+		};
+		57D50A5C0F595A6300CCDCB5 /* Copy ExifTool */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy ExifTool";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/copyExifTool.sh\nfi";
 			showEnvVarsInLog = 0;
 		};
-		57FF7D9F0E6917BF00553709 /* Run Script */ = {
+		57D50A5D0F595A6300CCDCB5 /* Complete Bundle */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Run Script";
+			name = "Complete Bundle";
 			outputPaths = (
 			);
 			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 = "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;
 		};
-		57FF7DBA0E6919F400553709 /* ShellScript */ = {
+		57D50A720F595D0E00CCDCB5 /* Patch XRC */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				../src/hugin_config_mac.h,
 			);
+			name = "Patch XRC";
 			outputPaths = (
-				../src/hugin_config.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp -r ../src/hugin_config_mac.h ../src/hugin_config.h\n\n";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/patch-xrc.sh\nfi";
 		};
-		57FF7DC00E691A1800553709 /* ShellScript */ = {
+		57D50A940F59631C00CCDCB5 /* Localise Help */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"../mac/SVN-rev.xcconfig",
-				../mac/Version.xcconfig,
-				../src/hugin_version.h.in.cmake,
 			);
+			name = "Localise Help";
 			outputPaths = (
-				../src/hugin_version.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			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/^.*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";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localise-help.sh\nfi";
 		};
-		73B957490EFAD9C000CB2012 /* Complete Bundle */ = {
+		57D50AA90F59661200CCDCB5 /* Copy celeste config.h */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"celeste-Config.h",
 			);
-			name = "Complete Bundle";
+			name = "Copy celeste config.h";
 			outputPaths = (
+				../src/celeste/Config.h,
 			);
 			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;
+			shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h";
 		};
-		73B9574D0EFAD9E500CB2012 /* Patch XRC */ = {
+		57D50AF80F596E9600CCDCB5 /* Copy celeste config.h */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"celeste-Config.h",
 			);
-			name = "Patch XRC";
+			name = "Copy celeste config.h";
 			outputPaths = (
+				../src/celeste/Config.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/patch-xrc.sh\nfi";
+			shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h";
 		};
-		73B957560EFADA8D00CB2012 /* Locale Script */ = {
+		57E347640C4A8F9F006AA781 /* Locale Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -5703,48 +5815,51 @@
 			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localised.sh\nfi";
 			showEnvVarsInLog = 0;
 		};
-		73B9575A0EFADAE100CB2012 /* Localise Help */ = {
+		57FF7D9F0E6917BF00553709 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Localise Help";
+			name = "Run Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localise-help.sh\nfi";
-			showEnvVarsInLog = 0;
+			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";
 		};
-		73B957620EFADB6500CB2012 /* Complete Embedding */ = {
+		57FF7DBA0E6919F400553709 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				../src/hugin_config_mac.h,
 			);
-			name = "Complete Embedding";
 			outputPaths = (
+				../src/hugin_config.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-embed.sh\nfi";
-			showEnvVarsInLog = 0;
+			shellScript = "cp -r ../src/hugin_config_mac.h ../src/hugin_config.h\n\n";
 		};
-		73F8000C0F2CAB5300C22CB9 /* ShellScript */ = {
+		57FF7DC00E691A1800553709 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"../mac/SVN-rev.xcconfig",
+				../mac/Version.xcconfig,
+				../src/hugin_version.h.in.cmake,
 			);
 			outputPaths = (
+				../src/hugin_version.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h";
+			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/^.*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";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -6059,6 +6174,45 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		57D50A360F595A6300CCDCB5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D50A660F595AD500CCDCB5 /* Batch.cpp in Sources */,
+				57D50A670F595AD500CCDCB5 /* ProjectArray.cpp in Sources */,
+				57D50A680F595AD500CCDCB5 /* RunStitchFrame.cpp in Sources */,
+				57D50A690F595AD500CCDCB5 /* BatchFrame.cpp in Sources */,
+				57D50A6A0F595AD500CCDCB5 /* ProjectListBox.cpp in Sources */,
+				57D50A6B0F595AD500CCDCB5 /* PTBatcherGUI.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		57D50AD00F596DB700CCDCB5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D50AE90F596E5300CCDCB5 /* Celeste.cpp in Sources */,
+				57D50AEA0F596E5300CCDCB5 /* CelesteGlobals.cpp in Sources */,
+				57D50AEB0F596E5300CCDCB5 /* ContrastFilter.cpp in Sources */,
+				57D50AEC0F596E5300CCDCB5 /* Gabor.cpp in Sources */,
+				57D50AED0F596E5300CCDCB5 /* GaborFilter.cpp in Sources */,
+				57D50AEE0F596E5300CCDCB5 /* GaborJet.cpp in Sources */,
+				57D50AEF0F596E5300CCDCB5 /* ImageFile.cpp in Sources */,
+				57D50AF00F596E5300CCDCB5 /* LogPolar.cpp in Sources */,
+				57D50AF10F596E5300CCDCB5 /* PGMImage.cpp in Sources */,
+				57D50AF20F596E5300CCDCB5 /* svm.cpp in Sources */,
+				57D50AF30F596E5300CCDCB5 /* Utilities.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		57D50B3B0F5971A600CCDCB5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D50B3C0F5971A600CCDCB5 /* Main.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		57E122550D2BE4E800743A93 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6113,6 +6267,7 @@
 				734FBA6B0EB3A20500CD7122 /* VertexCoordRemapper.cpp in Sources */,
 				734FBA6C0EB3A20500CD7122 /* ViewState.cpp in Sources */,
 				734FBA850EB3A40300CD7122 /* NonaOptionsDialog.cpp in Sources */,
+				57D5093C0F5942FB00CCDCB5 /* CPImagesComboBox.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6176,24 +6331,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		734FB8CD0EB38AB600CD7122 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				734FB9060EB38B9500CD7122 /* Celeste.cpp in Sources */,
-				734FB9080EB38B9500CD7122 /* CelesteGlobals.cpp in Sources */,
-				734FB90B0EB38B9500CD7122 /* ContrastFilter.cpp in Sources */,
-				734FB90D0EB38B9500CD7122 /* Gabor.cpp in Sources */,
-				734FB90F0EB38B9500CD7122 /* GaborFilter.cpp in Sources */,
-				734FB9120EB38B9500CD7122 /* GaborJet.cpp in Sources */,
-				734FB9140EB38B9500CD7122 /* ImageFile.cpp in Sources */,
-				734FB9160EB38B9500CD7122 /* LogPolar.cpp in Sources */,
-				734FB9190EB38B9500CD7122 /* PGMImage.cpp in Sources */,
-				734FB91B0EB38B9500CD7122 /* svm.cpp in Sources */,
-				734FB91F0EB38B9500CD7122 /* Utilities.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		739CADA70EC86B30002FD3AF /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6212,20 +6349,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		73C3C92F0ECCB39700A3089A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				732A11DC0EDA993500EB5159 /* Batch.cpp in Sources */,
-				732A11DF0EDA998500EB5159 /* PTBatcherGUI_rc.rc in Sources */,
-				732A11DD0EDA993500EB5159 /* ProjectArray.cpp in Sources */,
-				732A11DE0EDA993500EB5159 /* RunStitchFrame.cpp in Sources */,
-				73C3C9500ECCB4AA00A3089A /* BatchFrame.cpp in Sources */,
-				73C3C9510ECCB4AA00A3089A /* ProjectListBox.cpp in Sources */,
-				73C3C9520ECCB4AA00A3089A /* PTBatcherGUI.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73C958F70DA2C9DB00E19110 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6423,6 +6546,56 @@
 			target = 57D382ED0E236A0800445A37 /* matchpoint static */;
 			targetProxy = 57D383300E236B6A00445A37 /* PBXContainerItemProxy */;
 		};
+		57D50A300F595A6300CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FC280D24A26400A6AD01 /* frameworks */;
+			targetProxy = 57D50A310F595A6300CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50A320F595A6300CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5796FA730C4395CC006B7C6E /* nona dynamic */;
+			targetProxy = 57D50A330F595A6300CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50A340F595A6300CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */;
+			targetProxy = 57D50A350F595A6300CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50A6F0F595BDE00CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 739CADA90EC86B30002FD3AF /* celeste Framework */;
+			targetProxy = 57D50A6E0F595BDE00CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50B020F59714100CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900D70D24D32C00A6AD01 /* base_wx Framework */;
+			targetProxy = 57D50B010F59714100CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50B390F5971A600CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57C486290C3121E8002D79F1 /* configure */;
+			targetProxy = 57D50B3A0F5971A600CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50B550F5971F600CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 739CADA90EC86B30002FD3AF /* celeste Framework */;
+			targetProxy = 57D50B540F5971F600CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50B570F5971F600CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FC280D24A26400A6AD01 /* frameworks */;
+			targetProxy = 57D50B560F5971F600CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50B590F59720700CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57D50ACA0F596DB700CCDCB5 /* celeste */;
+			targetProxy = 57D50B580F59720700CCDCB5 /* PBXContainerItemProxy */;
+		};
+		57D50B5B0F59720C00CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57E3470D0C4A8E95006AA781 /* lib static */;
+			targetProxy = 57D50B5A0F59720C00CCDCB5 /* PBXContainerItemProxy */;
+		};
 		57E347130C4A8EB6006AA781 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 576EC4980C3FC9300076A417 /* huginapp */;
@@ -6538,16 +6711,6 @@
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 7332AE950D8D4986002BF5FF /* PBXContainerItemProxy */;
 		};
-		733490C00ECB2BB9006309E3 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 734FB8CF0EB38AB600CD7122 /* celeste */;
-			targetProxy = 733490BF0ECB2BB9006309E3 /* PBXContainerItemProxy */;
-		};
-		733490C50ECB2BE9006309E3 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 733490BB0ECB2B99006309E3 /* Dylibs */;
-			targetProxy = 733490C40ECB2BE9006309E3 /* PBXContainerItemProxy */;
-		};
 		737E1C200EC9EC5100BA4D9B /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 57C486290C3121E8002D79F1 /* configure */;
@@ -6563,11 +6726,6 @@
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 739F84FF0EC7803F004771D6 /* PBXContainerItemProxy */;
 		};
-		73C3C93D0ECCB3EB00A3089A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3683
          http://hugin.svn.sourceforge.net/hugin/?rev=3683&view=rev
Author:   ippei
Date:     2009-02-28 13:31:53 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Mac: Info files version description revised.

Modified Paths:
--------------
    hugin/trunk/mac/Hugin-Info.plist
    hugin/trunk/mac/base_wx-Info.plist
    hugin/trunk/mac/hugin_base-Info.plist
    hugin/trunk/mac/hugin_stitch_project-Info.plist
    hugin/trunk/mac/nona_gui-Info.plist
    hugin/trunk/mac/vigra_impex-Info.plist

Modified: hugin/trunk/mac/Hugin-Info.plist
===================================================================
--- hugin/trunk/mac/Hugin-Info.plist	2009-02-28 13:31:12 UTC (rev 3682)
+++ hugin/trunk/mac/Hugin-Info.plist	2009-02-28 13:31:53 UTC (rev 3683)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>Hugin</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string>
 	<key>CFBundleIconFile</key>

Modified: hugin/trunk/mac/base_wx-Info.plist
===================================================================
--- hugin/trunk/mac/base_wx-Info.plist	2009-02-28 13:31:12 UTC (rev 3682)
+++ hugin/trunk/mac/base_wx-Info.plist	2009-02-28 13:31:53 UTC (rev 3683)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -16,5 +16,7 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string>
 </dict>
 </plist>

Modified: hugin/trunk/mac/hugin_base-Info.plist
===================================================================
--- hugin/trunk/mac/hugin_base-Info.plist	2009-02-28 13:31:12 UTC (rev 3682)
+++ hugin/trunk/mac/hugin_base-Info.plist	2009-02-28 13:31:53 UTC (rev 3683)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -16,5 +16,7 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string>
 </dict>
 </plist>

Modified: hugin/trunk/mac/hugin_stitch_project-Info.plist
===================================================================
--- hugin/trunk/mac/hugin_stitch_project-Info.plist	2009-02-28 13:31:12 UTC (rev 3682)
+++ hugin/trunk/mac/hugin_stitch_project-Info.plist	2009-02-28 13:31:53 UTC (rev 3683)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -26,9 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>HuginStitchProject</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
@@ -37,13 +35,15 @@
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>LSUIElement</key>
+	<string>1</string>
 	<key>CFBundleVersion</key>
-	<string></string>
-    <key>LSUIElement</key>
-	<string>1</string>
+	<string>${HUGIN_WC_REVISION}</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${HUGIN_PACKAGE_VERSION}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string>
 </dict>
 </plist>

Modified: hugin/trunk/mac/nona_gui-Info.plist
===================================================================
--- hugin/trunk/mac/nona_gui-Info.plist	2009-02-28 13:31:12 UTC (rev 3682)
+++ hugin/trunk/mac/nona_gui-Info.plist	2009-02-28 13:31:53 UTC (rev 3683)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -38,10 +38,10 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>${HUGIN_WC_REVISION}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string>
 	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
+	<string>${HUGIN_PACKAGE_VERSION}</string>
 </dict>
 </plist>

Modified: hugin/trunk/mac/vigra_impex-Info.plist
===================================================================
--- hugin/trunk/mac/vigra_impex-Info.plist	2009-02-28 13:31:12 UTC (rev 3682)
+++ hugin/trunk/mac/vigra_impex-Info.plist	2009-02-28 13:31:53 UTC (rev 3683)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -16,5 +16,7 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string>
 </dict>
 </plist>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3686
          http://hugin.svn.sourceforge.net/hugin/?rev=3686&view=rev
Author:   ippei
Date:     2009-02-28 16:21:01 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Mac: updated external libraries.

Modified Paths:
--------------
    hugin/trunk/mac/ExternalPrograms/readme.txt
    hugin/trunk/mac/ExternalPrograms/scripts/boost.sh
    hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj

Modified: hugin/trunk/mac/ExternalPrograms/readme.txt
===================================================================
--- hugin/trunk/mac/ExternalPrograms/readme.txt	2009-02-28 13:34:25 UTC (rev 3685)
+++ hugin/trunk/mac/ExternalPrograms/readme.txt	2009-02-28 16:21:01 UTC (rev 3686)
@@ -24,36 +24,38 @@
 The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. 
 
 [Dynamic Build for distributable Hugin.app]
-boost (1.36)
+boost (1.38)
 libexpat (2.0.1)
 libjpeg (6b)
-libpng (1.2.30)
+libpng (1.2.35)
 libtiff (3.8.2)
 ilmbase (1.0.1)
 openexr16 (1.6.1)
-pano13 (2.9.12 or svn)
+pano13 (2.9.14-beta1)
 wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693)
-static/libexiv2 (0.17.1)
+static/libexiv2 (0.18)
 static/lcms (1.17)
 static/libxmi (1.2)
+static/libglew (1.5.1)
 gnumake (Darwin 9/gnumake-119/make)
-enblend31 (cvs or 3.1)
+enblend (3.2)
 
 [Static Build for distributable command-line tools]
-static/boost (1.36)
+static/boost (1.38)
 static/libexpat (2.0.1)
 static/libjpeg (6b)
-static/libpng (1.2.30)
+static/libpng (1.2.35)
 static/libtiff (3.8.2)
 static/ilmbase (1.0.1)
 static/openexr16 (1.6.1)
-static/pano13 (2.9.12 or svn)
+static/pano13 (2.9.14-beta1)
 static/wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693)
-static/libexiv2 (0.17.1)
+static/libexiv2 (0.18)
 static/lcms (1.17)
 static/libxmi (1.2)
+static/libglew (1.5.1)
 gnumake (Darwin 9 source: gnumake-119/make)
-enblend31 (cvs or 3.1)
+enblend31 (3.2)
 
 LICENSE:
 The scripts for compiling universal builds are originally copyrighted by Ippei Ukai (2007-2008), and distributed under the modified BSD license.
Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh	2009-02-28 13:34:25 UTC (rev 3685)
+++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh	2009-02-28 16:21:01 UTC (rev 3686)
@@ -19,7 +19,7 @@
 #  OTHERARGs="";
 
 
-BOOST_VER="1_36"
+BOOST_VER="1_38"
 
 # install headers
 

Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh	2009-02-28 13:34:25 UTC (rev 3685)
+++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh	2009-02-28 16:21:01 UTC (rev 3686)
@@ -20,7 +20,7 @@
 
 
 
-PNGVER="1.2.32"
+PNGVER="1.2.35"
 
 
 # init

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-02-28 13:34:25 UTC (rev 3685)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-02-28 16:21:01 UTC (rev 3686)
@@ -80,17 +80,18 @@
 			name = "lib static";
 			productName = lib;
 		};
-		57E347300C4A8EDF006AA781 /* app */ = {
+		57E347300C4A8EDF006AA781 /* Apps */ = {
 			isa = PBXAggregateTarget;
-			buildConfigurationList = 57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "app" */;
+			buildConfigurationList = 57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "Apps" */;
 			buildPhases = (
 			);
 			dependencies = (
 				57E347470C4A8EF8006AA781 /* PBXTargetDependency */,
 				57525A2E0C54BC8400BF8096 /* PBXTargetDependency */,
 				5769FDB30D24BB1D00A6AD01 /* PBXTargetDependency */,
+				57D50C2A0F59999000CCDCB5 /* PBXTargetDependency */,
 			);
-			name = app;
+			name = Apps;
 			productName = app;
 		};
 		57E347330C4A8EED006AA781 /* tools */ = {
@@ -1341,14 +1342,14 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */;
+			remoteGlobalIDString = 739CADA90EC86B30002FD3AF;
 			remoteInfo = "celeste Framework";
 		};
 		57D50B010F59714100CCDCB5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 576900D70D24D32C00A6AD01 /* base_wx Framework */;
+			remoteGlobalIDString = 576900D70D24D32C00A6AD01;
 			remoteInfo = "base_wx Framework";
 		};
 		57D50B3A0F5971A600CCDCB5 /* PBXContainerItemProxy */ = {
@@ -1362,30 +1363,37 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */;
+			remoteGlobalIDString = 739CADA90EC86B30002FD3AF;
 			remoteInfo = "celeste Framework";
 		};
 		57D50B560F5971F600CCDCB5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 5769FC280D24A26400A6AD01 /* frameworks */;
+			remoteGlobalIDString = 5769FC280D24A26400A6AD01;
 			remoteInfo = frameworks;
 		};
 		57D50B580F59720700CCDCB5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5 /* celeste */;
+			remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5;
 			remoteInfo = celeste;
 		};
 		57D50B5A0F59720C00CCDCB5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */;
+			remoteGlobalIDString = 57E3470D0C4A8E95006AA781;
 			remoteInfo = "lib static";
 		};
+		57D50C290F59999000CCDCB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D50A2F0F595A6300CCDCB5;
+			remoteInfo = PTBatcherGUI;
+		};
 		57E347120C4A8EB6006AA781 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -2156,7 +2164,7 @@
 		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 /* libceleste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libceleste.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = "<group>"; };
+		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>"; };
@@ -5446,7 +5454,7 @@
 				571046810D25F698006A3C69 /* bundled tools */,
 				5796FA730C4395CC006B7C6E /* nona dynamic */,
 				5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */,
-				57E347300C4A8EDF006AA781 /* app */,
+				57E347300C4A8EDF006AA781 /* Apps */,
 				5769F5FF0D23825700A6AD01 /* StitchProject */,
 				739CADA90EC86B30002FD3AF /* celeste Framework */,
 				57E3467D0C4A89B0006AA781 /* Hugin */,
@@ -6596,6 +6604,11 @@
 			target = 57E3470D0C4A8E95006AA781 /* lib static */;
 			targetProxy = 57D50B5A0F59720C00CCDCB5 /* PBXContainerItemProxy */;
 		};
+		57D50C2A0F59999000CCDCB5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */;
+			targetProxy = 57D50C290F59999000CCDCB5 /* PBXContainerItemProxy */;
+		};
 		57E347130C4A8EB6006AA781 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 576EC4980C3FC9300076A417 /* huginapp */;
@@ -9440,7 +9453,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "app" */ = {
+		57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "Apps" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				57E347520C4A8F24006AA781 /* Debug */,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3732
          http://hugin.svn.sourceforge.net/hugin/?rev=3732&view=rev
Author:   harryvanderwolf
Date:     2009-03-14 16:10:46 +0000 (Sat, 14 Mar 2009)

Log Message:
-----------
[OSX] updates to localisation neccessary for added italian help files

Modified Paths:
--------------
    hugin/trunk/mac/localise-help.sh
    hugin/trunk/mac/localised.sh

Modified: hugin/trunk/mac/localise-help.sh
===================================================================
--- hugin/trunk/mac/localise-help.sh	2009-03-14 15:12:39 UTC (rev 3731)
+++ hugin/trunk/mac/localise-help.sh	2009-03-14 16:10:46 UTC (rev 3732)
@@ -8,7 +8,7 @@
 
 mkdir -p "$resdir"
 
-for helplang in "en_EN" "fr_FR"
+for helplang in "en_EN" "fr_FR" "it_IT"
 do
  
   localisedresdir="$resdir/$(echo $helplang  | grep -o '^[^_]*').lproj"

Modified: hugin/trunk/mac/localised.sh
===================================================================
--- hugin/trunk/mac/localised.sh	2009-03-14 15:12:39 UTC (rev 3731)
+++ hugin/trunk/mac/localised.sh	2009-03-14 16:10:46 UTC (rev 3732)
@@ -31,7 +31,7 @@
  then
   continue
  else
-   if [ $lang != "fr" ]
+   if [ $lang != "fr" ] && [ $lang != "it" ]
    then
        ln -s "$resdir/en.lproj/help" "$localisedresdir/help"
    fi
@@ -76,4 +76,4 @@
 #  cp "$xrcsrcdir/data/$file" $localisedresdir/`echo $file|sed s/_$lang//`
 # done
 
-done
\ No newline at end of file
+done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3765
          http://hugin.svn.sourceforge.net/hugin/?rev=3765&view=rev
Author:   ippei
Date:     2009-03-29 16:08:03 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
Mac: celeste model to be installed in the xrc/data dir as with other platforms

Modified Paths:
--------------
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
    hugin/trunk/mac/patch-xrc.sh

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-03-29 16:06:12 UTC (rev 3764)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-03-29 16:08:03 UTC (rev 3765)
@@ -596,6 +596,7 @@
 		5769FE6D0D24D09B00A6AD01 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
 		5769FE6E0D24D09B00A6AD01 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
 		5769FE6F0D24D09B00A6AD01 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */; };
 		576DA17B0C3CF8A5006E8D90 /* NonaImageStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */; };
 		576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */; };
 		576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; };
@@ -800,7 +801,6 @@
 		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 */; };
-		57D50AC20F596D4900CCDCB5 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; };
 		57D50AC70F596D6900CCDCB5 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; };
 		57D50ADC0F596E3D00CCDCB5 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
 		57D50ADD0F596E3D00CCDCB5 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; };
@@ -841,7 +841,7 @@
 		57D50B4A0F5971A600CCDCB5 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
 		57D50B4C0F5971A600CCDCB5 /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
 		57D50B4D0F5971A600CCDCB5 /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; };
-		57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libceleste.a */; };
+		57D50B5E0F59724800CCDCB5 /* libhugin_celeste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */; };
 		57D50B610F59725E00CCDCB5 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
 		57D50B620F59725E00CCDCB5 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; };
 		57D50B630F59725E00CCDCB5 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; };
@@ -858,9 +858,6 @@
 		57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; };
 		57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; };
 		57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; };
-		57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; };
-		57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; };
-		57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		57E1225C0D2BE50700743A93 /* align_image_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5769F83B0D23A98400A6AD01 /* align_image_stack.cpp */; };
 		57E346880C4A89E6006AA781 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331010C4A8859006AA781 /* AssistantPanel.cpp */; };
 		57E3468A0C4A89E6006AA781 /* AutoCtrlPointCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */; };
@@ -962,31 +959,6 @@
 		7358165D0ECA0D98009E94DC /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; };
 		737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
 		7388EAFD0F6BFB1B001E08FA /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; };
-		7394A2020EC8A8F000DCEE85 /* celeste.model in Resources */ = {isa = PBXBuildFile; fileRef = 734FB8E80EB38B9400CD7122 /* celeste.model */; };
-		739CADC80EC86F44002FD3AF /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
-		739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; };
-		739CADCA0EC86F44002FD3AF /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; };
-		739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; };
-		739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; };
-		739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; };
-		739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; };
-		739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; };
-		739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; };
-		739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; };
-		739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; };
-		739CADD30EC86F44002FD3AF /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; };
-		739CADD40EC86F44002FD3AF /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; };
-		739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; };
-		739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; };
-		739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; };
-		739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; };
-		739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; };
-		739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; };
-		739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; };
-		739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; };
-		739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; };
-		739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; };
-		739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; };
 		739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
 		739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
@@ -1241,6 +1213,13 @@
 			remoteGlobalIDString = 5769F5FF0D23825700A6AD01;
 			remoteInfo = StitchProject;
 		};
+		576ADD910F7FB09E003E8EE3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5 /* celeste */;
+			remoteInfo = celeste;
+		};
 		57AC37480D2BE6D80086D348 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1339,13 +1318,6 @@
 			remoteGlobalIDString = 5769F8460D23AA5D00A6AD01;
 			remoteInfo = "tools hugin_hdrmerge";
 		};
-		57D50A6E0F595BDE00CCDCB5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 739CADA90EC86B30002FD3AF;
-			remoteInfo = "celeste Framework";
-		};
 		57D50B010F59714100CCDCB5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1360,13 +1332,6 @@
 			remoteGlobalIDString = 57C486290C3121E8002D79F1;
 			remoteInfo = configure;
 		};
-		57D50B540F5971F600CCDCB5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 739CADA90EC86B30002FD3AF;
-			remoteInfo = "celeste Framework";
-		};
 		57D50B560F5971F600CCDCB5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1711,7 +1676,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */,
 				576901C40D24D7DB00A6AD01 /* HuginVigraImpex.framework in Copy Frameworks */,
 				576901C50D24D7DB00A6AD01 /* HuginBase.framework in Copy Frameworks */,
 				576901C60D24D7DB00A6AD01 /* HuginBaseWx.framework in Copy Frameworks */,
@@ -2034,6 +1998,7 @@
 		5769F8440D23A9F400A6AD01 /* khanSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = khanSupport.cpp; sourceTree = "<group>"; };
 		5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; };
 		5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginVigraImpex.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		576ADDB60F7FB5F2003E8EE3 /* training */ = {isa = PBXFileReference; lastKnownFileType = folder; path = training; sourceTree = "<group>"; };
 		576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaImageStitcher.cpp; path = algorithms/nona/NonaImageStitcher.cpp; sourceTree = "<group>"; };
 		576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaImageStitcher.h; path = algorithms/nona/NonaImageStitcher.h; sourceTree = "<group>"; };
 		576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaFileStitcher.cpp; path = algorithms/nona/NonaFileStitcher.cpp; sourceTree = "<group>"; };
@@ -2179,7 +2144,7 @@
 		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 /* libceleste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libceleste.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_celeste.a; 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>"; };
@@ -2260,7 +2225,7 @@
 		57E331020C4A8859006AA781 /* AssistantPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AssistantPanel.h; sourceTree = "<group>"; };
 		57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AutoCtrlPointCreator.cpp; sourceTree = "<group>"; };
 		57E331040C4A8859006AA781 /* AutoCtrlPointCreator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AutoCtrlPointCreator.h; sourceTree = "<group>"; };
-		57E331060C4A8859006AA781 /* CPEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPEditorPanel.cpp; sourceTree = "<group>"; };
+		57E331060C4A8859006AA781 /* CPEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPEditorPanel.cpp; sourceTree = "<group>"; };
 		57E331070C4A8859006AA781 /* CPEditorPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanel.h; sourceTree = "<group>"; };
 		57E331080C4A8859006AA781 /* CPEditorPanelHandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanelHandler.h; sourceTree = "<group>"; };
 		57E331090C4A8859006AA781 /* CPEditorTest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorTest.h; sourceTree = "<group>"; };
@@ -2354,10 +2319,7 @@
 		734FB8DE0EB38B9400CD7122 /* Celeste.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Celeste.h; sourceTree = "<group>"; };
 		734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CelesteGlobals.cpp; sourceTree = "<group>"; };
 		734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteGlobals.h; sourceTree = "<group>"; };
-		734FB8E10EB38B9400CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
 		734FB8E20EB38B9400CD7122 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; };
-		734FB8E30EB38B9400CD7122 /* Config.h.linux */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Config.h.linux; sourceTree = "<group>"; };
-		734FB8E40EB38B9400CD7122 /* Config.h.win32 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Config.h.win32; sourceTree = "<group>"; };
 		734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContrastFilter.cpp; sourceTree = "<group>"; };
 		734FB8E60EB38B9400CD7122 /* ContrastFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContrastFilter.h; sourceTree = "<group>"; };
 		734FB8E80EB38B9400CD7122 /* celeste.model */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = celeste.model; sourceTree = "<group>"; };
@@ -2379,14 +2341,6 @@
 		734FB8F80EB38B9500CD7122 /* PGMImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PGMImage.h; sourceTree = "<group>"; };
 		734FB8F90EB38B9500CD7122 /* svm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svm.cpp; sourceTree = "<group>"; };
 		734FB8FA0EB38B9500CD7122 /* svm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svm.h; sourceTree = "<group>"; };
-		734FB8FC0EB38B9500CD7122 /* CelesteTrain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CelesteTrain.cpp; sourceTree = "<group>"; };
-		734FB8FD0EB38B9500CD7122 /* CelesteTrain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteTrain.h; sourceTree = "<group>"; };
-		734FB8FE0EB38B9500CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
-		734FB8FF0EB38B9500CD7122 /* create_svm_data_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = create_svm_data_10_fold.pl; sourceTree = "<group>"; };
-		734FB9000EB38B9500CD7122 /* get_flickr_clouds.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = get_flickr_clouds.pl; sourceTree = "<group>"; };
-		734FB9010EB38B9500CD7122 /* parse_results.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = parse_results.pl; sourceTree = "<group>"; };
-		734FB9020EB38B9500CD7122 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-		734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = svm_learn_class_10_fold.pl; sourceTree = "<group>"; };
 		734FB9040EB38B9500CD7122 /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utilities.cpp; sourceTree = "<group>"; };
 		734FB9050EB38B9500CD7122 /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; };
 		734FB9B20EB3929500CD7122 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = lib/libGLEW.a; sourceTree = "<group>"; };
@@ -2435,7 +2389,6 @@
 		7388EAFC0F6BFB1B001E08FA /* ResetDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetDialog.h; sourceTree = "<group>"; };
 		739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "lib/libwx_macu_gl-2.8.dylib"; sourceTree = "<group>"; };
-		73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginCleste.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; 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; };
 		73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-xgcc40-mt-1_36.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-xgcc40-mt-1_36.a"; sourceTree = SOURCE_ROOT; };
@@ -2812,7 +2765,7 @@
 				57D50B6A0F59725E00CCDCB5 /* libhugin_nona.a in Frameworks */,
 				57D50B6B0F59725E00CCDCB5 /* libhugin_algorithms.a in Frameworks */,
 				57D50B6C0F59725E00CCDCB5 /* libhugin_app.a in Frameworks */,
-				57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */,
+				57D50B5E0F59724800CCDCB5 /* libhugin_celeste.a in Frameworks */,
 				57D50B400F5971A600CCDCB5 /* libexiv2.a in Frameworks */,
 				57D50B410F5971A600CCDCB5 /* libpano13.dylib in Frameworks */,
 				57D50B420F5971A600CCDCB5 /* libboost_thread.dylib in Frameworks */,
@@ -2891,10 +2844,10 @@
 				576901EC0D24D95100A6AD01 /* HuginBase.framework in Frameworks */,
 				576901ED0D24D95100A6AD01 /* HuginBaseWx.framework in Frameworks */,
 				5731C7820D553C3D00605D22 /* libhugin_jhead.a in Frameworks */,
-				57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */,
 				734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */,
 				739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */,
 				739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */,
+				576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2942,14 +2895,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		739CADA80EC86B30002FD3AF /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73C958F90DA2C9DB00E19110 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -3006,7 +2951,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				57D50AC20F596D4900CCDCB5 /* HuginCleste.framework in Frameworks */,
 				73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */,
 				57D50AC70F596D6900CCDCB5 /* libexiv2.a in Frameworks */,
 				73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */,
@@ -3300,7 +3244,7 @@
 				57EA83860C3A798A00E4965E /* libhugin_algorithms.a */,
 				576EC4990C3FC9300076A417 /* libhugin_app.a */,
 				57E34A5C0C4ACAA1006AA781 /* libhugin_wxbase.a */,
-				57D50ADB0F596DB700CCDCB5 /* libceleste.a */,
+				57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */,
 			);
 			name = "lib-static";
 			sourceTree = "<group>";
@@ -3535,7 +3479,6 @@
 		5769FD140D24B3D400A6AD01 /* frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */,
 				5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */,
 				576900AA0D24D29300A6AD01 /* HuginBase.framework */,
 				576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */,
@@ -4000,9 +3943,9 @@
 				57E331020C4A8859006AA781 /* AssistantPanel.h */,
 				57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */,
 				57E331040C4A8859006AA781 /* AutoCtrlPointCreator.h */,
-				57E331060C4A8859006AA781 /* CPEditorPanel.cpp */,
 				57E331070C4A8859006AA781 /* CPEditorPanel.h */,
 				57E331080C4A8859006AA781 /* CPEditorPanelHandler.h */,
+				57E331060C4A8859006AA781 /* CPEditorPanel.cpp */,
 				57E331090C4A8859006AA781 /* CPEditorTest.h */,
 				57E34AB20C4ACC04006AA781 /* CPFineTuneFrame.cpp */,
 				57E34AB30C4ACC04006AA781 /* CPFineTuneFrame.h */,
@@ -4197,18 +4140,15 @@
 		734FB8DC0EB38B9400CD7122 /* celeste */ = {
 			isa = PBXGroup;
 			children = (
+				734FB8E20EB38B9400CD7122 /* Config.h */,
 				7358165C0ECA0D98009E94DC /* CelesteDebug.h */,
+				734FB8E70EB38B9400CD7122 /* data */,
 				734FB8DD0EB38B9400CD7122 /* Celeste.cpp */,
 				734FB8DE0EB38B9400CD7122 /* Celeste.h */,
 				734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */,
 				734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */,
-				734FB8E10EB38B9400CD7122 /* CMakeLists.txt */,
-				734FB8E20EB38B9400CD7122 /* Config.h */,
-				734FB8E30EB38B9400CD7122 /* Config.h.linux */,
-				734FB8E40EB38B9400CD7122 /* Config.h.win32 */,
 				734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */,
 				734FB8E60EB38B9400CD7122 /* ContrastFilter.h */,
-				734FB8E70EB38B9400CD7122 /* data */,
 				734FB8E90EB38B9400CD7122 /* Gabor.cpp */,
 				734FB8EA0EB38B9400CD7122 /* Gabor.h */,
 				734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */,
@@ -4218,8 +4158,6 @@
 				734FB8EF0EB38B9400CD7122 /* GaborJet.h */,
 				734FB8F00EB38B9400CD7122 /* ImageFile.cpp */,
 				734FB8F10EB38B9400CD7122 /* ImageFile.h */,
-				734FB8F20EB38B9400CD7122 /* LICENCE_GABOR */,
-				734FB8F30EB38B9400CD7122 /* LICENCE_LIBSVM */,
 				734FB8F40EB38B9500CD7122 /* LogPolar.cpp */,
 				734FB8F50EB38B9500CD7122 /* LogPolar.h */,
 				734FB8F60EB38B9500CD7122 /* Main.cpp */,
@@ -4227,9 +4165,11 @@
 				734FB8F80EB38B9500CD7122 /* PGMImage.h */,
 				734FB8F90EB38B9500CD7122 /* svm.cpp */,
 				734FB8FA0EB38B9500CD7122 /* svm.h */,
-				734FB8FB0EB38B9500CD7122 /* training */,
 				734FB9040EB38B9500CD7122 /* Utilities.cpp */,
 				734FB9050EB38B9500CD7122 /* Utilities.h */,
+				734FB8F20EB38B9400CD7122 /* LICENCE_GABOR */,
+				734FB8F30EB38B9400CD7122 /* LICENCE_LIBSVM */,
+				576ADDB60F7FB5F2003E8EE3 /* training */,
 			);
 			path = celeste;
 			sourceTree = "<group>";
@@ -4242,21 +4182,6 @@
 			path = data;
 			sourceTree = "<group>";
 		};
-		734FB8FB0EB38B9500CD7122 /* training */ = {
-			isa = PBXGroup;
-			children = (
-				734FB8FC0EB38B9500CD7122 /* CelesteTrain.cpp */,
-				734FB8FD0EB38B9500CD7122 /* CelesteTrain.h */,
-				734FB8FE0EB38B9500CD7122 /* CMakeLists.txt */,
-				734FB8FF0EB38B9500CD7122 /* create_svm_data_10_fold.pl */,
-				734FB9000EB38B9500CD7122 /* get_flickr_clouds.pl */,
-				734FB9010EB38B9500CD7122 /* parse_results.pl */,
-				734FB9020EB38B9500CD7122 /* README */,
-				734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */,
-			);
-			path = training;
-			sourceTree = "<group>";
-		};
 		73EAB5250E86CEA90020D514 /* repository-static */ = {
 			isa = PBXGroup;
 			children = (
@@ -4697,26 +4622,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		739CADA50EC86B30002FD3AF /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				739CADC80EC86F44002FD3AF /* Celeste.h in Headers */,
-				739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */,
-				739CADCA0EC86F44002FD3AF /* Config.h in Headers */,
-				739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */,
-				739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */,
-				739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */,
-				739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */,
-				739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */,
-				739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */,
-				739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */,
-				739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */,
-				739CADD30EC86F44002FD3AF /* svm.h in Headers */,
-				739CADD40EC86F44002FD3AF /* Utilities.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73EBC0CF0EC9E4A00068B821 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -5181,7 +5086,7 @@
 			);
 			name = celeste;
 			productName = nona;
-			productReference = 57D50ADB0F596DB700CCDCB5 /* libceleste.a */;
+			productReference = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		57D50B380F5971A600CCDCB5 /* celeste static */ = {
@@ -5229,7 +5134,7 @@
 				57E3467C0C4A89B0006AA781 /* Frameworks */,
 				576901E60D24D93300A6AD01 /* Copy Frameworks */,
 				57E3467A0C4A89B0006AA781 /* Resources */,
-				571D8C740E2132DE006D0305 /* Patch XRC */,
+				571D8C740E2132DE006D0305 /* Patch and Copy XRC */,
 				57E347640C4A8F9F006AA781 /* Locale Script */,
 				571D8C8E0E213833006D0305 /* Localise Help */,
 				576902030D24DA9500A6AD01 /* Complete Bundle */,
@@ -5239,7 +5144,7 @@
 			);
 			dependencies = (
 				576901B80D24D61C00A6AD01 /* PBXTargetDependency */,
-				57D50A6F0F595BDE00CCDCB5 /* PBXTargetDependency */,
+				576ADD920F7FB09E003E8EE3 /* PBXTargetDependency */,
 				5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */,
 			);
 			name = Hugin;
@@ -5317,24 +5222,6 @@
 			productReference = 734BDF5B0EB8EC19007EBA09 /* PTBatcher */;
 			productType = "com.apple.product-type.tool";
 		};
-		739CADA90EC86B30002FD3AF /* celeste Framework */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */;
-			buildPhases = (
-				57D50AA90F59661200CCDCB5 /* Copy celeste config.h */,
-				739CADA50EC86B30002FD3AF /* Headers */,
-				739CADA70EC86B30002FD3AF /* Sources */,
-				739CADA80EC86B30002FD3AF /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "celeste Framework";
-			productName = "celeste Framework";
-			productReference = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 		73C958F40DA2C9DB00E19110 /* tca_correct static */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */;
@@ -5383,7 +5270,6 @@
 			dependencies = (
 				737E1C200EC9EC5100BA4D9B /* PBXTargetDependency */,
 				57D50B570F5971F600CCDCB5 /* PBXTargetDependency */,
-				57D50B550F5971F600CCDCB5 /* PBXTargetDependency */,
 			);
 			name = "celeste dynamic";
 			productName = celeste_standalone;
@@ -5440,9 +5326,9 @@
 				5759DA4E0C327D680043F754 /* panodata */,
 				571300640C33D41F00252FE3 /* panotools */,
 				574092290C393E6600D16607 /* nona */,
+				57D50ACA0F596DB700CCDCB5 /* celeste */,
 				57EA83850C3A798A00E4965E /* algorithms */,
 				576EC4980C3FC9300076A417 /* huginapp */,
-				57D50ACA0F596DB700CCDCB5 /* celeste */,
 				57E34A5B0C4ACAA1006AA781 /* wxbase */,
 				5769FC280D24A26400A6AD01 /* frameworks */,
 				5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */,
@@ -5453,7 +5339,6 @@
 				5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */,
 				57E347300C4A8EDF006AA781 /* Apps */,
 				5769F5FF0D23825700A6AD01 /* StitchProject */,
-				739CADA90EC86B30002FD3AF /* celeste Framework */,
 				57E3467D0C4A89B0006AA781 /* Hugin */,
 				57525A240C54BC4400BF8096 /* Nona */,
 				57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */,
@@ -5574,7 +5459,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7394A2020EC8A8F000DCEE85 /* celeste.model in Resources */,
 				57E347780C4A9005006AA781 /* Hugin.icns in Resources */,
 				57E347790C4A9005006AA781 /* HuginFiles.icns in Resources */,
 				5769F8940D23AB7300A6AD01 /* HuginStitchProject.app in Resources */,
@@ -5642,14 +5526,14 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localised.sh\nfi";
 		};
-		571D8C740E2132DE006D0305 /* Patch XRC */ = {
+		571D8C740E2132DE006D0305 /* Patch and Copy XRC */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Patch XRC";
+			name = "Patch and Copy XRC";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -5773,22 +5657,6 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localise-help.sh\nfi";
 		};
-		57D50AA90F59661200CCDCB5 /* Copy celeste config.h */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"celeste-Config.h",
-			);
-			name = "Copy celeste config.h";
-			outputPaths = (
-				../src/celeste/Config.h,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h";
-		};
 		57D50AF80F596E9600CCDCB5 /* Copy celeste config.h */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -6337,24 +6205,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		739CADA70EC86B30002FD3AF /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */,
-				739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */,
-				739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */,
-				739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */,
-				739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */,
-				739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */,
-				739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */,
-				739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */,
-				739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */,
-				739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */,
-				739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73C958F70DA2C9DB00E19110 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6497,6 +6347,11 @@
 			target = 5769F5FF0D23825700A6AD01 /* StitchProject */;
 			targetProxy = 5769FDB20D24BB1D00A6AD01 /* PBXContainerItemProxy */;
 		};
+		576ADD920F7FB09E003E8EE3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57D50ACA0F596DB700CCDCB5 /* celeste */;
+			targetProxy = 576ADD910F7FB09E003E8EE3 /* PBXContainerItemProxy */;
+		};
 		57AC37490D2BE6D80086D348 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 57E122570D2BE4E800743A93 /* align_image_stack static */;
@@ -6567,11 +6422,6 @@
 			target = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */;
 			targetProxy = 57D50A350F595A6300CCDCB5 /* PBXContainerItemProxy */;
 		};
-		57D50A6F0F595BDE00CCDCB5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 739CADA90EC86B30002FD3AF /* celeste Framework */;
-			targetProxy = 57D50A6E0F595BDE00CCDCB5 /* PBXContainerItemProxy */;
-		};
 		57D50B020F59714100CCDCB5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 576900D70D24D32C00A6AD01 /* base_wx Framework */;
@@ -6582,11 +6432,6 @@
 			target = 57C486290C3121E8002D79F1 /* configure */;
 			targetProxy = 57D50B3A0F5971A600CCDCB5 /* PBXContainerItemProxy */;
 		};
-		57D50B550F5971F600CCDCB5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 739CADA90EC86B30002FD3AF /* celeste Framework */;
-			targetProxy = 57D50B540F5971F600CCDCB5 /* PBXContainerItemProxy */;
-		};
 		57D50B570F5971F600CCDCB5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 5769FC280D24A26400A6AD01 /* frameworks */;
@@ -8220,11 +8065,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					../src/foreign,
 					../src/hugin_base,
 					../src/foreign/vigra,
 					"$(inherited)",
 				);
-				PRODUCT_NAME = celeste;
+				PRODUCT_NAME = hugin_celeste;
+				STRIP_STYLE = debugging;
 			};
 			name = Debug;
 		};
@@ -8232,11 +8079,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					../src/foreign,
 					../src/hugin_base,
 					../src/foreign/vigra,
 					"$(inherited)",
 				);
-				PRODUCT_NAME = celeste;
+				PRODUCT_NAME = hugin_celeste;
+				STRIP_STYLE = debugging;
 			};
 			name = Development;
 		};
@@ -8244,11 +8093,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					../src/foreign,
 					../src/hugin_base,
 					../src/foreign/vigra,
 					"$(inherited)",
 				);
-				PRODUCT_NAME = celeste;
+				PRODUCT_NAME = hugin_celeste;
+				STRIP_STYLE = debugging;
 			};
 			name = Release;
 		};
@@ -8881,52 +8732,6 @@
 			};
 			name = Release;
 		};
-		739CADAF0EC86B30002FD3AF /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEPLOYMENT_POSTPROCESSING = YES;
-				HEADER_SEARCH_PATHS = (
-					../src/foreign,
-					../src/foreign/vigra,
-					../src/hugin_base,
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "celeste-Info.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				PRODUCT_NAME = HuginCleste;
-			};
-			name = Debug;
-		};
-		739CADB00EC86B30002FD3AF /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					../src/foreign,
-					../src/foreign/vigra,
-					../src/hugin_base,
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "celeste-Info.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				PRODUCT_NAME = HuginCleste;
-			};
-			name = Development;
-		};
-		739CADB10EC86B30002FD3AF /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					../src/foreign,
-					../src/foreign/vigra,
-					../src/hugin_base,
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "celeste-Info.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				PRODUCT_NAME = HuginCleste;
-			};
-			name = Release;
-		};
 		73C959100DA2C9DB00E19110 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -9541,16 +9346,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				739CADAF0EC86B30002FD3AF /* Debug */,
-				739CADB00EC86B30002FD3AF /* Development */,
-				739CADB10EC86B30002FD3AF /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Modified: hugin/trunk/mac/patch-xrc.sh
===================================================================
--- hugin/trunk/mac/patch-xrc.sh	2009-03-29 16:06:12 UTC (rev 3764)
+++ hugin/trunk/mac/patch-xrc.sh	2009-03-29 16:08:03 UTC (rev 3765)
@@ -7,11 +7,12 @@
 resdir="$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources"
 huginsrcdir="../src/hugin1/hugin"
 xrcsrcdir="$huginsrcdir/xrc"
+celeste_data="../src/celeste/data"
 
 rm -fR $resdir/xrc
-echo copying xrc folder to $resdir/xrc
+echo "copying xrc folder to $resdir/xrc"
 cp -R $xrcsrcdir $resdir/
-echo removing extra files from xrc folder
+echo "removing extra files from xrc folder"
 for DIR in $resdir/xrc "$resdir/xrc/??*" "$resdir/xrc/??*/??*"
 do 
  rm -fR $DIR/.svn
@@ -21,12 +22,7 @@
  rm -f $DIR/CMake*
 done
 
-echo patching $resdir/xrc/cp_editor_panel.xrc to use wxChoice instead of wxNotebook
-mv $resdir/xrc/cp_editor_panel.xrc $resdir/xrc/cp_editor_panel.xrc-bk
-sed -e s/wxNotebook/wxChoice/ -e s/cp_editor_left_tab/cp_editor_left_choice/ -e s/cp_editor_right_tab/cp_editor_right_choice/ $resdir/xrc/cp_editor_panel.xrc-bk > $resdir/xrc/cp_editor_panel.xrc
-rm $resdir/xrc/cp_editor_panel.xrc-bk
-
-echo patching $resdir/xrc/main_frame.xrc to have no border around the tab control.
+echo "patching $resdir/xrc/main_frame.xrc to have no border around the tab control."
 mv $resdir/xrc/main_frame.xrc $resdir/xrc/main_frame.xrc-bk
 sed -e s/wxALL// $resdir/xrc/main_frame.xrc-bk > $resdir/xrc/main_frame.xrc
 rm $resdir/xrc/main_frame.xrc-bk
@@ -36,3 +32,6 @@
     -e "s/\${HUGIN_BUILDER}/$huginBuilder/g" \
     $resdir/xrc/data/about.htm.in > $resdir/xrc/data/about.htm
 rm $resdir/xrc/data/about.htm.in
+
+echo "copying celeste data"
+cp -f $celeste_data/* $resdir/xrc/data/
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3875
          http://hugin.svn.sourceforge.net/hugin/?rev=3875&view=rev
Author:   harryvanderwolf
Date:     2009-05-22 21:14:54 +0000 (Fri, 22 May 2009)

Log Message:
-----------
[OSX] Add PTBatcherGUI hack, only works on Leopard unfortunately; Add corrected XCode project (for hack)

Modified Paths:
--------------
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj

Added Paths:
-----------
    hugin/trunk/mac/PTBatcherGUI_hack/
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/PTBatcherGui
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/appIcon.icns
    hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script
    hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-05-22 17:04:32 UTC (rev 3874)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-05-22 21:14:54 UTC (rev 3875)
@@ -4994,6 +4994,7 @@
 				57D50A720F595D0E00CCDCB5 /* Patch XRC */,
 				57D50A940F59631C00CCDCB5 /* Localise Help */,
 				57D50A5D0F595A6300CCDCB5 /* Complete Bundle */,
+				730C9D220FC7389200BD61C0 /* PTBatcherGUI_hack */,
 			);
 			buildRules = (
 			);
@@ -5668,6 +5669,20 @@
 			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/^.*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";
 		};
+		730C9D220FC7389200BD61C0 /* PTBatcherGUI_hack */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = PTBatcherGUI_hack;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh\nfi";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist
===================================================================
--- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist	                        (rev 0)
+++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist	2009-05-22 21:14:54 UTC (rev 3875)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>PTBatcherGui</string>
+	<key>CFBundleExecutable</key>
+	<string>PTBatcherGui</string>
+	<key>CFBundleGetInfoString</key>
+	<string>PTBatcherGui 1.0 Copyright 2009 Pablo d'Angelo et al.</string>
+	<key>CFBundleIconFile</key>
+	<string>appIcon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>PTBatcherGui.Hugin.sourceforge.net</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>PTBatcherGui</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>PTBG</string>
+	<key>LSEnvironment</key>
+	<dict/>
+	<key>LSHasLocalizedDisplayName</key>
+	<false/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.4</string>
+	<key>LSUIElement</key>
+	<false/>
+	<key>NSAppleScriptEnabled</key>
+	<false/>
+	<key>NSHumanReadableCopyright</key>
+	<string>PTBatcherGui 1.0 Copyright 2009 Pablo d'Angelo et al.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/PTBatcherGui
===================================================================
(Binary files differ)


Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/PTBatcherGui
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist
===================================================================
--- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist	                        (rev 0)
+++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist	2009-05-22 21:14:54 UTC (rev 3875)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AppPathAsFirstArg</key>
+	<false/>
+	<key>Creator</key>
+	<string>Platypus-4.2</string>
+	<key>InterpreterParams</key>
+	<array/>
+	<key>IsDroppable</key>
+	<false/>
+	<key>OutputType</key>
+	<string>None</string>
+	<key>RemainRunningAfterCompletion</key>
+	<false/>
+	<key>RequiresAdminPrivileges</key>
+	<false/>
+	<key>ScriptInterpreter</key>
+	<string>/bin/sh</string>
+	<key>Secure</key>
+	<false/>
+	<key>TextBackground</key>
+	<string>#ffffff</string>
+	<key>TextEncoding</key>
+	<integer>1</integer>
+	<key>TextFont</key>
+	<string>Monaco</string>
+	<key>TextForeground</key>
+	<string>#000000</string>
+	<key>TextSize</key>
+	<real>10</real>
+</dict>
+</plist>

Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings
===================================================================
--- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings	                        (rev 0)
+++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings	2009-05-22 21:14:54 UTC (rev 3875)
@@ -0,0 +1,4 @@
+CFBundleName = "PTBatcherGui";
+CFBundleShortVersionString = "1.0";
+CFBundleGetInfoString = "PTBatcherGui version 1.0 Copyright 2009 Pablo d'Angelo et al.";
+NSHumanReadableCopyright = "Copyright 2009 Pablo d'Angelo et al..";
\ No newline at end of file

Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)


Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/appIcon.icns
===================================================================
(Binary files differ)


Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/appIcon.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script
===================================================================
--- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script	                        (rev 0)
+++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script	2009-05-22 21:14:54 UTC (rev 3875)
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Original author: Aaron Voisine <aaron@...>
+# pvQT modifications: Harry van der Wolf <harryvanderwolf@...>
+
+CWD="`dirname \"$0\"`"
+BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`"
+cd "$BASE"
+
+CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo $PWD)`"
+
+export DYLD_FRAMEWORK_PATH="$CWD/../Frameworks"
+export PATH="$CWD:$CWD/../MacOS:$PATH"
+
+
+# TODO: Have to add ".UTF-8" to the LANG since ommiting causes avidemux
+#       to crash on startup in locale_from_utf8().
+export LANG="`grep \"\`defaults read .GlobalPreferences AppleCollationOrder \
+        2>&1\`_\" /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | \
+        awk '{print $2}'`.UTF-8"
+
+if [ $# -lt 2 ];
+then
+    $CWD/../MacOS/PTBG
+else
+    $CWD/../MacOS/PTBG "$@"
+fi
+

Added: hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh
===================================================================
--- hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh	                        (rev 0)
+++ hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh	2009-05-22 21:14:54 UTC (rev 3875)
@@ -0,0 +1,28 @@
+#PTBatcherGUI hack 2009-05-22 Harry van der Wolf
+
+contentsdir="$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents"
+resdir="$contentsdir/Resources"
+PTBG_hackdir="PTBatcherGUI_hack"
+
+# First copy neccessary files to PTBatcherGUI.app
+cp $PTBG_hackdir/Contents/Info.plist $contentsdir
+cp $PTBG_hackdir/Contents/Resources/appIcon.icns $contentsdir/Resources
+cp $PTBG_hackdir/Contents/Resources/AppSettings.plist $contentsdir/Resources
+cp $PTBG_hackdir/Contents/Resources/script $contentsdir/Resources
+
+# rename current PTBatcherGUI and copy platypus version
+mv $contentsdir/MacOS/PTBatcherGui $contentsdir/MacOS/PTBG
+cp $PTBG_hackdir/Contents/MacOS/PTBatcherGui $contentsdir/MacOS
+
+# Copy project files
+cp -Rf  $PTBG_hackdir/Contents/Resources/English.lproj/* "$resdir/en.lproj"
+
+if [ $lang = "en" ]
+ then
+       continue
+ else
+       ln -s "$resdir/en.lproj/InfoPlist.strings" "$localisedresdir/InfoPlist.strings"
+       ln -s "$resdir/en.lproj/MainMenu.nib" "$localisedresdir/MainMenu.nib"
+ fi
+
+


Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4071
          http://hugin.svn.sourceforge.net/hugin/?rev=4071&view=rev
Author:   ippei
Date:     2009-07-20 02:53:23 +0000 (Mon, 20 Jul 2009)

Log Message:
-----------
Mac: updated external program versions.

Modified Paths:
--------------
    hugin/trunk/mac/BuildConfig.xcconfig.orig
    hugin/trunk/mac/ExternalPrograms/readme.txt
    hugin/trunk/mac/ExternalPrograms/scripts/boost.sh
    hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj

Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig
===================================================================
--- hugin/trunk/mac/BuildConfig.xcconfig.orig	2009-07-20 02:52:30 UTC (rev 4070)
+++ hugin/trunk/mac/BuildConfig.xcconfig.orig	2009-07-20 02:53:23 UTC (rev 4071)
@@ -31,11 +31,11 @@
 
 // wxWidgets
 WX_MAJOR_VERSION = 2.8
-WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.8/locale
+WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.10/locale
 
 // ExifTool
-EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.34
+EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.84
 
 // Boost Thread
-BOOST_VER = 1_36
+BOOST_VER = 1_39
 BOOST_THREAD_LIB = libboost_thread

Modified: hugin/trunk/mac/ExternalPrograms/readme.txt
===================================================================
--- hugin/trunk/mac/ExternalPrograms/readme.txt	2009-07-20 02:52:30 UTC (rev 4070)
+++ hugin/trunk/mac/ExternalPrograms/readme.txt	2009-07-20 02:53:23 UTC (rev 4071)
@@ -3,7 +3,7 @@
 
 
 HOWTO:
-1. Download the source. You typically want to place it in the "ExternalPrograms" folder.
+1. Download the source package of the external programs. You typically want to place it in the "ExternalPrograms" folder.
 2. Edit ExternalPrograms/scripts/SetEnv-*.txt file appropriately, especially the myREPOSITORYDIR variable.
 3. Open a Terminal window (bash is preferred).
 5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b')
@@ -15,25 +15,25 @@
 The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw).
 
 
-TIPS:
+USAGE:
 When compiling programs from source specifying the above directory as prefix. You probably have to specify the correct SDK (-isysroot) and MacOS target version (-mmacosx-version-min) as well.
 You can make multiple 'repositories' as well. For example, you can make one for statically and one for dynamically linked product, or ones with different target architecture/OS versions. 
 
 
-LIBRARIES:
+PROGRAMS:
 The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. 
 
-[Dynamic Build for distributable Hugin.app]
-boost (1.38)
+[Dynamic Build for distributable Hugin.app and PTBatcherGUI.app]
+boost (1.39)
 libexpat (2.0.1)
 libjpeg (6b)
-libpng (1.2.35)
+libpng (1.2.38)
 libtiff (3.8.2)
 ilmbase (1.0.1)
 openexr16 (1.6.1)
-pano13 (2.9.14-beta1)
-wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693)
-static/libexiv2 (0.18)
+pano13 (2.9.14)
+wxmac28 (2.8.10)
+static/libexiv2 (0.18.2)
 static/lcms (1.17)
 static/libxmi (1.2)
 static/libglew (1.5.1)
@@ -41,16 +41,16 @@
 enblend (3.2)
 
 [Static Build for distributable command-line tools]
-static/boost (1.38)
+static/boost (1.39)
 static/libexpat (2.0.1)
 static/libjpeg (6b)
-static/libpng (1.2.35)
+static/libpng (1.2.38)
 static/libtiff (3.8.2)
 static/ilmbase (1.0.1)
 static/openexr16 (1.6.1)
-static/pano13 (2.9.14-beta1)
-static/wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693)
-static/libexiv2 (0.18)
+static/pano13 (2.9.14)
+static/wxmac28 (2.8.10)
+static/libexiv2 (0.18.2)
 static/lcms (1.17)
 static/libxmi (1.2)
 static/libglew (1.5.1)
Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh	2009-07-20 02:52:30 UTC (rev 4070)
+++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh	2009-07-20 02:53:23 UTC (rev 4071)
@@ -19,7 +19,7 @@
 #  OTHERARGs="";
 
 
-BOOST_VER="1_38"
+BOOST_VER="1_39"
 
 # install headers
 

Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh	2009-07-20 02:52:30 UTC (rev 4070)
+++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh	2009-07-20 02:53:23 UTC (rev 4071)
@@ -20,7 +20,7 @@
 
 
 
-PNGVER="1.2.35"
+PNGVER="1.2.38"
 
 
 # init

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-07-20 02:52:30 UTC (rev 4070)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-07-20 02:53:23 UTC (rev 4071)
@@ -660,6 +660,7 @@
 		5785A3A20C3BED7F00DD8BD8 /* FitPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */; };
 		578ED0000A8D0C160028A7FB /* hdr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFC0A8D0C150028A7FB /* hdr.cxx */; };
 		578ED0010A8D0C160028A7FB /* rgbe.c in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFE0A8D0C160028A7FB /* rgbe.c */; };
+		578F27B21013825A005D8080 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; };
 		5796FA810C4395CC006B7C6E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		5796FA820C4395CC006B7C6E /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
 		5796FA830C4395CC006B7C6E /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
@@ -2813,6 +2814,7 @@
 				739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */,
 				739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */,
 				576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */,
+				578F27B21013825A005D8080 /* libexiv2.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8161,7 +8163,9 @@
 					"$(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_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = Hugin;
 			};
 			name = Debug;
@@ -8196,7 +8200,9 @@
 					"$(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_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = Hugin;
 			};
 			name = Development;
@@ -8231,7 +8237,9 @@
 					"$(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_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = Hugin;
 			};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4495
          http://hugin.svn.sourceforge.net/hugin/?rev=4495&view=rev
Author:   harryvanderwolf
Date:     2009-09-26 14:51:53 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
[OSX] correct stupid mistake w.r.t. internal bundle linking to english help file for languages without help file. This should now function correctly

Modified Paths:
--------------
    hugin/trunk/mac/localise-help.sh
    hugin/trunk/mac/localised.sh

Modified: hugin/trunk/mac/localise-help.sh
===================================================================
--- hugin/trunk/mac/localise-help.sh	2009-09-26 13:25:07 UTC (rev 4494)
+++ hugin/trunk/mac/localise-help.sh	2009-09-26 14:51:53 UTC (rev 4495)
@@ -5,7 +5,9 @@
 resdir="$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources"
 huginsrcdir="../src/hugin1/hugin"
 xrcsrcdir="$huginsrcdir/xrc"
+translationsdir="../src/translations"
 
+
 mkdir -p "$resdir"
 
 for helplang in "en_EN" "fr_FR" "it_IT"
@@ -25,4 +27,14 @@
    done
   fi
  
+done
+
+# Create softlinks to existing english help file in case a locale translation exist but no help files
+for lang in "en" $(ls $translationsdir/*.po | sed -e "s/^.*\///g" -e "s/\.po//g")
+do
+  if [ $lang != "fr" ] && [ $lang != "it" ] && [ $lang != "en" ]
+  then
+      cd "$resdir/$lang.lproj"
+      ln -s "../en.lproj/help" "help"
+  fi
 done
\ No newline at end of file

Modified: hugin/trunk/mac/localised.sh
===================================================================
--- hugin/trunk/mac/localised.sh	2009-09-26 13:25:07 UTC (rev 4494)
+++ hugin/trunk/mac/localised.sh	2009-09-26 14:51:53 UTC (rev 4495)
@@ -10,6 +10,11 @@
 
 mkdir -p "$resdir"
 
+# The first thing to do is create a fake en.lproj and en.lproj/help folder
+# If these do not exist the proper links can't be created
+#mkdir -p "$resdir/en.lproj"
+#mkdir -p "$resdir/en.lproj/help"
+
 for lang in "en" $(ls $translationsdir/*.po | sed -e "s/^.*\///g" -e "s/\.po//g")
 do
  
@@ -30,27 +35,28 @@
  if [ $lang = "en" ]
  then
   continue
- else
-   if [ $lang != "fr" ] && [ $lang != "it" ]
-   then
-       ln -s "$resdir/en.lproj/help" "$localisedresdir/help"
-   fi
+# else
+#   if [ $lang != "fr" ] && [ $lang != "it" ]
+#   then
+#       ln -sf "$resdir/en.lproj/help" "../$lang.lproj/help"
+#   fi
  fi
  
  echo "$lang/hugin.mo from $lang.po"
- msgfmt -v -o "$localedir/hugin.mo" "$translationsdir/$lang.po"
+ /opt/local/bin/msgfmt -v -o "$localedir/hugin.mo" "$translationsdir/$lang.po"
  
  echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$lang.po"
  if [ -f "$wxWidgetsLocaleDir/$lang.po" ]
  then
-  msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$lang.po"
+  /opt/local/bin/msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$lang.po"
+  # hack to get link to help file
  else
   echo "$lang.po not found;"
   parentLang=`echo $lang|sed s/_.*//`
   echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$parentLang.po"
   if [ -f "$wxWidgetsLocaleDir/$parentLang.po" ]
   then
-   msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$parentLang.po"
+   /opt/local/bin/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.

Revision: 4755
          http://hugin.svn.sourceforge.net/hugin/?rev=4755&view=rev
Author:   skipgaede
Date:     2009-12-08 03:45:56 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
[OSX] Add additional libraries needed for text translation

Modified Paths:
--------------
    hugin/trunk/mac/BuildConfig.xcconfig.orig
    hugin/trunk/mac/complete-bundle.sh

Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig
===================================================================
--- hugin/trunk/mac/BuildConfig.xcconfig.orig	2009-12-08 02:35:20 UTC (rev 4754)
+++ hugin/trunk/mac/BuildConfig.xcconfig.orig	2009-12-08 03:45:56 UTC (rev 4755)
@@ -4,28 +4,35 @@
 REPOSITORY_ABSOLUTE_PATH = /PATH/TO/HUGIN/SOURCE/mac/ExternalPrograms/repository
 REPOSITORY_DIR = ./ExternalPrograms/repository
 
-// GCC version can be 4.2 with Xcode 3.1
-//GCC_VERSION = 4.2
-
 // release architectures:
 RELEASE_ARCHS_32 = ppc i386
+// If doing a 4-way build on Leopard or Snow Leopard, Uncomment the following line
 //RELEASE_ARCHS_64 = ppc64 x86_64
 
+GCC_VERSION_i386 = 4.0
+GCC_VERSION_ppc  = 4.0
+// If building on Leopard or Snow Leopard, Uncomment the following 2 lines:
+//GCC_VERSION_x86_64 = 4.2
+//GCC_VERSION_ppc64  = 4.2
+
 // SDK target
 SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk
 SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk
+// If doing 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines:
 //SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk
 //SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk
 
 // deployment target
 MACOSX_DEPLOYMENT_TARGET_ppc = 10.4
 MACOSX_DEPLOYMENT_TARGET_i386 = 10.4
+// If doing 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines:
 //MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5
 //MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5
 
 // special optimization
 PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4
 PER_ARCH_CFLAGS_i386 = -march=prescott -mtune=pentium-m -ftree-vectorize
+// If doing 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines:
 //PER_ARCH_CFLAGS_ppc64 = -mcpu=G5 -mtune=G5 -ftree-vectorize
 //PER_ARCH_CFLAGS_x86_64 = -march=core2 -mtune=core2 -ftree-vectorize
 
@@ -33,9 +40,12 @@
 WX_MAJOR_VERSION = 2.8
 WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.10/locale
 
-// ExifTool
-EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.84
+// gettext
+GETTEXT_VERSION = 0.17
 
+/// ExifTool
+EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.96
+
 // Boost Thread
 BOOST_VER = 1_40
 BOOST_THREAD_LIB = libboost_thread

Modified: hugin/trunk/mac/complete-bundle.sh
===================================================================
--- hugin/trunk/mac/complete-bundle.sh	2009-12-08 02:35:20 UTC (rev 4754)
+++ hugin/trunk/mac/complete-bundle.sh	2009-12-08 03:45:56 UTC (rev 4755)
@@ -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" 
+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" 
 
 binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4759
          http://hugin.svn.sourceforge.net/hugin/?rev=4759&view=rev
Author:   skipgaede
Date:     2009-12-08 22:33:39 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
[OSX] added support for gettext libraries in BuildConfig.xcconfig.orig & Hugin.xcodeproj

Modified Paths:
--------------
    hugin/trunk/mac/BuildConfig.xcconfig.orig
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj

Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig
===================================================================
--- hugin/trunk/mac/BuildConfig.xcconfig.orig	2009-12-08 17:33:26 UTC (rev 4758)
+++ hugin/trunk/mac/BuildConfig.xcconfig.orig	2009-12-08 22:33:39 UTC (rev 4759)
@@ -1,6 +1,16 @@
 #include "../mac/Version.xcconfig"
 
+//----------------------------------
+// 20091208.0 sg Added gettext version, needed for libraries with embedded hyphen in name
+//               Added documentation about when absolute pathspecs are needed
+//----------------------------------
+
 // where external libraries are installed
+// Note: the repository directory can either be located within the source code tree,
+//   or external to the source code tree. If the directory is located within the tree,
+//   the path to it can be stated relative to the location of the "mac" directory as shown below.
+//   If the repository directory is external, give the fully qualified path to the repository
+//   for the value of REPOSITORY_DIR
 REPOSITORY_ABSOLUTE_PATH = /PATH/TO/HUGIN/SOURCE/mac/ExternalPrograms/repository
 REPOSITORY_DIR = ./ExternalPrograms/repository
 
@@ -11,7 +21,7 @@
 
 GCC_VERSION_i386 = 4.0
 GCC_VERSION_ppc  = 4.0
-// If building on Leopard or Snow Leopard, Uncomment the following 2 lines:
+// If doing a 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines:
 //GCC_VERSION_x86_64 = 4.2
 //GCC_VERSION_ppc64  = 4.2
 
@@ -38,12 +48,14 @@
 
 // wxWidgets
 WX_MAJOR_VERSION = 2.8
+// See comments above for REPOSITORY_DIR. This may need to be a fully qualified path.
 WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.10/locale
 
 // gettext
 GETTEXT_VERSION = 0.17
 
 /// ExifTool
+// See comments above for REPOSITORY_DIR. This may need to be a fully qualified path.
 EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.96
 
 // Boost Thread

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-12-08 17:33:26 UTC (rev 4758)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2009-12-08 22:33:39 UTC (rev 4759)
@@ -928,7 +928,7 @@
 		7332AEC40D8D4C45002BF5FF /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; };
 		73411F151077B205001831AF /* HDRMergeOptionDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73411F131077B205001831AF /* HDRMergeOptionDialog.cpp */; };
 		73437AC410BD9C7D0014F41D /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; };
-		73482F5C0FD97B3900B6088C /* libboost_thread-1_38.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73482F5B0FD97B3900B6088C /* libboost_thread-1_38.a */; };
+		73482F5C0FD97B3900B6088C /* libboost_thread-1_40.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73482F5B0FD97B3900B6088C /* libboost_thread-1_40.a */; };
 		734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB9B20EB3929500CD7122 /* libGLEW.a */; };
 		734FBA5B0EB3A20500CD7122 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */; };
 		734FBA5C0EB3A20500CD7122 /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */; };
@@ -1134,6 +1134,8 @@
 		73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		73EBC0AC0EC9E3540068B821 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
 		73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		E864E2C610CE8437007AC6E4 /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E864E2C510CE8437007AC6E4 /* liblcms.dylib */; };
+		E864E2C710CE8437007AC6E4 /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E864E2C510CE8437007AC6E4 /* liblcms.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -2456,8 +2458,8 @@
 		7332AEAE0D8D4986002BF5FF /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; 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_38.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-1_38.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-1_38.a"; sourceTree = SOURCE_ROOT; };
-		73482F5D0FD97B7200B6088C /* libboost_filesystem-xgcc40-mt-1_38.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_filesystem-xgcc40-mt-1_38.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_filesystem-xgcc40-mt-1_38.a"; sourceTree = SOURCE_ROOT; };
+		73482F5B0FD97B3900B6088C /* libboost_thread-1_40.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-1_40.a"; path = "ExternalPrograms/repository/lib/libboost_thread-1_40.a"; sourceTree = SOURCE_ROOT; };
+		73482F5D0FD97B7200B6088C /* libboost_filesystem-1_40.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_filesystem-1_40.a"; path = "ExternalPrograms/repository/lib/libboost_filesystem-1_40.a"; sourceTree = SOURCE_ROOT; };
 		734BDF5B0EB8EC19007EBA09 /* PTBatcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = PTBatcher; sourceTree = BUILT_PRODUCTS_DIR; };
 		734FB8DD0EB38B9400CD7122 /* Celeste.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Celeste.cpp; sourceTree = "<group>"; };
 		734FB8DE0EB38B9400CD7122 /* Celeste.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Celeste.h; sourceTree = "<group>"; };
@@ -2537,11 +2539,11 @@
 		736421C710763D0C000121C5 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
 		736421C810763D0C000121C5 /* algtinyvector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = algtinyvector.h; sourceTree = "<group>"; };
 		736421DF10763FCD000121C5 /* hugin_hdrmerge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hugin_hdrmerge.cpp; sourceTree = "<group>"; };
-		7368E40A1083930D00519ED0 /* libintl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.dylib; path = ../../ExternalPrograms/repository/lib/libintl.dylib; sourceTree = SOURCE_ROOT; };
-		7368E40B1083930D00519ED0 /* libgettextsrc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextsrc.dylib; path = ../../ExternalPrograms/repository/lib/libgettextsrc.dylib; sourceTree = SOURCE_ROOT; };
-		7368E40C1083930D00519ED0 /* libgettextpo.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextpo.dylib; path = ../../ExternalPrograms/repository/lib/libgettextpo.dylib; sourceTree = SOURCE_ROOT; };
-		7368E40D1083930D00519ED0 /* libgettextlib.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextlib.dylib; path = ../../ExternalPrograms/repository/lib/libgettextlib.dylib; sourceTree = SOURCE_ROOT; };
-		7368E40E1083930D00519ED0 /* libasprintf.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libasprintf.dylib; path = ../../ExternalPrograms/repository/lib/libasprintf.dylib; sourceTree = SOURCE_ROOT; };
+		7368E40A1083930D00519ED0 /* libintl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.dylib; path = lib/libintl.dylib; sourceTree = "<group>"; };
+		7368E40B1083930D00519ED0 /* libgettextsrc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextsrc.dylib; path = lib/libgettextsrc.dylib; sourceTree = "<group>"; };
+		7368E40C1083930D00519ED0 /* libgettextpo.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextpo.dylib; path = lib/libgettextpo.dylib; sourceTree = "<group>"; };
+		7368E40D1083930D00519ED0 /* libgettextlib.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextlib.dylib; path = lib/libgettextlib.dylib; sourceTree = "<group>"; };
+		7368E40E1083930D00519ED0 /* libasprintf.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libasprintf.dylib; path = lib/libasprintf.dylib; sourceTree = "<group>"; };
 		7368E4621083ABF200519ED0 /* NumTransDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumTransDialog.h; sourceTree = "<group>"; };
 		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>"; };
@@ -2559,7 +2561,7 @@
 		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>"; };
 		73C0DBA51046EAC700CB55B7 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; };
-		73C0DC001047011C00CB55B7 /* glew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glew.h; path = ../../ExternalPrograms/repository/include/GL/glew.h; sourceTree = SOURCE_ROOT; };
+		73C0DC001047011C00CB55B7 /* glew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glew.h; path = GL/glew.h; sourceTree = "<group>"; };
 		73C0DC6B104715E500CB55B7 /* PreviewControlPointTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewControlPointTool.cpp; sourceTree = "<group>"; };
 		73C0DC6C104715E500CB55B7 /* PreviewControlPointTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewControlPointTool.h; sourceTree = "<group>"; };
 		73C0DC6D104715E500CB55B7 /* GreatCircles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GreatCircles.h; sourceTree = "<group>"; };
@@ -2591,27 +2593,28 @@
 		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>"; };
 		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; name = libboost_thread.a; path = "../../ExternalPrograms/repository/lib-static/libboost_thread.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5290E86CF120020D514 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexiv2.a; path = "../../ExternalPrograms/repository/lib-static/libexiv2.a"; sourceTree = SOURCE_ROOT; };
-		73EAB52A0E86CF120020D514 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "../../ExternalPrograms/repository/lib-static/libexpat.a"; sourceTree = SOURCE_ROOT; };
-		73EAB52B0E86CF120020D514 /* libHalf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libHalf.a; path = "../../ExternalPrograms/repository/lib-static/libHalf.a"; sourceTree = SOURCE_ROOT; };
-		73EAB52C0E86CF120020D514 /* libIex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIex.a; path = "../../ExternalPrograms/repository/lib-static/libIex.a"; sourceTree = SOURCE_ROOT; };
-		73EAB52D0E86CF120020D514 /* libIlmImf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmImf.a; path = "../../ExternalPrograms/repository/lib-static/libIlmImf.a"; sourceTree = SOURCE_ROOT; };
-		73EAB52E0E86CF120020D514 /* libIlmThread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmThread.a; path = "../../ExternalPrograms/repository/lib-static/libIlmThread.a"; sourceTree = SOURCE_ROOT; };
-		73EAB52F0E86CF120020D514 /* libImath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libImath.a; path = "../../ExternalPrograms/repository/lib-static/libImath.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5300E86CF120020D514 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../ExternalPrograms/repository/lib-static/libjpeg.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5310E86CF120020D514 /* liblcms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblcms.a; path = "../../ExternalPrograms/repository/lib-static/liblcms.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5320E86CF120020D514 /* libpano13.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano13.a; path = "../../ExternalPrograms/repository/lib-static/libpano13.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5330E86CF120020D514 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../ExternalPrograms/repository/lib-static/libpng.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5340E86CF120020D514 /* libpng12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng12.a; path = "../../ExternalPrograms/repository/lib-static/libpng12.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5350E86CF120020D514 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = "../../ExternalPrograms/repository/lib-static/libtiff.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5360E86CF120020D514 /* libtiffxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiffxx.a; path = "../../ExternalPrograms/repository/lib-static/libtiffxx.a"; sourceTree = SOURCE_ROOT; };
-		73EAB5370E86CF120020D514 /* libxmi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxmi.a; path = "../../ExternalPrograms/repository/lib-static/libxmi.a"; sourceTree = SOURCE_ROOT; };
+		73EAB5280E86CF120020D514 /* libboost_thread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_thread.a; path = ExternalPrograms/repository/lib/libboost_thread.a; sourceTree = SOURCE_ROOT; };
+		73EAB5290E86CF120020D514 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexiv2.a; path = lib/libexiv2.a; sourceTree = "<group>"; };
+		73EAB52A0E86CF120020D514 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = lib/libexpat.a; sourceTree = "<group>"; };
+		73EAB52B0E86CF120020D514 /* libHalf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libHalf.a; path = lib/libHalf.a; sourceTree = "<group>"; };
+		73EAB52C0E86CF120020D514 /* libIex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIex.a; path = lib/libIex.a; sourceTree = "<group>"; };
+		73EAB52D0E86CF120020D514 /* libIlmImf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmImf.a; path = lib/libIlmImf.a; sourceTree = "<group>"; };
+		73EAB52E0E86CF120020D514 /* libIlmThread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmThread.a; path = lib/libIlmThread.a; sourceTree = "<group>"; };
+		73EAB52F0E86CF120020D514 /* libImath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libImath.a; path = lib/libImath.a; sourceTree = "<group>"; };
+		73EAB5300E86CF120020D514 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = lib/libjpeg.a; sourceTree = "<group>"; };
+		73EAB5310E86CF120020D514 /* liblcms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblcms.a; path = lib/liblcms.a; sourceTree = "<group>"; };
+		73EAB5320E86CF120020D514 /* libpano13.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano13.a; path = lib/libpano13.a; sourceTree = "<group>"; };
+		73EAB5330E86CF120020D514 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = lib/libpng.a; sourceTree = "<group>"; };
+		73EAB5340E86CF120020D514 /* libpng12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng12.a; path = lib/libpng12.a; sourceTree = "<group>"; };
+		73EAB5350E86CF120020D514 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = lib/libtiff.a; sourceTree = "<group>"; };
+		73EAB5360E86CF120020D514 /* libtiffxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiffxx.a; path = lib/libtiffxx.a; sourceTree = "<group>"; };
+		73EAB5370E86CF120020D514 /* libxmi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxmi.a; path = lib/libxmi.a; sourceTree = "<group>"; };
 		73EAB5390E86CF130020D514 /* exiv2.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = exiv2.pc; sourceTree = "<group>"; };
 		73EAB53A0E86CF130020D514 /* IlmBase.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IlmBase.pc; sourceTree = "<group>"; };
 		73EAB53B0E86CF130020D514 /* OpenEXR.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenEXR.pc; sourceTree = "<group>"; };
 		73EAB5400E86CF130020D514 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; };
 		73EBC0900EC9E0B20068B821 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; };
+		E864E2C510CE8437007AC6E4 /* liblcms.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblcms.dylib; path = lib/liblcms.dylib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2751,6 +2754,7 @@
 				5731C4BD0D55358A00605D22 /* libexiv2.a in Frameworks */,
 				5731C4C10D5536C000605D22 /* libexpat.dylib in Frameworks */,
 				5731C4C90D55372000605D22 /* libz.dylib in Frameworks */,
+				E864E2C610CE8437007AC6E4 /* liblcms.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3014,7 +3018,7 @@
 				73EAB5500E86CF130020D514 /* libtiff.a in Frameworks */,
 				73EAB5510E86CF130020D514 /* libtiffxx.a in Frameworks */,
 				73EAB5520E86CF130020D514 /* libxmi.a in Frameworks */,
-				73482F5C0FD97B3900B6088C /* libboost_thread-1_38.a in Frameworks */,
+				73482F5C0FD97B3900B6088C /* libboost_thread-1_40.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3048,6 +3052,7 @@
 				739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */,
 				576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */,
 				578F27B21013825A005D8080 /* libexiv2.a in Frameworks */,
+				E864E2C710CE8437007AC6E4 /* liblcms.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3571,11 +3576,6 @@
 		5745FBE5094E1C4700E6B672 /* repository */ = {
 			isa = PBXGroup;
 			children = (
-				7368E40A1083930D00519ED0 /* libintl.dylib */,
-				7368E40B1083930D00519ED0 /* libgettextsrc.dylib */,
-				7368E40C1083930D00519ED0 /* libgettextpo.dylib */,
-				7368E40D1083930D00519ED0 /* libgettextlib.dylib */,
-				7368E40E1083930D00519ED0 /* libasprintf.dylib */,
 				570898E30D4CB635008949E7 /* gnumake */,
 				5769F7A10D239D6A00A6AD01 /* PTmender */,
 				5769F79F0D239D6A00A6AD01 /* PTblender */,
@@ -3583,6 +3583,12 @@
 				5769F7A20D239D6A00A6AD01 /* PTroller */,
 				570D581A082A9ED50030E768 /* enblend */,
 				5769F79E0D239D6A00A6AD01 /* enfuse */,
+				E864E2C510CE8437007AC6E4 /* liblcms.dylib */,
+				7368E40A1083930D00519ED0 /* libintl.dylib */,
+				7368E40B1083930D00519ED0 /* libgettextsrc.dylib */,
+				7368E40C1083930D00519ED0 /* libgettextpo.dylib */,
+				7368E40D1083930D00519ED0 /* libgettextlib.dylib */,
+				7368E40E1083930D00519ED0 /* libasprintf.dylib */,
 				57565A640D088DAD00344F55 /* libboost_thread.dylib */,
 				734FB9B20EB3929500CD7122 /* libGLEW.a */,
 				573B8F85067BAAB900B7B355 /* libpano13.dylib */,
@@ -4518,8 +4524,8 @@
 		73EAB5250E86CEA90020D514 /* repository-static */ = {
 			isa = PBXGroup;
 			children = (
-				73482F5D0FD97B7200B6088C /* libboost_filesystem-xgcc40-mt-1_38.a */,
-				73482F5B0FD97B3900B6088C /* libboost_thread-1_38.a */,
+				73482F5D0FD97B7200B6088C /* libboost_filesystem-1_40.a */,
+				73482F5B0FD97B3900B6088C /* libboost_thread-1_40.a */,
 				73EAB5280E86CF120020D514 /* libboost_thread.a */,
 				73EAB5290E86CF120020D514 /* libexiv2.a */,
 				73EAB52A0E86CF120020D514 /* libexpat.a */,
@@ -4551,8 +4557,8 @@
 				73EAB53B0E86CF130020D514 /* OpenEXR.pc */,
 			);
 			name = pkgconfig;
-			path = "../../ExternalPrograms/repository/lib-static/pkgconfig";
-			sourceTree = SOURCE_ROOT;
+			path = lib/pkgconfig;
+			sourceTree = "<group>";
 		};
 		73EAB53C0E86CF130020D514 /* wx */ = {
 			isa = PBXGroup;
@@ -4560,8 +4566,8 @@
 				73EAB53D0E86CF130020D514 /* include */,
 			);
 			name = wx;
-			path = "../../ExternalPrograms/repository/lib-static/wx";
-			sourceTree = SOURCE_ROOT;
+			path = lib/wx;
+			sourceTree = "<group>";
 		};
 		73EAB53D0E86CF130020D514 /* include */ = {
 			isa = PBXGroup;
@@ -5665,7 +5671,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = NO;
 			};
-			buildConfigurationList = 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin" */;
+			buildConfigurationList = 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin-test" */;
 			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -7639,8 +7645,10 @@
 				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\"";
 				PRODUCT_NAME = HuginBase;
 			};
 			name = Debug;
@@ -7659,8 +7667,10 @@
 				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\"";
 				PRODUCT_NAME = HuginBase;
 			};
 			name = Development;
@@ -7680,7 +7690,9 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(REPOSITORY_DIR)/lib",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = HuginBase;
 			};
 			name = Release;
@@ -8741,9 +8753,11 @@
 					"$(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_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\"";
 				PRODUCT_NAME = Hugin;
 			};
 			name = Debug;
@@ -8780,9 +8794,11 @@
 					"$(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_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\"";
 				PRODUCT_NAME = Hugin;
 			};
 			name = Development;
@@ -8819,9 +8835,11 @@
 					"$(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_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\"";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = Hugin;
 			};
@@ -9723,7 +9741,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin" */ = {
+		571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin-test" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				5745FC2A094E1E6400E6B672 /* Debug */,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4867
          http://hugin.svn.sourceforge.net/hugin/?rev=4867&view=rev
Author:   harryvanderwolf
Date:     2010-01-10 21:28:27 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
[OSX] Add new target and files to make a "Hugin_tools" package that can be distributed. This package would contain all command line tools from the Hugin project from which only a few are delivered with the Hugin bundle. Build state at 90%

Modified Paths:
--------------
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj

Added Paths:
-----------
    hugin/trunk/mac/Hugin_tools/
    hugin/trunk/mac/Hugin_tools/Readme.txt
    hugin/trunk/mac/Hugin_tools/set_environment.txt
    hugin/trunk/mac/complete-tools-package.sh

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2010-01-10 16:06:27 UTC (rev 4866)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2010-01-10 21:28:27 UTC (rev 4867)
@@ -53,11 +53,16 @@
 			);
 			dependencies = (
 				57D382CB0E2369D600445A37 /* PBXTargetDependency */,
+				739A0C7E10FA54FC00D8E4C7 /* PBXTargetDependency */,
 				73C154511052F40A00AE93C1 /* PBXTargetDependency */,
+				739A0BEE10FA4A5600D8E4C7 /* PBXTargetDependency */,
 				733E94F81067EA3B0013CDB9 /* PBXTargetDependency */,
 				736421F8107640F7000121C5 /* PBXTargetDependency */,
+				739A0C7C10FA54FC00D8E4C7 /* PBXTargetDependency */,
 				57D382CD0E2369D600445A37 /* PBXTargetDependency */,
-				73C1544D1052F40300AE93C1 /* PBXTargetDependency */,
+				739A0BF010FA4A5600D8E4C7 /* PBXTargetDependency */,
+				739A0D1E10FA57B600D8E4C7 /* PBXTargetDependency */,
+				739A0D2010FA57B600D8E4C7 /* PBXTargetDependency */,
 			);
 			name = "tools - other dynamic";
 			productName = "tools - other dynamic";
@@ -149,6 +154,19 @@
 			name = "configure hugin_version.h";
 			productName = "configure hugin_version.h";
 		};
+		739A0C0010FA510300D8E4C7 /* Separate tools package */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 739A0C0610FA513500D8E4C7 /* Build configuration list for PBXAggregateTarget "Separate tools package" */;
+			buildPhases = (
+				739A0D4A10FA59E000D8E4C7 /* Complete tools package */,
+			);
+			dependencies = (
+				739A0C0510FA511600D8E4C7 /* PBXTargetDependency */,
+				739A0C0810FA515F00D8E4C7 /* PBXTargetDependency */,
+			);
+			name = "Separate tools package";
+			productName = "Separate tools package";
+		};
 		73E6769410F8BE4E001807AB /* lib static monolithic */ = {
 			isa = PBXAggregateTarget;
 			buildConfigurationList = 73E6769A10F8BE67001807AB /* Build configuration list for PBXAggregateTarget "lib static monolithic" */;
@@ -956,6 +974,96 @@
 		737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
 		7388EAFD0F6BFB1B001E08FA /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; };
 		738C044B10A0A5D90061D144 /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738C044910A0A5D90061D144 /* AboutDialog.cpp */; };
+		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 */; };
+		739A0C1510FA524E00D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		739A0C1610FA524E00D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		739A0C1710FA524E00D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		739A0C1810FA524E00D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		739A0C1910FA524E00D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		739A0C1A10FA524E00D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		739A0C1B10FA524E00D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		739A0C1C10FA524E00D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		739A0C1D10FA524E00D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		739A0C1E10FA524E00D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739A0C1F10FA524E00D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739A0C3310FA52FC00D8E4C7 /* fulla.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576482E80C469093003AFC2F /* fulla.cpp */; };
+		739A0C5110FA539B00D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		739A0C5210FA539B00D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		739A0C5310FA539B00D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		739A0C5410FA539B00D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		739A0C5510FA539B00D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		739A0C5610FA539B00D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		739A0C5710FA539B00D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		739A0C5810FA539B00D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		739A0C5910FA539B00D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		739A0C5A10FA539B00D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		739A0C5B10FA539B00D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		739A0C5C10FA539B00D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		739A0C5D10FA539B00D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739A0C5E10FA539B00D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739A0C6E10FA53FB00D8E4C7 /* autooptimiser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */; };
+		739A0C8610FA557300D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; };
+		739A0C8710FA557500D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; };
+		739A0C9110FA55B800D8E4C7 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; };
+		739A0C9210FA55C000D8E4C7 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; };
+		739A0C9710FA560500D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		739A0C9810FA560600D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		739A0CA810FA567700D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		739A0CA910FA567700D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		739A0CAA10FA567700D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		739A0CAB10FA567700D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		739A0CAC10FA567700D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		739A0CAD10FA567700D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		739A0CAE10FA567700D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		739A0CAF10FA567700D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		739A0CB010FA567700D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		739A0CB110FA567700D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		739A0CB210FA567700D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		739A0CB310FA567700D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		739A0CB410FA567700D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739A0CB510FA567700D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739A0CB610FA567700D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; };
+		739A0CB710FA567700D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		739A0CF510FA56D300D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		739A0CF610FA56D300D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		739A0CF710FA56D300D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		739A0CF810FA56D300D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		739A0CF910FA56D300D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		739A0CFA10FA56D300D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		739A0CFB10FA56D300D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		739A0CFC10FA56D300D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		739A0CFD10FA56D300D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		739A0CFE10FA56D300D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		739A0CFF10FA56D300D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		739A0D0010FA56D300D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		739A0D0110FA56D300D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739A0D0210FA56D300D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739A0D0310FA56D300D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; };
+		739A0D0410FA56D300D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		739A0D1310FA573A00D8E4C7 /* tca_correct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */; };
+		739A0D1910FA579200D8E4C7 /* vig_optimize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576482E90C469093003AFC2F /* vig_optimize.cpp */; };
+		739A0D2B10FA584700D8E4C7 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; };
+		739A0D3410FA588800D8E4C7 /* hugin_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E122480D2BE45700743A93 /* hugin_version.h */; };
+		739A0DC410FA5FB700D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		739A0DC510FA5FB700D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		739A0DC610FA5FB700D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		739A0DC710FA5FB700D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		739A0DC810FA5FB700D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		739A0DC910FA5FB700D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		739A0DCA10FA5FB700D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		739A0DCB10FA5FB700D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		739A0DCC10FA5FB700D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		739A0DCD10FA5FB700D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		739A0DCE10FA5FB700D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		739A0DCF10FA5FB700D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		739A0DD010FA5FB700D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739A0DD110FA5FB700D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739A0DD210FA5FB700D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; };
+		739A0DD310FA5FB700D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		739A0DED10FA605300D8E4C7 /* pto2mk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 739A0DE710FA602200D8E4C7 /* pto2mk.cpp */; };
+		739A0E7610FA667600D8E4C7 /* PTLensDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F83B0C3026D200736343 /* PTLensDB.h */; };
 		739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
 		739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
@@ -1956,6 +2064,139 @@
 			remoteGlobalIDString = 57C486290C3121E8002D79F1;
 			remoteInfo = configure;
 		};
+		739A0BED10FA4A5600D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73EBC08F0EC9E0B20068B821;
+			remoteInfo = "celeste dynamic";
+		};
+		739A0BEF10FA4A5600D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73573E2B10F9EEA300CF0ECD;
+			remoteInfo = pano_trafo;
+		};
+		739A0C0410FA511600D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 571046810D25F698006A3C69;
+			remoteInfo = "bundled tools";
+		};
+		739A0C0710FA515F00D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D382C50E2369D000445A37;
+			remoteInfo = "tools - other dynamic";
+		};
+		739A0C0B10FA524E00D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		739A0C0D10FA524E00D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		739A0C3B10FA531900D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5771F8140C30268F00736343;
+			remoteInfo = PTLensDB;
+		};
+		739A0C4B10FA539B00D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		739A0C4D10FA539B00D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		739A0C7B10FA54FC00D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 739A0C0910FA524E00D8E4C7;
+			remoteInfo = "fulla dynamic";
+		};
+		739A0C7D10FA54FC00D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 739A0C4710FA539B00D8E4C7;
+			remoteInfo = "autooptimiser dynamic";
+		};
+		739A0CA210FA567700D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		739A0CA410FA567700D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		739A0CEF10FA56D300D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		739A0CF110FA56D300D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		739A0D1D10FA57B600D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 739A0CED10FA56D300D8E4C7;
+			remoteInfo = "tca_correct dynamic";
+		};
+		739A0D1F10FA57B600D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 739A0CA010FA567700D8E4C7;
+			remoteInfo = "vig_optimize dynamic";
+		};
+		739A0DBE10FA5FB700D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		739A0DC010FA5FB700D8E4C7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
 		739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1977,13 +2218,6 @@
 			remoteGlobalIDString = 5769FC280D24A26400A6AD01;
 			remoteInfo = frameworks;
 		};
-		73C1544C1052F40300AE93C1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 734BDF5A0EB8EC19007EBA09;
-			remoteInfo = "PTBatcher dynamic";
-		};
 		73C154501052F40A00AE93C1 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -2800,11 +3034,21 @@
 		7368E4621083ABF200519ED0 /* NumTransDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumTransDialog.h; sourceTree = "<group>"; };
 		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>"; };
+		73704DA310FA30520012F4C1 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		737E1C180EC9EC0300BA4D9B /* hugin_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_config.h; sourceTree = "<group>"; };
 		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>"; };
+		739A0C2410FA524E00D8E4C7 /* fulla */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fulla; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0C6310FA539B00D8E4C7 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0CBC10FA567700D8E4C7 /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0D0910FA56D300D8E4C7 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "complete-tools-package.sh"; sourceTree = "<group>"; };
+		739A0DD810FA5FB700D8E4C7 /* pto2mk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto2mk; sourceTree = BUILT_PRODUCTS_DIR; };
+		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>"; };
+		739A0EA510FA7A3100D8E4C7 /* set_environment.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set_environment.txt; sourceTree = "<group>"; };
 		739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "lib/libwx_macu_gl-2.8.dylib"; sourceTree = "<group>"; };
 		73BB09320FACC59E00B04997 /* PanoToolsUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PanoToolsUtils.h; sourceTree = "<group>"; };
@@ -3423,6 +3667,122 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		739A0C1110FA524E00D8E4C7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0C1210FA524E00D8E4C7 /* libz.dylib in Frameworks */,
+				739A0C1310FA524E00D8E4C7 /* libpng.dylib in Frameworks */,
+				739A0C1410FA524E00D8E4C7 /* libtiff.dylib in Frameworks */,
+				739A0C1510FA524E00D8E4C7 /* libjpeg.dylib in Frameworks */,
+				739A0C1610FA524E00D8E4C7 /* libIex.dylib in Frameworks */,
+				739A0C1710FA524E00D8E4C7 /* libIlmThread.dylib in Frameworks */,
+				739A0C1810FA524E00D8E4C7 /* libIlmImf.dylib in Frameworks */,
+				739A0C1910FA524E00D8E4C7 /* libImath.dylib in Frameworks */,
+				739A0C1A10FA524E00D8E4C7 /* libHalf.dylib in Frameworks */,
+				739A0C1B10FA524E00D8E4C7 /* libpano13.dylib in Frameworks */,
+				739A0C1C10FA524E00D8E4C7 /* libboost_thread.dylib in Frameworks */,
+				739A0C1D10FA524E00D8E4C7 /* libexpat.dylib in Frameworks */,
+				739A0C1E10FA524E00D8E4C7 /* HuginVigraImpex.framework in Frameworks */,
+				739A0C1F10FA524E00D8E4C7 /* HuginBase.framework in Frameworks */,
+				739A0C8610FA557300D8E4C7 /* libexiv2.a in Frameworks */,
+				739A0C9110FA55B800D8E4C7 /* libintl.dylib in Frameworks */,
+				739A0C9810FA560600D8E4C7 /* libiconv.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0C5010FA539B00D8E4C7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0C5110FA539B00D8E4C7 /* libz.dylib in Frameworks */,
+				739A0C5210FA539B00D8E4C7 /* libpng.dylib in Frameworks */,
+				739A0C5310FA539B00D8E4C7 /* libtiff.dylib in Frameworks */,
+				739A0C5410FA539B00D8E4C7 /* libjpeg.dylib in Frameworks */,
+				739A0C5510FA539B00D8E4C7 /* libIex.dylib in Frameworks */,
+				739A0C5610FA539B00D8E4C7 /* libIlmThread.dylib in Frameworks */,
+				739A0C5710FA539B00D8E4C7 /* libIlmImf.dylib in Frameworks */,
+				739A0C5810FA539B00D8E4C7 /* libImath.dylib in Frameworks */,
+				739A0C5910FA539B00D8E4C7 /* libHalf.dylib in Frameworks */,
+				739A0C5A10FA539B00D8E4C7 /* libpano13.dylib in Frameworks */,
+				739A0C5B10FA539B00D8E4C7 /* libboost_thread.dylib in Frameworks */,
+				739A0C5C10FA539B00D8E4C7 /* libexpat.dylib in Frameworks */,
+				739A0C5D10FA539B00D8E4C7 /* HuginVigraImpex.framework in Frameworks */,
+				739A0C5E10FA539B00D8E4C7 /* HuginBase.framework in Frameworks */,
+				739A0C8710FA557500D8E4C7 /* libexiv2.a in Frameworks */,
+				739A0C9710FA560500D8E4C7 /* libiconv.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0CA710FA567700D8E4C7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0CA810FA567700D8E4C7 /* libz.dylib in Frameworks */,
+				739A0CA910FA567700D8E4C7 /* libpng.dylib in Frameworks */,
+				739A0CAA10FA567700D8E4C7 /* libtiff.dylib in Frameworks */,
+				739A0CAB10FA567700D8E4C7 /* libjpeg.dylib in Frameworks */,
+				739A0CAC10FA567700D8E4C7 /* libIex.dylib in Frameworks */,
+				739A0CAD10FA567700D8E4C7 /* libIlmThread.dylib in Frameworks */,
+				739A0CAE10FA567700D8E4C7 /* libIlmImf.dylib in Frameworks */,
+				739A0CAF10FA567700D8E4C7 /* libImath.dylib in Frameworks */,
+				739A0CB010FA567700D8E4C7 /* libHalf.dylib in Frameworks */,
+				739A0CB110FA567700D8E4C7 /* libpano13.dylib in Frameworks */,
+				739A0CB210FA567700D8E4C7 /* libboost_thread.dylib in Frameworks */,
+				739A0CB310FA567700D8E4C7 /* libexpat.dylib in Frameworks */,
+				739A0CB410FA567700D8E4C7 /* HuginVigraImpex.framework in Frameworks */,
+				739A0CB510FA567700D8E4C7 /* HuginBase.framework in Frameworks */,
+				739A0CB610FA567700D8E4C7 /* libexiv2.a in Frameworks */,
+				739A0CB710FA567700D8E4C7 /* libiconv.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0CF410FA56D300D8E4C7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0CF510FA56D300D8E4C7 /* libz.dylib in Frameworks */,
+				739A0CF610FA56D300D8E4C7 /* libpng.dylib in Frameworks */,
+				739A0CF710FA56D300D8E4C7 /* libtiff.dylib in Frameworks */,
+				739A0CF810FA56D300D8E4C7 /* libjpeg.dylib in Frameworks */,
+				739A0CF910FA56D300D8E4C7 /* libIex.dylib in Frameworks */,
+				739A0CFA10FA56D300D8E4C7 /* libIlmThread.dylib in Frameworks */,
+				739A0CFB10FA56D300D8E4C7 /* libIlmImf.dylib in Frameworks */,
+				739A0CFC10FA56D300D8E4C7 /* libImath.dylib in Frameworks */,
+				739A0CFD10FA56D300D8E4C7 /* libHalf.dylib in Frameworks */,
+				739A0CFE10FA56D300D8E4C7 /* libpano13.dylib in Frameworks */,
+				739A0CFF10FA56D300D8E4C7 /* libboost_thread.dylib in Frameworks */,
+				739A0D0010FA56D300D8E4C7 /* libexpat.dylib in Frameworks */,
+				739A0D0110FA56D300D8E4C7 /* HuginVigraImpex.framework in Frameworks */,
+				739A0D0210FA56D300D8E4C7 /* HuginBase.framework in Frameworks */,
+				739A0D0310FA56D300D8E4C7 /* libexiv2.a in Frameworks */,
+				739A0D0410FA56D300D8E4C7 /* libiconv.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0DC310FA5FB700D8E4C7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0DC410FA5FB700D8E4C7 /* libz.dylib in Frameworks */,
+				739A0DC510FA5FB700D8E4C7 /* libpng.dylib in Frameworks */,
+				739A0DC610FA5FB700D8E4C7 /* libtiff.dylib in Frameworks */,
+				739A0DC710FA5FB700D8E4C7 /* libjpeg.dylib in Frameworks */,
+				739A0DC810FA5FB700D8E4C7 /* libIex.dylib in Frameworks */,
+				739A0DC910FA5FB700D8E4C7 /* libIlmThread.dylib in Frameworks */,
+				739A0DCA10FA5FB700D8E4C7 /* libIlmImf.dylib in Frameworks */,
+				739A0DCB10FA5FB700D8E4C7 /* libImath.dylib in Frameworks */,
+				739A0DCC10FA5FB700D8E4C7 /* libHalf.dylib in Frameworks */,
+				739A0DCD10FA5FB700D8E4C7 /* libpano13.dylib in Frameworks */,
+				739A0DCE10FA5FB700D8E4C7 /* libboost_thread.dylib in Frameworks */,
+				739A0DCF10FA5FB700D8E4C7 /* libexpat.dylib in Frameworks */,
+				739A0DD010FA5FB700D8E4C7 /* HuginVigraImpex.framework in Frameworks */,
+				739A0DD110FA5FB700D8E4C7 /* HuginBase.framework in Frameworks */,
+				739A0DD210FA5FB700D8E4C7 /* libexiv2.a in Frameworks */,
+				739A0DD310FA5FB700D8E4C7 /* libiconv.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73C153661052E6DE00AE93C1 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -3445,6 +3805,7 @@
 				73C153811052E76600AE93C1 /* libtiff.dylib in Frameworks */,
 				73C153821052E76600AE93C1 /* libz.dylib in Frameworks */,
 				E8A7C02C10F79A8200839DF3 /* libGLEW.a in Frameworks */,
+				739A0D2B10FA584700D8E4C7 /* libintl.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3521,6 +3882,7 @@
 				73E79F370D674F4600C07126 /* HuginVigraImpex.framework in Frameworks */,
 				73E79F1F0D674EAC00C07126 /* libexpat.dylib in Frameworks */,
 				E8A7C03510F79ADB00839DF3 /* libexiv2.a in Frameworks */,
+				739A0C9210FA55C000D8E4C7 /* libintl.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3557,6 +3919,7 @@
 		57114E9E06BC2301004F4FA7 /* mac */ = {
 			isa = PBXGroup;
 			children = (
+				739A0EA310FA7A3100D8E4C7 /* Hugin_tools */,
 				5751D8600939F1C0001477EA /* Hugin.xcodeproj */,
 				57D18D8E0E13BD340054A523 /* Version.xcconfig */,
 				57AB3D760E1E976300EFD03F /* BuildConfig.xcconfig.orig */,
@@ -3573,6 +3936,7 @@
 				571D8C700E213216006D0305 /* patch-xrc.sh */,
 				57A2BC2E0D45422800E9FFEC /* copyExifTool.sh */,
 				576902090D24DBA100A6AD01 /* complete-bundle.sh */,
+				739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */,
 				57810AAB0D32D79400F48296 /* complete-embed.sh */,
 				573E2E440B76AC5100E86281 /* ExternalPrograms */,
 				573E2E5E0B76AD0100E86281 /* Documents */,
@@ -3917,6 +4281,7 @@
 		57460AB30C4E7BD5004507F7 /* tools */ = {
 			isa = PBXGroup;
 			children = (
+				739A0DE710FA602200D8E4C7 /* pto2mk.cpp */,
 				73573E5110F9EEF400CF0ECD /* pano_trafo.cpp */,
 				736421DF10763FCD000121C5 /* hugin_hdrmerge.cpp */,
 				73D24B9A1061566B00B8A25D /* cpclean.cpp */,
@@ -4688,6 +5053,12 @@
 				7364217010763A22000121C5 /* deghosting_mask */,
 				73E6770010F8BF18001807AB /* libhugin_base.a */,
 				73573E4710F9EEA300CF0ECD /* pano_trafo */,
+				73704DA310FA30520012F4C1 /* Carbon.framework */,
+				739A0C2410FA524E00D8E4C7 /* fulla */,
+				739A0C6310FA539B00D8E4C7 /* autooptimiser */,
+				739A0CBC10FA567700D8E4C7 /* vig_optimize */,
+				739A0D0910FA56D300D8E4C7 /* tca_correct */,
+				739A0DD810FA5FB700D8E4C7 /* pto2mk */,
 			);
 			sourceTree = "<group>";
 		};
@@ -4796,6 +5167,15 @@
 			path = data;
 			sourceTree = "<group>";
 		};
+		739A0EA310FA7A3100D8E4C7 /* Hugin_tools */ = {
+			isa = PBXGroup;
+			children = (
+				739A0EA410FA7A3100D8E4C7 /* Readme.txt */,
+				739A0EA510FA7A3100D8E4C7 /* set_environment.txt */,
+			);
+			path = Hugin_tools;
+			sourceTree = "<group>";
+		};
 		73C153851052E7BA00AE93C1 /* lens_calibrate */ = {
 			isa = PBXGroup;
 			children = (
@@ -5280,6 +5660,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		739A0E7C10FA66B100D8E4C7 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0E7610FA667600D8E4C7 /* PTLensDB.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73C153F31052EADD00AE93C1 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -5386,6 +5774,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */,
+				739A0D3410FA588800D8E4C7 /* hugin_version.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6001,6 +6390,98 @@
 			productReference = 7364217010763A22000121C5 /* deghosting_mask */;
 			productType = "com.apple.product-type.tool";
 		};
+		739A0C0910FA524E00D8E4C7 /* fulla dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 739A0C2010FA524E00D8E4C7 /* Build configuration list for PBXNativeTarget "fulla dynamic" */;
+			buildPhases = (
+				739A0C0E10FA524E00D8E4C7 /* Sources */,
+				739A0C1110FA524E00D8E4C7 /* Frameworks */,
+				739A0E7C10FA66B100D8E4C7 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				739A0C3C10FA531900D8E4C7 /* PBXTargetDependency */,
+				739A0C0A10FA524E00D8E4C7 /* PBXTargetDependency */,
+				739A0C0C10FA524E00D8E4C7 /* PBXTargetDependency */,
+			);
+			name = "fulla dynamic";
+			productName = "sample open_close";
+			productReference = 739A0C2410FA524E00D8E4C7 /* fulla */;
+			productType = "com.apple.product-type.tool";
+		};
+		739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 739A0C5F10FA539B00D8E4C7 /* Build configuration list for PBXNativeTarget "autooptimiser dynamic" */;
+			buildPhases = (
+				739A0C4E10FA539B00D8E4C7 /* Sources */,
+				739A0C5010FA539B00D8E4C7 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				739A0C4A10FA539B00D8E4C7 /* PBXTargetDependency */,
+				739A0C4C10FA539B00D8E4C7 /* PBXTargetDependency */,
+			);
+			name = "autooptimiser dynamic";
+			productName = "sample open_close";
+			productReference = 739A0C6310FA539B00D8E4C7 /* autooptimiser */;
+			productType = "com.apple.product-type.tool";
+		};
+		739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 739A0CB810FA567700D8E4C7 /* Build configuration list for PBXNativeTarget "vig_optimize dynamic" */;
+			buildPhases = (
+				739A0CA510FA567700D8E4C7 /* Sources */,
+				739A0CA710FA567700D8E4C7 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				739A0CA110FA567700D8E4C7 /* PBXTargetDependency */,
+				739A0CA310FA567700D8E4C7 /* PBXTargetDependency */,
+			);
+			name = "vig_optimize dynamic";
+			productName = "sample open_close";
+			productReference = 739A0CBC10FA567700D8E4C7 /* vig_optimize */;
+			productType = "com.apple.product-type.tool";
+		};
+		739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 739A0D0510FA56D300D8E4C7 /* Build configuration list for PBXNativeTarget "tca_correct dynamic" */;
+			buildPhases = (
+				739A0CF210FA56D300D8E4C7 /* Sources */,
+				739A0CF410FA56D300D8E4C7 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				739A0CEE10FA56D300D8E4C7 /* PBXTargetDependency */,
+				739A0CF010FA56D300D8E4C7 /* PBXTargetDependency */,
+			);
+			name = "tca_correct dynamic";
+			productName = "sample open_close";
+			productReference = 739A0D0910FA56D300D8E4C7 /* tca_correct */;
+			productType = "com.apple.product-type.tool";
+		};
+		739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 739A0DD410FA5FB700D8E4C7 /* Build configuration list for PBXNativeTarget "pto2mk dynamic" */;
+			buildPhases = (
+				739A0DC110FA5FB700D8E4C7 /* Sources */,
+				739A0DC310FA5FB700D8E4C7 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				739A0DBD10FA5FB700D8E4C7 /* PBXTargetDependency */,
+				739A0DBF10FA5FB700D8E4C7 /* PBXTargetDependency */,
+			);
+			name = "pto2mk dynamic";
+			productName = "sample open_close";
+			productReference = 739A0DD810FA5FB700D8E4C7 /* pto2mk */;
+			productType = "com.apple.product-type.tool";
+		};
 		73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73C153711052E70C00AE93C1 /* Build configuration list for PBXNativeTarget "calibrate_lens dynamic" */;
@@ -6186,13 +6667,19 @@
 				57D50B380F5971A600CCDCB5 /* celeste static */,
 				57D382C50E2369D000445A37 /* tools - other dynamic */,
 				73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */,
-				7332AE910D8D4986002BF5FF /* matchpoint dynamic */,
-				734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */,
+				739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */,
+				73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */,
 				73EBC08F0EC9E0B20068B821 /* celeste dynamic */,
-				73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */,
 				73D24B4D106152CD00B8A25D /* cpclean */,
 				7364216F10763A22000121C5 /* deghosting_mask */,
+				739A0C0910FA524E00D8E4C7 /* fulla dynamic */,
+				7332AE910D8D4986002BF5FF /* matchpoint dynamic */,
 				73573E2B10F9EEA300CF0ECD /* pano_trafo */,
+				734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */,
+				739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */,
+				739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */,
+				739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */,
+				739A0C0010FA510300D8E4C7 /* Separate tools package */,
 			);
 		};
 /* End PBXProject section */
@@ -6571,6 +7058,20 @@
 			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";
 		};
+		739A0D4A10FA59E000D8E4C7 /* Complete tools package */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Complete tools package";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			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";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -7069,6 +7570,46 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		739A0C0E10FA524E00D8E4C7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0C3310FA52FC00D8E4C7 /* fulla.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0C4E10FA539B00D8E4C7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0C6E10FA53FB00D8E4C7 /* autooptimiser.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0CA510FA567700D8E4C7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0D1910FA579200D8E4C7 /* vig_optimize.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0CF210FA56D300D8E4C7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0D1310FA573A00D8E4C7 /* tca_correct.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		739A0DC110FA5FB700D8E4C7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				739A0DED10FA605300D8E4C7 /* pto2mk.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73C153651052E6DE00AE93C1 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -7555,6 +8096,101 @@
 			target = 57C486290C3121E8002D79F1 /* configure */;
 			targetProxy = 737E1C1F0EC9EC5100BA4D9B /* PBXContainerItemProxy */;
 		};
+		739A0BEE10FA4A5600D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73EBC08F0EC9E0B20068B821 /* celeste dynamic */;
+			targetProxy = 739A0BED10FA4A5600D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0BF010FA4A5600D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73573E2B10F9EEA300CF0ECD /* pano_trafo */;
+			targetProxy = 739A0BEF10FA4A5600D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C0510FA511600D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 571046810D25F698006A3C69 /* bundled tools */;
+			targetProxy = 739A0C0410FA511600D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C0810FA515F00D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57D382C50E2369D000445A37 /* tools - other dynamic */;
+			targetProxy = 739A0C0710FA515F00D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C0A10FA524E00D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 739A0C0B10FA524E00D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C0C10FA524E00D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 739A0C0D10FA524E00D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C3C10FA531900D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5771F8140C30268F00736343 /* PTLensDB */;
+			targetProxy = 739A0C3B10FA531900D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C4A10FA539B00D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 739A0C4B10FA539B00D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C4C10FA539B00D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 739A0C4D10FA539B00D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C7C10FA54FC00D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 739A0C0910FA524E00D8E4C7 /* fulla dynamic */;
+			targetProxy = 739A0C7B10FA54FC00D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0C7E10FA54FC00D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */;
+			targetProxy = 739A0C7D10FA54FC00D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0CA110FA567700D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 739A0CA210FA567700D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0CA310FA567700D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 739A0CA410FA567700D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0CEE10FA56D300D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 739A0CEF10FA56D300D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0CF010FA56D300D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 739A0CF110FA56D300D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0D1E10FA57B600D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */;
+			targetProxy = 739A0D1D10FA57B600D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0D2010FA57B600D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */;
+			targetProxy = 739A0D1F10FA57B600D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0DBD10FA5FB700D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 739A0DBE10FA5FB700D8E4C7 /* PBXContainerItemProxy */;
+		};
+		739A0DBF10FA5FB700D8E4C7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 739A0DC010FA5FB700D8E4C7 /* PBXContainerItemProxy */;
+		};
 		739F84FE0EC7803F004771D6 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
@@ -7570,11 +8206,6 @@
 			target = 5769FC280D24A26400A6AD01 /* frameworks */;
 			targetProxy = 73C153CA1052E90E00AE93C1 /* PBXContainerItemProxy */;
 		};
-		73C1544D1052F40300AE93C1 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */;
-			targetProxy = 73C1544C1052F40300AE93C1 /* PBXContainerItemProxy */;
-		};
 		73C154511052F40A00AE93C1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */;
@@ -9282,6 +9913,11 @@
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				OTHER_LDFLAGS = (
+					"-search_paths_first",
+					"-Wl",
+					"-v",
+				);
 				PRODUCT_NAME = celeste;
 			};
 			name = Release;
@@ -10087,6 +10723,329 @@
 			};
 			name = Release;
 		};
+		739A0C0110FA510400D8E4C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = "Separate tools package";
+			};
+			name = Debug;
+		};
+		739A0C0210FA510400D8E4C7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = "Separate tools package";
+			};
+			name = Development;
+		};
+		739A0C0310FA510400D8E4C7 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				PRODUCT_NAME = "Separate tools package";
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		739A0C2110FA524E00D8E4C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Debug;
+		};
+		739A0C2210FA524E00D8E4C7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Development;
+		};
+		739A0C2310FA524E00D8E4C7 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/lensdb,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				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 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = fulla;
+			};
+			name = Release;
+		};
+		739A0C6010FA539B00D8E4C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Debug;
+		};
+		739A0C6110FA539B00D8E4C7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Development;
+		};
+		739A0C6210FA539B00D8E4C7 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = autooptimiser;
+			};
+			name = Release;
+		};
+		739A0CB910FA567700D8E4C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Debug;
+		};
+		739A0CBA10FA567700D8E4C7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Development;
+		};
+		739A0CBB10FA567700D8E4C7 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = vig_optimize;
+			};
+			name = Release;
+		};
+		739A0D0610FA56D300D8E4C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Debug;
+		};
+		739A0D0710FA56D300D8E4C7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Development;
+		};
+		739A0D0810FA56D300D8E4C7 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = tca_correct;
+			};
+			name = Release;
+		};
+		739A0DD510FA5FB700D8E4C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Debug;
+		};
+		739A0DD610FA5FB700D8E4C7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Development;
+		};
+		739A0DD710FA5FB700D8E4C7 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = pto2mk;
+			};
+			name = Release;
+		};
 		73C1536A1052E6DE00AE93C1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -10104,10 +11063,12 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -10136,10 +11097,12 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -10175,9 +11138,11 @@
 					"$(inherited)",
 					"$(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_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				OTHER_LDFLAGS = "";
 				PREBINDING = YES;
 				PRODUCT_NAME = calibrate_lens;
@@ -10432,8 +11397,10 @@
 					"$(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_1 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = align_image_stack;
 			};
 			name = Debug;
@@ -10451,8 +11418,10 @@
 					"$(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_1 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = align_image_stack;
 			};
 			name = Development;
@@ -10470,8 +11439,10 @@
 					"$(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_1 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = align_image_stack;
 			};
 			name = Release;
@@ -10492,9 +11463,11 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_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_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = celeste;
 			};
 			name = Debug;
@@ -10515,9 +11488,11 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_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_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = celeste;
 			};
 			name = Development;
@@ -10526,11 +11501,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					../src/celeste,
 					/usr/include,
 					"$(REPOSITORY_DIR)/include",
 					"$(REPOSITORY_DIR)/include/OpenEXR",
 					../src/foreign/vigra,
-					../src/celeste,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -10538,9 +11513,12 @@
 					"$(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_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PREBINDING = YES;
 				PRODUCT_NAME = celeste;
 			};
 			name = Release;
@@ -10996,6 +11974,66 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		739A0C0610FA513500D8E4C7 /* Build configuration list for PBXAggregateTarget "Separate tools package" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				739A0C0110FA510400D8E4C7 /* Debug */,
+				739A0C0210FA510400D8E4C7 /* Development */,
+				739A0C0310FA510400D8E4C7 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		739A0C2010FA524E00D8E4C7 /* Build configuration list for PBXNativeTarget "fulla dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				739A0C2110FA524E00D8E4C7 /* Debug */,
+				739A0C2210FA524E00D8E4C7 /* Development */,
+				739A0C2310FA524E00D8E4C7 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		739A0C5F10FA539B00D8E4C7 /* Build configuration list for PBXNativeTarget "autooptimiser dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				739A0C6010FA539B00D8E4C7 /* Debug */,
+				739A0C6110FA539B00D8E4C7 /* Development */,
+				739A0C6210FA539B00D8E4C7 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		739A0CB810FA567700D8E4C7 /* Build configuration list for PBXNativeTarget "vig_optimize dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				739A0CB910FA567700D8E4C7 /* Debug */,
+				739A0CBA10FA567700D8E4C7 /* Development */,
+				739A0CBB10FA567700D8E4C7 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		739A0D0510FA56D300D8E4C7 /* Build configuration list for PBXNativeTarget "tca_correct dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				739A0D0610FA56D300D8E4C7 /* Debug */,
+				739A0D0710FA56D300D8E4C7 /* Development */,
+				739A0D0810FA56D300D8E4C7 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		739A0DD410FA5FB700D8E4C7 /* Build configuration list for PBXNativeTarget "pto2mk dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				739A0DD510FA5FB700D8E4C7 /* Debug */,
+				739A0DD610FA5FB700D8E4C7 /* Development */,
+				739A0DD710FA5FB700D8E4C7 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		73C153711052E70C00AE93C1 /* Build configuration list for PBXNativeTarget "calibrate_lens dynamic" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Added: hugin/trunk/mac/Hugin_tools/Readme.txt
===================================================================
--- hugin/trunk/mac/Hugin_tools/Readme.txt	                        (rev 0)
+++ hugin/trunk/mac/Hugin_tools/Readme.txt	2010-01-10 21:28:27 UTC (rev 4867)
@@ -0,0 +1,24 @@
+Readme.txt for Hugin_tools package
+version 0.1, 10 January 2010, Harry van der Wolf
+
+
+== How to "install" this package ==
+- Copy the Hugin_tools directory inside this dmg to a location of your liking.
+
+
+== How to use the tools inside the Hugin_tools directory ==
+- Open a terminal
+- cd into the Hugin_tools directory
+- issue the command "source ./set_environment.txt"   (without the double quotes)
+
+Now the tools inside this directory are set as first entries in your PATH statement.
+Note: This is not a permanent change but only in this terminal session.
+
+
+===================================================================================================================
+License Agreements
+
+The programs included in this package are released under the GNU General Public License version 2. 
+If you do not agree with the GPL vs. 2 license agreement, please delete this package and it's contents immediately.
+
+This package is completely based on the Hugin project and the tools it contains. Hugin can be downloaded from http:/hugin.sourceforge.net. 

Added: hugin/trunk/mac/Hugin_tools/set_environment.txt
===================================================================
--- hugin/trunk/mac/Hugin_tools/set_environment.txt	                        (rev 0)
+++ hugin/trunk/mac/Hugin_tools/set_environment.txt	2010-01-10 21:28:27 UTC (rev 4867)
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Created for the Hugin_tools package: Harry van der Wolf <hvdwolf@...>
+# Version 0.1 10 January 2010
+# This text file contains the variables which are set by source
+# to make them "live on" in your environment but only during the
+# terminal session in which they are called.
+
+# You should not need to modify anything below this line
+
+CWD=`pwd`;
+
+export PATH="$CWD/bin:$PATH"

Added: hugin/trunk/mac/complete-tools-package.sh
===================================================================
--- hugin/trunk/mac/complete-tools-package.sh	                        (rev 0)
+++ hugin/trunk/mac/complete-tools-package.sh	2010-01-10 21:28:27 UTC (rev 4867)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# $Id: complete-tools-package.sh $
+
+dylib_dir="$REPOSITORY_DIR/lib"
+old_install_name_dirname="$REPOSITORY_ABSOLUTE_PATH/lib"
+dylib_install_loc="Libraries"
+new_install_name_dirname="@executable_path/../$dylib_install_loc"
+
+Package="$TARGET_BUILD_DIR/Hugin_tools"
+
+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" 
+#frameworks="HuginBaseWx.framework HuginBase.framework"
+bins="align_image_stack autooptimiser calibrate_lens celeste cpclean deghosting_mask fulla matchpoint pano_trafo pto2mk tca_correct vig_optimize"
+binaries="$Package/$dylib_install_loc/*.dylib $Package/bin/* $Package/Frameworks/Hugin*.framework/Hugin*"
+
+#------------------------------------------------
+
+rm -Rf $Package
+mkdir -p $Package
+cp -Rf ../mac/Hugin_tools/* $Package
+#rm -Rf "$Package/$dylib_install_loc" "$Package/Frameworks" "$Package/bin" 
+mkdir -p "$Package/$dylib_install_loc" "$Package/Frameworks" "$Package/bin"
+for bin in $bins
+do
+ cp $TARGET_BUILD_DIR/$bin "$Package/bin/" 
+done
+cp -Rf  $TARGET_BUILD_DIR/Hugin*.framework "$Package/Frameworks"
+
+for dylib in $libs
+do
+ cp -Rf $dylib_dir/$dylib.*ylib "$Package/$dylib_install_loc/"
+done
+
+
+#replace any "$old_install_name_dirname[/*]/" in install_name to "$new_install_name_dirname/" 
+for exec_file in $binaries
+do
+ 
+ echo "Processing: $exec_file"
+ 
+ if [[ $exec_file = *.dylib ]]
+ then
+  for lib in $(otool -D $exec_file | grep $old_install_name_dirname | sed -e 's/ (.*$//' -e 's/^.*\///')
+  do
+   echo " Changing own install name."
+   install_name_tool -id "$new_install_name_dirname/$lib" $exec_file
+  done
+ fi
+ 
+ for lib in $(otool -L $exec_file | grep $old_install_name_dirname | sed -e 's/ (.*$//' -e 's/^.*\///')
+ do
+  echo " Changing install name for: $lib"
+  install_name_tool -change "$old_install_name_dirname/$lib" "$new_install_name_dirname/$lib" $exec_file
+ done
+
+done


Property changes on: hugin/trunk/mac/complete-tools-package.sh
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4873
          http://hugin.svn.sourceforge.net/hugin/?rev=4873&view=rev
Author:   harryvanderwolf
Date:     2010-01-11 07:43:17 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
[OSX] next 5% of OSX "Hugin_tools" package incl. minor bugfixes

Modified Paths:
--------------
    hugin/trunk/mac/Hugin_tools/Readme.txt
    hugin/trunk/mac/complete-tools-package.sh

Modified: hugin/trunk/mac/Hugin_tools/Readme.txt
===================================================================
--- hugin/trunk/mac/Hugin_tools/Readme.txt	2010-01-11 06:50:53 UTC (rev 4872)
+++ hugin/trunk/mac/Hugin_tools/Readme.txt	2010-01-11 07:43:17 UTC (rev 4873)
@@ -1,5 +1,5 @@
 Readme.txt for Hugin_tools package
-version 0.1, 10 January 2010, Harry van der Wolf
+version 0.2, 11 January 2010, Harry van der Wolf
 
 
 == How to "install" this package ==
@@ -7,13 +7,16 @@
 
 
 == How to use the tools inside the Hugin_tools directory ==
-- Open a terminal
-- cd into the Hugin_tools directory
-- issue the command "source ./set_environment.txt"   (without the double quotes)
+1. Open a terminal
+2. cd into the Hugin_tools directory
+3. issue the command "source ./set_environment.txt"   (without the double quotes)
 
-Now the tools inside this directory are set as first entries in your PATH statement.
-Note: This is not a permanent change but only in this terminal session.
+The tools reside inside the bin directory but are system wide available due to the command
+issued in (3.).The bin directory inside this Hugin_tools directory is set as first entry 
+in your PATH statement. It means that you can execute the tools without needing to use paths. 
+Note: This addition is not a permanent change but only in this terminal session.
 
+Note2: due to license restrictions autopano-sift-c and panomatic are not part of this package.
 
 ===================================================================================================================
 License Agreements
@@ -21,4 +24,6 @@
 The programs included in this package are released under the GNU General Public License version 2. 
 If you do not agree with the GPL vs. 2 license agreement, please delete this package and it's contents immediately.
 
-This package is completely based on the Hugin project and the tools it contains. Hugin can be downloaded from http:/hugin.sourceforge.net. 
+This package is completely based on the Hugin project and the tools it contains. Hugin can be downloaded from http://hugin.sourceforge.net. 
+Next to the Hugin tools also enblend, enfuse and the PT* binaries from panotools are included.
+

Modified: hugin/trunk/mac/complete-tools-package.sh
===================================================================
--- hugin/trunk/mac/complete-tools-package.sh	2010-01-11 06:50:53 UTC (rev 4872)
+++ hugin/trunk/mac/complete-tools-package.sh	2010-01-11 07:43:17 UTC (rev 4873)
@@ -11,8 +11,11 @@
 
 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" 
-#frameworks="HuginBaseWx.framework HuginBase.framework"
-bins="align_image_stack autooptimiser calibrate_lens celeste cpclean deghosting_mask fulla matchpoint pano_trafo pto2mk tca_correct vig_optimize"
+# these are the "internal" Hugin tools
+bins="align_image_stack autooptimiser calibrate_lens celeste cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize"
+# these are the external tools. Note: due to license restrictions autopano-sift-c and panomatic are not copied in
+ext_bins="enblend enfuse PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop"
+
 binaries="$Package/$dylib_install_loc/*.dylib $Package/bin/* $Package/Frameworks/Hugin*.framework/Hugin*"
 
 #------------------------------------------------
@@ -20,12 +23,15 @@
 rm -Rf $Package
 mkdir -p $Package
 cp -Rf ../mac/Hugin_tools/* $Package
-#rm -Rf "$Package/$dylib_install_loc" "$Package/Frameworks" "$Package/bin" 
 mkdir -p "$Package/$dylib_install_loc" "$Package/Frameworks" "$Package/bin"
 for bin in $bins
 do
  cp $TARGET_BUILD_DIR/$bin "$Package/bin/" 
 done
+for ext_bin in $ext_bins
+do
+ cp $REPOSITORY_DIR/bin/$ext_bin "$Package/bin/" 
+done
 cp -Rf  $TARGET_BUILD_DIR/Hugin*.framework "$Package/Frameworks"
 
 for dylib in $libs


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4875
          http://hugin.svn.sourceforge.net/hugin/?rev=4875&view=rev
Author:   harryvanderwolf
Date:     2010-01-11 08:43:20 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
[OSX] final 5% of "Hugin_tools" package

Modified Paths:
--------------
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
    hugin/trunk/mac/complete-tools-package.sh

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2010-01-11 08:27:48 UTC (rev 4874)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2010-01-11 08:43:20 UTC (rev 4875)
@@ -1083,6 +1083,7 @@
 		739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
 		739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
 		739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
+		73A1602A10FB1A0100931D10 /* libPTLensDB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F8150C30268F00736343 /* libPTLensDB.a */; };
 		73BB093D0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; };
 		73BB093E0FACC71200B04997 /* PanoToolsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BB093C0FACC71200B04997 /* PanoToolsUtils.h */; };
 		73BB093F0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; };
@@ -2771,7 +2772,7 @@
 		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 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste_standalone; 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>"; };
@@ -3025,7 +3026,7 @@
 		734FBA5A0EB3A20500CD7122 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; };
 		734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonaOptionsDialog.cpp; sourceTree = "<group>"; };
 		734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonaOptionsDialog.h; sourceTree = "<group>"; };
-		73573E4710F9EEA300CF0ECD /* pano_trafo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pano_trafo; sourceTree = BUILT_PRODUCTS_DIR; };
+		73573E4710F9EEA300CF0ECD /* cpclean */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cpclean; sourceTree = BUILT_PRODUCTS_DIR; };
 		73573E5110F9EEF400CF0ECD /* pano_trafo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pano_trafo.cpp; sourceTree = "<group>"; };
 		7364217010763A22000121C5 /* deghosting_mask */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = deghosting_mask; sourceTree = BUILT_PRODUCTS_DIR; };
 		736421C110763D0B000121C5 /* threshold.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threshold.h; sourceTree = "<group>"; };
@@ -3051,12 +3052,12 @@
 		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>"; };
-		739A0C2410FA524E00D8E4C7 /* fulla */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fulla; sourceTree = BUILT_PRODUCTS_DIR; };
-		739A0C6310FA539B00D8E4C7 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; };
-		739A0CBC10FA567700D8E4C7 /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; };
-		739A0D0910FA56D300D8E4C7 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0C2410FA524E00D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0C6310FA539B00D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0CBC10FA567700D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0D0910FA56D300D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; };
 		739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "complete-tools-package.sh"; sourceTree = "<group>"; };
-		739A0DD810FA5FB700D8E4C7 /* pto2mk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto2mk; sourceTree = BUILT_PRODUCTS_DIR; };
+		739A0DD810FA5FB700D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; };
 		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>"; };
 		739A0EA510FA7A3100D8E4C7 /* set_environment.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set_environment.txt; sourceTree = "<group>"; };
@@ -3102,7 +3103,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>"; };
@@ -3124,7 +3125,7 @@
 		73EAB53A0E86CF130020D514 /* IlmBase.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IlmBase.pc; sourceTree = "<group>"; };
 		73EAB53B0E86CF130020D514 /* OpenEXR.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenEXR.pc; sourceTree = "<group>"; };
 		73EAB5400E86CF130020D514 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; };
-		73EBC0900EC9E0B20068B821 /* celeste_standalone */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste_standalone; sourceTree = BUILT_PRODUCTS_DIR; };
+		73EBC0900EC9E0B20068B821 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; };
 		E864E2C510CE8437007AC6E4 /* liblcms.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblcms.dylib; path = lib/liblcms.dylib; sourceTree = "<group>"; };
 		E8A7C02710F7993100839DF3 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGLEW.a; sourceTree = "<group>"; };
 		E8A7C02810F7993100839DF3 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libintl.a; sourceTree = "<group>"; };
@@ -3700,6 +3701,7 @@
 				739A0C8610FA557300D8E4C7 /* libexiv2.a in Frameworks */,
 				739A0C9110FA55B800D8E4C7 /* libintl.dylib in Frameworks */,
 				739A0C9810FA560600D8E4C7 /* libiconv.dylib in Frameworks */,
+				73A1602A10FB1A0100931D10 /* libPTLensDB.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4213,7 +4215,7 @@
 				73E79F300D674EAC00C07126 /* align_image_stack */,
 				7332AEAE0D8D4986002BF5FF /* matchpoint */,
 				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
-				73EBC0900EC9E0B20068B821 /* celeste_standalone */,
+				73EBC0900EC9E0B20068B821 /* celeste */,
 			);
 			name = "tools-dynamic";
 			sourceTree = "<group>";
@@ -4702,7 +4704,7 @@
 				576482BE0C469052003AFC2F /* fulla */,
 				576482E20C469056003AFC2F /* vig_optimize */,
 				73C959140DA2C9DB00E19110 /* tca_correct */,
-				57D50B520F5971A600CCDCB5 /* celeste_standalone */,
+				57D50B520F5971A600CCDCB5 /* celeste */,
 			);
 			name = "tools-static";
 			sourceTree = "<group>";
@@ -5065,14 +5067,14 @@
 				73C153681052E6DE00AE93C1 /* calibrate_lens */,
 				73D24B4E106152CD00B8A25D /* cpclean */,
 				7364217010763A22000121C5 /* deghosting_mask */,
-				73E6770010F8BF18001807AB /* libhugin_base.a */,
-				73573E4710F9EEA300CF0ECD /* pano_trafo */,
+				73E6770010F8BF18001807AB /* libhugin_algorithms.a */,
+				73573E4710F9EEA300CF0ECD /* cpclean */,
 				73704DA310FA30520012F4C1 /* Carbon.framework */,
-				739A0C2410FA524E00D8E4C7 /* fulla */,
-				739A0C6310FA539B00D8E4C7 /* autooptimiser */,
-				739A0CBC10FA567700D8E4C7 /* vig_optimize */,
-				739A0D0910FA56D300D8E4C7 /* tca_correct */,
-				739A0DD810FA5FB700D8E4C7 /* pto2mk */,
+				739A0C2410FA524E00D8E4C7 /* hugin_hdrmerge */,
+				739A0C6310FA539B00D8E4C7 /* hugin_hdrmerge */,
+				739A0CBC10FA567700D8E4C7 /* hugin_hdrmerge */,
+				739A0D0910FA56D300D8E4C7 /* hugin_hdrmerge */,
+				739A0DD810FA5FB700D8E4C7 /* hugin_hdrmerge */,
 			);
 			sourceTree = "<group>";
 		};
@@ -6253,7 +6255,7 @@
 			);
 			name = "celeste static";
 			productName = celeste_standalone;
-			productReference = 57D50B520F5971A600CCDCB5 /* celeste_standalone */;
+			productReference = 57D50B520F5971A600CCDCB5 /* celeste */;
 			productType = "com.apple.product-type.tool";
 		};
 		57E122570D2BE4E800743A93 /* align_image_stack static */ = {
@@ -6384,7 +6386,7 @@
 			);
 			name = pano_trafo;
 			productName = cpclean;
-			productReference = 73573E4710F9EEA300CF0ECD /* pano_trafo */;
+			productReference = 73573E4710F9EEA300CF0ECD /* cpclean */;
 			productType = "com.apple.product-type.tool";
 		};
 		7364216F10763A22000121C5 /* deghosting_mask */ = {
@@ -6422,7 +6424,7 @@
 			);
 			name = "fulla dynamic";
 			productName = "sample open_close";
-			productReference = 739A0C2410FA524E00D8E4C7 /* fulla */;
+			productReference = 739A0C2410FA524E00D8E4C7 /* hugin_hdrmerge */;
 			productType = "com.apple.product-type.tool";
 		};
 		739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */ = {
@@ -6440,7 +6442,7 @@
 			);
 			name = "autooptimiser dynamic";
 			productName = "sample open_close";
-			productReference = 739A0C6310FA539B00D8E4C7 /* autooptimiser */;
+			productReference = 739A0C6310FA539B00D8E4C7 /* hugin_hdrmerge */;
 			productType = "com.apple.product-type.tool";
 		};
 		739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */ = {
@@ -6458,7 +6460,7 @@
 			);
 			name = "vig_optimize dynamic";
 			productName = "sample open_close";
-			productReference = 739A0CBC10FA567700D8E4C7 /* vig_optimize */;
+			productReference = 739A0CBC10FA567700D8E4C7 /* hugin_hdrmerge */;
 			productType = "com.apple.product-type.tool";
 		};
 		739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */ = {
@@ -6476,7 +6478,7 @@
 			);
 			name = "tca_correct dynamic";
 			productName = "sample open_close";
-			productReference = 739A0D0910FA56D300D8E4C7 /* tca_correct */;
+			productReference = 739A0D0910FA56D300D8E4C7 /* hugin_hdrmerge */;
 			productType = "com.apple.product-type.tool";
 		};
 		739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */ = {
@@ -6494,7 +6496,7 @@
 			);
 			name = "pto2mk dynamic";
 			productName = "sample open_close";
-			productReference = 739A0DD810FA5FB700D8E4C7 /* pto2mk */;
+			productReference = 739A0DD810FA5FB700D8E4C7 /* hugin_hdrmerge */;
 			productType = "com.apple.product-type.tool";
 		};
 		73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */ = {
@@ -6564,7 +6566,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 */ = {
@@ -6602,7 +6604,7 @@
 			);
 			name = "celeste dynamic";
 			productName = celeste_standalone;
-			productReference = 73EBC0900EC9E0B20068B821 /* celeste_standalone */;
+			productReference = 73EBC0900EC9E0B20068B821 /* celeste */;
 			productType = "com.apple.product-type.tool";
 		};
 /* End PBXNativeTarget section */

Modified: hugin/trunk/mac/complete-tools-package.sh
===================================================================
--- hugin/trunk/mac/complete-tools-package.sh	2010-01-11 08:27:48 UTC (rev 4874)
+++ hugin/trunk/mac/complete-tools-package.sh	2010-01-11 08:43:20 UTC (rev 4875)
@@ -7,12 +7,13 @@
 dylib_install_loc="Libraries"
 new_install_name_dirname="@executable_path/../$dylib_install_loc"
 
+# Package is not really a correct name as it is a folder mimicing an OSX application
 Package="$TARGET_BUILD_DIR/Hugin_tools"
 
 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" 
 # these are the "internal" Hugin tools
-bins="align_image_stack autooptimiser calibrate_lens celeste cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize"
+bins="align_image_stack autooptimiser calibrate_lens celeste_standalone cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize"
 # these are the external tools. Note: due to license restrictions autopano-sift-c and panomatic are not copied in
 ext_bins="enblend enfuse PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4884
          http://hugin.svn.sourceforge.net/hugin/?rev=4884&view=rev
Author:   skipgaede
Date:     2010-01-13 09:58:07 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
[OSX] Added support for new dynamic libraries to scripts

Modified Paths:
--------------
    hugin/trunk/mac/complete-bundle.sh
    hugin/trunk/mac/complete-tools-package.sh

Modified: hugin/trunk/mac/complete-bundle.sh
===================================================================
--- hugin/trunk/mac/complete-bundle.sh	2010-01-13 06:12:10 UTC (rev 4883)
+++ hugin/trunk/mac/complete-bundle.sh	2010-01-13 09:58:07 UTC (rev 4884)
@@ -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" 
+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" 
 
 binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*"
 

Modified: hugin/trunk/mac/complete-tools-package.sh
===================================================================
--- hugin/trunk/mac/complete-tools-package.sh	2010-01-13 06:12:10 UTC (rev 4883)
+++ hugin/trunk/mac/complete-tools-package.sh	2010-01-13 09:58:07 UTC (rev 4884)
@@ -11,7 +11,7 @@
 Package="$TARGET_BUILD_DIR/Hugin_tools"
 
 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" 
+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" 
 # these are the "internal" Hugin tools
 bins="align_image_stack autooptimiser calibrate_lens celeste_standalone cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize"
 # these are the external tools. Note: due to license restrictions autopano-sift-c and panomatic are not copied in


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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.

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.

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.

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.

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.

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.

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.

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.