Diff of /mac/Hugin.xcodeproj/project.pbxproj [d2b853] .. [3f9ab6]  Maximize  Restore

Switch to side-by-side view

--- a/mac/Hugin.xcodeproj/project.pbxproj
+++ b/mac/Hugin.xcodeproj/project.pbxproj
@@ -50,6 +50,7 @@
 			isa = PBXAggregateTarget;
 			buildConfigurationList = 57C4862A0C312226002D79F1 /* Build configuration list for PBXAggregateTarget "configure" */;
 			buildPhases = (
+				57D18D4D0E13B82F0054A523 /* update SVN-rev.xcconfig */,
 				57C4863E0C3122C4002D79F1 /* copy hugin_config.h */,
 				57E122110D2BDDBE00743A93 /* configure hugin_version.h */,
 			);
@@ -57,6 +58,18 @@
 			);
 			name = configure;
 			productName = "copy hugin_config.h";
+		};
+		57D382C50E2369D000445A37 /* tools - other dynamic */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 57D3830F0E236A2900445A37 /* Build configuration list for PBXAggregateTarget "tools - other dynamic" */;
+			buildPhases = (
+			);
+			dependencies = (
+				57D382CB0E2369D600445A37 /* PBXTargetDependency */,
+				57D382CD0E2369D600445A37 /* PBXTargetDependency */,
+			);
+			name = "tools - other dynamic";
+			productName = "tools - other dynamic";
 		};
 		57E3470D0C4A8E95006AA781 /* lib static */ = {
 			isa = PBXAggregateTarget;
@@ -100,10 +113,13 @@
 			buildPhases = (
 			);
 			dependencies = (
+				57D3832F0E236B6A00445A37 /* PBXTargetDependency */,
+				57D383310E236B6A00445A37 /* PBXTargetDependency */,
 				57E347390C4A8EF4006AA781 /* PBXTargetDependency */,
 				57E347370C4A8EF4006AA781 /* PBXTargetDependency */,
 				57E347350C4A8EF4006AA781 /* PBXTargetDependency */,
 				57AC37490D2BE6D80086D348 /* PBXTargetDependency */,
+				57D382CF0E2369E400445A37 /* PBXTargetDependency */,
 			);
 			name = tools;
 			productName = tools;
@@ -674,6 +690,54 @@
 		57CBEE3206BC715C00C43FF5 /* tiff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1606BC2301004F4FA7 /* tiff.cxx */; };
 		57CBEE3306BC716200C43FF5 /* viff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1806BC2301004F4FA7 /* viff.cxx */; };
 		57CBEE3406BC716600C43FF5 /* void_vector.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1A06BC2301004F4FA7 /* void_vector.cxx */; };
+		57D382D60E2369FC00445A37 /* nona.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5796FA970C4395F4006B7C6E /* nona.cpp */; };
+		57D382D80E2369FC00445A37 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		57D382D90E2369FC00445A37 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		57D382DA0E2369FC00445A37 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		57D382DB0E2369FC00445A37 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		57D382DC0E2369FC00445A37 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		57D382DD0E2369FC00445A37 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		57D382DE0E2369FC00445A37 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		57D382DF0E2369FC00445A37 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		57D382E00E2369FC00445A37 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		57D382E10E2369FC00445A37 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		57D382E20E2369FC00445A37 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; };
+		57D382E30E2369FC00445A37 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		57D382F30E236A0800445A37 /* APImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE560D8D491B002BF5FF /* APImage.cpp */; };
+		57D382F40E236A0800445A37 /* Descriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE790D8D491B002BF5FF /* Descriptor.cpp */; };
+		57D382F50E236A0800445A37 /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; };
+		57D382F60E236A0800445A37 /* MatchPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE8A0D8D491C002BF5FF /* MatchPoint.cpp */; };
+		57D382F80E236A0800445A37 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		57D382F90E236A0800445A37 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		57D382FA0E236A0800445A37 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		57D382FB0E236A0800445A37 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		57D382FC0E236A0800445A37 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		57D382FD0E236A0800445A37 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		57D382FE0E236A0800445A37 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		57D382FF0E236A0800445A37 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		57D383000E236A0800445A37 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		57D383180E236AD900445A37 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; };
+		57D383190E236AD900445A37 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; };
+		57D3831A0E236AD900445A37 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; };
+		57D3831B0E236AD900445A37 /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; };
+		57D3831C0E236AD900445A37 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; };
+		57D3831D0E236AD900445A37 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; };
+		57D3831E0E236AD900445A37 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; };
+		57D3831F0E236AD900445A37 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; };
+		57D383200E236AD900445A37 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
+		57D383210E236AD900445A37 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; };
+		57D383220E236AD900445A37 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; };
+		57D383230E236B1D00445A37 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; };
+		57D383240E236B1D00445A37 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; };
+		57D383250E236B1D00445A37 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; };
+		57D383260E236B1D00445A37 /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; };
+		57D383270E236B1D00445A37 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; };
+		57D383280E236B1D00445A37 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; };
+		57D383290E236B1D00445A37 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; };
+		57D3832A0E236B1D00445A37 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; };
+		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 */; };
 		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 */; };
@@ -757,12 +821,7 @@
 		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 */; };
-		737ECC810DA56F81003BC9F5 /* autopano in Resources */ = {isa = PBXBuildFile; fileRef = 737ECC800DA56F5D003BC9F5 /* autopano */; };
-		73AFD4720DA42DE7002E2F60 /* autopano-sift-c in Resources */ = {isa = PBXBuildFile; fileRef = 731ADE960D66E1AB004161DF /* autopano-sift-c */; };
-		73AFD4730DA42DFE002E2F60 /* panomatic in Resources */ = {isa = PBXBuildFile; fileRef = 736B5B9F0D8074DD00638B14 /* panomatic */; };
-		73AFD4790DA42E61002E2F60 /* matchpoint in Resources */ = {isa = PBXBuildFile; fileRef = 7332AEAE0D8D4986002BF5FF /* matchpoint */; };
 		73BDB8950DA552EF00027833 /* matchpoint-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */; };
-		73BDB8970DA5548400027833 /* AppSettings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 73BDB8960DA5547300027833 /* AppSettings.plist */; };
 		73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		73C958FB0DA2C9DB00E19110 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; };
 		73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
@@ -827,111 +886,6 @@
 			remoteGlobalIDString = 5796FA730C4395CC006B7C6E;
 			remoteInfo = "nona dynamic";
 		};
-		5737BC380C4CF7BA00A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC3A0C4CF7CE00A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC3C0C4CF7D500A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC3E0C4CF7D800A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC400C4CF7E500A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC420C4CF7EA00A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC440C4CF7ED00A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC460C4CF7F000A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC480C4CF7F400A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC4A0C4CF80300A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC4C0C4CF80700A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC4E0C4CF80A00A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC500C4CF80D00A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC520C4CF81400A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
-		5737BC540C4CF81800A61778 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
 		57525A2D0C54BC8400BF8096 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -939,13 +893,6 @@
 			remoteGlobalIDString = 57525A240C54BC4400BF8096;
 			remoteInfo = Nona;
 		};
-		57525A310C54BCA400BF8096 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
 		576900940D24D26200A6AD01 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1044,13 +991,6 @@
 			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
 			remoteInfo = "vigra_impex Framework";
 		};
-		5769F6010D23825700A6AD01 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 57C486290C3121E8002D79F1;
-			remoteInfo = "copy hugin_config.h";
-		};
 		5769F8830D23AAE800A6AD01 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1121,6 +1061,62 @@
 			remoteGlobalIDString = 57E3470D0C4A8E95006AA781;
 			remoteInfo = "lib static";
 		};
+		57D382CA0E2369D600445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73E79F0C0D674EAC00C07126;
+			remoteInfo = "align_image_stack dynamic";
+		};
+		57D382CC0E2369D600445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7332AE910D8D4986002BF5FF;
+			remoteInfo = "matchpoint dynamic";
+		};
+		57D382CE0E2369E400445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73C958F40DA2C9DB00E19110;
+			remoteInfo = "tca_correct static";
+		};
+		57D382D20E2369FC00445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		57D382D40E2369FC00445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		57D383100E236A3600445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57E3470D0C4A8E95006AA781;
+			remoteInfo = "lib static";
+		};
+		57D3832E0E236B6A00445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D382D00E2369FC00445A37;
+			remoteInfo = "nona static";
+		};
+		57D383300E236B6A00445A37 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D382ED0E236A0800445A37;
+			remoteInfo = "matchpoint static";
+		};
 		57E347120C4A8EB6006AA781 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -1260,6 +1256,97 @@
 			proxyType = 1;
 			remoteGlobalIDString = 57E347300C4A8EDF006AA781;
 			remoteInfo = app;
+		};
+		57E92AAB0E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5720E47A0BD456CD00E63404;
+			remoteInfo = levmar;
+		};
+		57E92AAD0E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5749F8A3067B60CA00A6EDD4;
+			remoteInfo = jhead;
+		};
+		57E92AAF0E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5711524A06BC6709004F4FA7;
+			remoteInfo = vigra_impex;
+		};
+		57E92AB10E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 57C1706C09A125DE00FAF325;
+			remoteInfo = vigra_ext;
+		};
+		57E92AB30E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5771F5D70C3006E900736343;
+			remoteInfo = hugin_utils;
+		};
+		57E92AB50E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5771F77A0C30216F00736343;
+			remoteInfo = hugin_math;
+		};
+		57E92AB70E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5759D9AC0C32713F0043F754;
+			remoteInfo = appbase;
+		};
+		57E92AB90E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5759DA4F0C327D680043F754;
+			remoteInfo = panodata;
+		};
+		57E92ABB0E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 571300650C33D41F00252FE3;
+			remoteInfo = panotools;
+		};
+		57E92ABD0E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5740922A0C393E6600D16607;
+			remoteInfo = nona;
+		};
+		57E92ABF0E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 57EA83860C3A798A00E4965E;
+			remoteInfo = algorithms;
+		};
+		57E92AC10E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 576EC4990C3FC9300076A417;
+			remoteInfo = huginapp;
+		};
+		57E92AC30E1DA54700D99C3B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 57E122580D2BE4E900743A93;
+			remoteInfo = "align_image_stack static";
 		};
 		7332AE930D8D4986002BF5FF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -1410,6 +1497,8 @@
 		571300810C33D49200252FE3 /* PanoramaOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoramaOptions.cpp; sourceTree = "<group>"; };
 		571300820C33D49200252FE3 /* PanoramaOptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoramaOptions.h; sourceTree = "<group>"; };
 		5713010A0C33E3DD00252FE3 /* PanoramaData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoramaData.h; sourceTree = "<group>"; };
+		571D8C700E213216006D0305 /* patch-xrc.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "patch-xrc.sh"; sourceTree = "<group>"; };
+		571D8C910E213879006D0305 /* localise-help.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "localise-help.sh"; sourceTree = "<group>"; };
 		5720E47A0BD456CD00E63404 /* libhugin_levmar.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_levmar.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		5720E47C0BD4575000E63404 /* Axb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Axb.c; sourceTree = "<group>"; };
 		5720E47D0BD4575000E63404 /* Axb_core.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Axb_core.c; sourceTree = "<group>"; };
@@ -1704,6 +1793,7 @@
 		57A686960D5677F900F215C4 /* RunStitchPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RunStitchPanel.cpp; sourceTree = "<group>"; };
 		57A686970D5677F900F215C4 /* RunStitchPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RunStitchPanel.h; sourceTree = "<group>"; };
 		57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "autopano-complete-mac.sh"; sourceTree = "<group>"; };
+		57AB3D760E1E976300EFD03F /* BuildConfig.xcconfig.orig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BuildConfig.xcconfig.orig; sourceTree = "<group>"; };
 		57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Panorama.cpp; sourceTree = "<group>"; };
 		57B88E5E0C36CD7E00EC6519 /* Panorama.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Panorama.h; sourceTree = "<group>"; };
 		57B88E620C36CD8F00EC6519 /* ResponseTransform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResponseTransform.h; sourceTree = "<group>"; };
@@ -1721,6 +1811,10 @@
 		57CCCC5C086C9651000EBC4A /* utils */ = {isa = PBXFileReference; lastKnownFileType = folder; path = utils; sourceTree = "<group>"; };
 		57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "nona_gui-Info.plist"; sourceTree = "<group>"; };
 		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 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = "<group>"; };
+		57D3830D0E236A0800445A37 /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = "<group>"; };
 		57D475B60D3CE0AB003CF158 /* translations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = translations; 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>"; };
@@ -1854,6 +1948,7 @@
 		57E34AB20C4ACC04006AA781 /* CPFineTuneFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPFineTuneFrame.cpp; sourceTree = "<group>"; };
 		57E34AB30C4ACC04006AA781 /* CPFineTuneFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPFineTuneFrame.h; sourceTree = "<group>"; };
 		57E34ACC0C4ACE46006AA781 /* math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; };
+		57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = align_image_stack.xcodeproj; path = "/Users/ippei/dev/hugin/hugin-svn/mac/align_image_stack.xcodeproj"; sourceTree = "<absolute>"; };
 		57EA83860C3A798A00E4965E /* libhugin_algorithms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_algorithms.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		57EA83A00C3A7AA900E4965E /* PanoramaAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PanoramaAlgorithm.h; path = algorithm/PanoramaAlgorithm.h; sourceTree = "<group>"; };
 		57EA83A10C3A7AA900E4965E /* StitcherAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StitcherAlgorithm.h; path = algorithm/StitcherAlgorithm.h; sourceTree = "<group>"; };
@@ -1919,7 +2014,6 @@
 		737ECC720DA56633003BC9F5 /* generatekeys */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = generatekeys; path = bin/generatekeys; sourceTree = "<group>"; };
 		737ECC800DA56F5D003BC9F5 /* autopano */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = autopano; path = bin/autopano; sourceTree = "<group>"; };
 		73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "matchpoint-complete-mac.sh"; sourceTree = "<group>"; };
-		73BDB8960DA5547300027833 /* AppSettings.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = AppSettings.plist; sourceTree = "<group>"; };
 		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; };
 /* End PBXFileReference section */
@@ -2165,6 +2259,63 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		57D382D70E2369FC00445A37 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D382D80E2369FC00445A37 /* libz.dylib in Frameworks */,
+				57D382D90E2369FC00445A37 /* libpng.dylib in Frameworks */,
+				57D382DA0E2369FC00445A37 /* libtiff.dylib in Frameworks */,
+				57D382DB0E2369FC00445A37 /* libjpeg.dylib in Frameworks */,
+				57D382DC0E2369FC00445A37 /* libIex.dylib in Frameworks */,
+				57D382DD0E2369FC00445A37 /* libIlmThread.dylib in Frameworks */,
+				57D382DE0E2369FC00445A37 /* libIlmImf.dylib in Frameworks */,
+				57D382DF0E2369FC00445A37 /* libImath.dylib in Frameworks */,
+				57D382E00E2369FC00445A37 /* libHalf.dylib in Frameworks */,
+				57D382E10E2369FC00445A37 /* libpano13.dylib in Frameworks */,
+				57D382E20E2369FC00445A37 /* libboost_thread-mt.dylib in Frameworks */,
+				57D382E30E2369FC00445A37 /* libexpat.dylib in Frameworks */,
+				57D383230E236B1D00445A37 /* libhugin_jhead.a in Frameworks */,
+				57D383240E236B1D00445A37 /* libhugin_vigra_impex.a in Frameworks */,
+				57D383250E236B1D00445A37 /* libhugin_utils.a in Frameworks */,
+				57D383260E236B1D00445A37 /* libhugin_vigra_ext.a in Frameworks */,
+				57D383270E236B1D00445A37 /* libhugin_panotools.a in Frameworks */,
+				57D383280E236B1D00445A37 /* libhugin_panodata.a in Frameworks */,
+				57D383290E236B1D00445A37 /* libhugin_appbase.a in Frameworks */,
+				57D3832A0E236B1D00445A37 /* libhugin_algorithms.a in Frameworks */,
+				57D3832B0E236B1D00445A37 /* libhugin_levmar.a in Frameworks */,
+				57D3832C0E236B1D00445A37 /* libhugin_nona.a in Frameworks */,
+				57D3832D0E236B1D00445A37 /* libhugin_math.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		57D382F70E236A0800445A37 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D382F80E236A0800445A37 /* libz.dylib in Frameworks */,
+				57D382F90E236A0800445A37 /* libpng.dylib in Frameworks */,
+				57D382FA0E236A0800445A37 /* libtiff.dylib in Frameworks */,
+				57D382FB0E236A0800445A37 /* libjpeg.dylib in Frameworks */,
+				57D382FC0E236A0800445A37 /* libIex.dylib in Frameworks */,
+				57D382FD0E236A0800445A37 /* libIlmThread.dylib in Frameworks */,
+				57D382FE0E236A0800445A37 /* libIlmImf.dylib in Frameworks */,
+				57D382FF0E236A0800445A37 /* libImath.dylib in Frameworks */,
+				57D383000E236A0800445A37 /* libHalf.dylib in Frameworks */,
+				57D383180E236AD900445A37 /* libhugin_jhead.a in Frameworks */,
+				57D383190E236AD900445A37 /* libhugin_vigra_impex.a in Frameworks */,
+				57D3831A0E236AD900445A37 /* libhugin_utils.a in Frameworks */,
+				57D3831B0E236AD900445A37 /* libhugin_vigra_ext.a in Frameworks */,
+				57D3831C0E236AD900445A37 /* libhugin_panotools.a in Frameworks */,
+				57D3831D0E236AD900445A37 /* libhugin_panodata.a in Frameworks */,
+				57D3831E0E236AD900445A37 /* libhugin_appbase.a in Frameworks */,
+				57D3831F0E236AD900445A37 /* libhugin_algorithms.a in Frameworks */,
+				57D383200E236AD900445A37 /* libhugin_levmar.a in Frameworks */,
+				57D383210E236AD900445A37 /* libhugin_nona.a in Frameworks */,
+				57D383220E236AD900445A37 /* libhugin_math.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		57E122560D2BE4E800743A93 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2310,9 +2461,11 @@
 			isa = PBXGroup;
 			children = (
 				5751D8600939F1C0001477EA /* Hugin.xcodeproj */,
+				57D18D8E0E13BD340054A523 /* Version.xcconfig */,
+				57AB3D760E1E976300EFD03F /* BuildConfig.xcconfig.orig */,
 				57E122010D2BDBF300743A93 /* BuildConfig.xcconfig */,
+				57D18D8F0E13BD340054A523 /* SVN-rev.xcconfig */,
 				57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */,
-				73BDB8960DA5547300027833 /* AppSettings.plist */,
 				57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */,
 				5769F6320D23825700A6AD01 /* hugin_stitch_project-Info.plist */,
 				73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */,
@@ -2320,6 +2473,8 @@
 				57114EA006BC2301004F4FA7 /* Hugin.icns */,
 				5702996D07F967CB00F1FF15 /* HuginFiles.icns */,
 				57B8C693083AB7F400283C06 /* localised.sh */,
+				571D8C910E213879006D0305 /* localise-help.sh */,
+				571D8C700E213216006D0305 /* patch-xrc.sh */,
 				57A2BC2E0D45422800E9FFEC /* copyExifTool.sh */,
 				576902090D24DBA100A6AD01 /* complete-bundle.sh */,
 				57810AAB0D32D79400F48296 /* complete-embed.sh */,
@@ -2544,7 +2699,8 @@
 			children = (
 				5769FD140D24B3D400A6AD01 /* frameworks */,
 				573B8F3F067BA2F900B7B355 /* lib-static */,
-				573B9041067BAEA700B7B355 /* tools */,
+				573B9041067BAEA700B7B355 /* tools-dynamic */,
+				57D18D880E13BC8A0054A523 /* tools-static */,
 				57BB2817068114B2006EDB38 /* Mac OS X */,
 				57525A1E0C54BBF600BF8096 /* test */,
 			);
@@ -2572,17 +2728,15 @@
 			name = "lib-static";
 			sourceTree = "<group>";
 		};
-		573B9041067BAEA700B7B355 /* tools */ = {
+		573B9041067BAEA700B7B355 /* tools-dynamic */ = {
 			isa = PBXGroup;
 			children = (
-				57E122580D2BE4E900743A93 /* align_image_stack */,
 				5796FA950C4395CC006B7C6E /* nona */,
 				5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */,
-				5709A0890C4543E100BD1C53 /* autooptimiser */,
-				576482BE0C469052003AFC2F /* fulla */,
-				576482E20C469056003AFC2F /* vig_optimize */,
-			);
-			name = tools;
+				73E79F300D674EAC00C07126 /* align_image_stack */,
+				7332AEAE0D8D4986002BF5FF /* matchpoint */,
+			);
+			name = "tools-dynamic";
 			sourceTree = "<group>";
 		};
 		573E2E440B76AC5100E86281 /* ExternalPrograms */ = {
@@ -2983,10 +3137,10 @@
 				57E122480D2BE45700743A93 /* hugin_version.h */,
 				5771F5E60C3007B300736343 /* hugin_base */,
 				57114EC106BC2301004F4FA7 /* foreign */,
-				7332AE550D8D491B002BF5FF /* matchpoint */,
 				57460AB30C4E7BD5004507F7 /* tools */,
 				57E32FAB0C4A87F1006AA781 /* hugin1 */,
 				5769F83C0D23A9F400A6AD01 /* deghosting */,
+				7332AE550D8D491B002BF5FF /* matchpoint */,
 				57D475B60D3CE0AB003CF158 /* translations */,
 			);
 			name = src;
@@ -3023,6 +3177,20 @@
 			name = attached;
 			path = ..;
 			sourceTree = SOURCE_ROOT;
+		};
+		57D18D880E13BC8A0054A523 /* tools-static */ = {
+			isa = PBXGroup;
+			children = (
+				57D382EB0E2369FC00445A37 /* nona */,
+				57D3830D0E236A0800445A37 /* matchpoint */,
+				57E122580D2BE4E900743A93 /* align_image_stack */,
+				5709A0890C4543E100BD1C53 /* autooptimiser */,
+				576482BE0C469052003AFC2F /* fulla */,
+				576482E20C469056003AFC2F /* vig_optimize */,
+				73C959140DA2C9DB00E19110 /* tca_correct */,
+			);
+			name = "tools-static";
+			sourceTree = "<group>";
 		};
 		57E32FAB0C4A87F1006AA781 /* hugin1 */ = {
 			isa = PBXGroup;
@@ -3239,6 +3407,26 @@
 			path = /Developer/SDKs/MacOSX10.4u.sdk/usr/include;
 			sourceTree = "<absolute>";
 		};
+		57E92A980E1DA54700D99C3B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				57E92AAC0E1DA54700D99C3B /* libhugin_levmar.a */,
+				57E92AAE0E1DA54700D99C3B /* libhugin_jhead.a */,
+				57E92AB00E1DA54700D99C3B /* libhugin_vigra_impex.a */,
+				57E92AB20E1DA54700D99C3B /* libhugin_vigra_ext.a */,
+				57E92AB40E1DA54700D99C3B /* libhugin_utils.a */,
+				57E92AB60E1DA54700D99C3B /* libhugin_math.a */,
+				57E92AB80E1DA54700D99C3B /* libhugin_appbase.a */,
+				57E92ABA0E1DA54700D99C3B /* libhugin_panodata.a */,
+				57E92ABC0E1DA54700D99C3B /* libhugin_panotools.a */,
+				57E92ABE0E1DA54700D99C3B /* libhugin_nona.a */,
+				57E92AC00E1DA54700D99C3B /* libhugin_algorithms.a */,
+				57E92AC20E1DA54700D99C3B /* libhugin_app.a */,
+				57E92AC40E1DA54700D99C3B /* align_image_stack */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		57EA83940C3A7A0C00E4965E /* algorithm */ = {
 			isa = PBXGroup;
 			children = (
@@ -3287,9 +3475,6 @@
 				5745FC05094E1D5400E6B672 /* External */,
 				57CCCC23086C9530000EBC4A /* attached */,
 				573B8F3E067BA2EB00B7B355 /* Product */,
-				73E79F300D674EAC00C07126 /* align_image_stack */,
-				7332AEAE0D8D4986002BF5FF /* matchpoint */,
-				73C959140DA2C9DB00E19110 /* tca_correct */,
 			);
 			sourceTree = "<group>";
 		};
@@ -3804,7 +3989,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC390C4CF7BA00A61778 /* PBXTargetDependency */,
 			);
 			name = vigra_impex;
 			productName = vigra_impex;
@@ -3821,7 +4005,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC4B0C4CF80300A61778 /* PBXTargetDependency */,
 			);
 			name = panotools;
 			productName = panotools;
@@ -3838,7 +4021,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC3B0C4CF7CE00A61778 /* PBXTargetDependency */,
 			);
 			name = levmar;
 			productName = jhead;
@@ -3855,7 +4037,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC4D0C4CF80700A61778 /* PBXTargetDependency */,
 			);
 			name = nona;
 			productName = nona;
@@ -3872,7 +4053,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC3F0C4CF7D800A61778 /* PBXTargetDependency */,
 			);
 			name = jhead;
 			productName = jhead;
@@ -3891,7 +4071,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				57525A320C54BCA400BF8096 /* PBXTargetDependency */,
 				5710467C0D25F5EF006A3C69 /* PBXTargetDependency */,
 			);
 			name = Nona;
@@ -3909,7 +4088,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC470C4CF7F000A61778 /* PBXTargetDependency */,
 			);
 			name = appbase;
 			productName = appbase;
@@ -3926,7 +4104,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC490C4CF7F400A61778 /* PBXTargetDependency */,
 			);
 			name = panodata;
 			productName = panodata;
@@ -4012,6 +4189,7 @@
 			buildPhases = (
 				5769F6060D23825700A6AD01 /* Sources */,
 				5769F6080D23825700A6AD01 /* Frameworks */,
+				571D8AC70E212172006D0305 /* Locale Script */,
 				579374850D47E7E500A52730 /* Copy ExifTool */,
 				5769F79C0D239D0A00A6AD01 /* Copy Executable Files */,
 				576901FD0D24DA4B00A6AD01 /* Copy Frameworks */,
@@ -4020,7 +4198,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5769F6000D23825700A6AD01 /* PBXTargetDependency */,
 				576901CE0D24D81700A6AD01 /* PBXTargetDependency */,
 				5769F8860D23AAEB00A6AD01 /* PBXTargetDependency */,
 				5769F8840D23AAE800A6AD01 /* PBXTargetDependency */,
@@ -4075,7 +4252,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC510C4CF80D00A61778 /* PBXTargetDependency */,
 			);
 			name = huginapp;
 			productName = huginapp;
@@ -4092,7 +4268,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC430C4CF7EA00A61778 /* PBXTargetDependency */,
 			);
 			name = hugin_utils;
 			productName = hugin_utils;
@@ -4109,7 +4284,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC450C4CF7ED00A61778 /* PBXTargetDependency */,
 			);
 			name = hugin_math;
 			productName = hugin_math;
@@ -4126,7 +4300,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC3D0C4CF7D500A61778 /* PBXTargetDependency */,
 			);
 			name = PTLensDB;
 			productName = PTlensdb;
@@ -4161,12 +4334,46 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC410C4CF7E500A61778 /* PBXTargetDependency */,
 			);
 			name = vigra_ext;
 			productName = vigra_impex;
 			productReference = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */;
 			productType = "com.apple.product-type.library.static";
+		};
+		57D382D00E2369FC00445A37 /* nona static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 57D382E60E2369FC00445A37 /* Build configuration list for PBXNativeTarget "nona static" */;
+			buildPhases = (
+				57D382D50E2369FC00445A37 /* Sources */,
+				57D382D70E2369FC00445A37 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				57D382D10E2369FC00445A37 /* PBXTargetDependency */,
+				57D382D30E2369FC00445A37 /* PBXTargetDependency */,
+			);
+			name = "nona static";
+			productName = "sample open_close";
+			productReference = 57D382EB0E2369FC00445A37 /* nona */;
+			productType = "com.apple.product-type.tool";
+		};
+		57D382ED0E236A0800445A37 /* matchpoint static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 57D383080E236A0800445A37 /* Build configuration list for PBXNativeTarget "matchpoint static" */;
+			buildPhases = (
+				57D382F20E236A0800445A37 /* Sources */,
+				57D382F70E236A0800445A37 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				57D383110E236A3600445A37 /* PBXTargetDependency */,
+			);
+			name = "matchpoint static";
+			productName = align_image_stack;
+			productReference = 57D3830D0E236A0800445A37 /* matchpoint */;
+			productType = "com.apple.product-type.tool";
 		};
 		57E122570D2BE4E800743A93 /* align_image_stack static */ = {
 			isa = PBXNativeTarget;
@@ -4192,7 +4399,9 @@
 				57E3467B0C4A89B0006AA781 /* Sources */,
 				57E3467C0C4A89B0006AA781 /* Frameworks */,
 				57E3467A0C4A89B0006AA781 /* Resources */,
-				57E347640C4A8F9F006AA781 /* Resourse Script */,
+				571D8C740E2132DE006D0305 /* Patch XRC */,
+				57E347640C4A8F9F006AA781 /* Locale Script */,
+				571D8C8E0E213833006D0305 /* Localise Help */,
 				576901E60D24D93300A6AD01 /* Copy Frameworks */,
 				576902030D24DA9500A6AD01 /* Complete Bundle */,
 				5710465D0D25F490006A3C69 /* Complete Embedding */,
@@ -4200,7 +4409,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC550C4CF81800A61778 /* PBXTargetDependency */,
 				576901B80D24D61C00A6AD01 /* PBXTargetDependency */,
 				5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */,
 			);
@@ -4219,7 +4427,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC530C4CF81400A61778 /* PBXTargetDependency */,
 			);
 			name = wxbase;
 			productName = huginwxutils;
@@ -4236,16 +4443,15 @@
 			buildRules = (
 			);
 			dependencies = (
-				5737BC4F0C4CF80A00A61778 /* PBXTargetDependency */,
 			);
 			name = algorithms;
 			productName = algorithms;
 			productReference = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		7332AE910D8D4986002BF5FF /* matchpoint */ = {
+		7332AE910D8D4986002BF5FF /* matchpoint dynamic */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint" */;
+			buildConfigurationList = 7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint dynamic" */;
 			buildPhases = (
 				7332AE960D8D4986002BF5FF /* Sources */,
 				7332AE980D8D4986002BF5FF /* Frameworks */,
@@ -4257,7 +4463,7 @@
 				7332AE920D8D4986002BF5FF /* PBXTargetDependency */,
 				7332AE940D8D4986002BF5FF /* PBXTargetDependency */,
 			);
-			name = matchpoint;
+			name = "matchpoint dynamic";
 			productName = align_image_stack;
 			productReference = 7332AEAE0D8D4986002BF5FF /* matchpoint */;
 			productType = "com.apple.product-type.tool";
@@ -4302,7 +4508,11 @@
 /* Begin PBXProject section */
 		57FC3AC10675E43600C3E0AC /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = NO;
+			};
 			buildConfigurationList = 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -4319,6 +4529,13 @@
 			mainGroup = 57FC3ABD0675E43600C3E0AC;
 			productRefGroup = 57FC3ABD0675E43600C3E0AC;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 57E92A980E1DA54700D99C3B /* Products */;
+					ProjectRef = 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */;
+				},
+			);
+			projectRoot = ..;
 			targets = (
 				57C486290C3121E8002D79F1 /* configure */,
 				57A60E920C400269007B5462 /* all */,
@@ -4349,28 +4566,120 @@
 				57E3467D0C4A89B0006AA781 /* Hugin */,
 				57525A240C54BC4400BF8096 /* Nona */,
 				57E347330C4A8EED006AA781 /* tools */,
+				57D382D00E2369FC00445A37 /* nona static */,
+				57D382ED0E236A0800445A37 /* matchpoint static */,
+				57E122570D2BE4E800743A93 /* align_image_stack static */,
 				5709A0670C4543E100BD1C53 /* autooptimiser static */,
 				5764829C0C469052003AFC2F /* fulla static */,
 				576482C00C469056003AFC2F /* vig_optimize static */,
-				57E122570D2BE4E800743A93 /* align_image_stack static */,
+				73C958F40DA2C9DB00E19110 /* tca_correct static */,
+				57D382C50E2369D000445A37 /* tools - other dynamic */,
 				73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */,
-				7332AE910D8D4986002BF5FF /* matchpoint */,
-				73C958F40DA2C9DB00E19110 /* tca_correct static */,
+				7332AE910D8D4986002BF5FF /* matchpoint dynamic */,
 			);
 		};
 /* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		57E92AAC0E1DA54700D99C3B /* libhugin_levmar.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_levmar.a;
+			remoteRef = 57E92AAB0E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AAE0E1DA54700D99C3B /* libhugin_jhead.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_jhead.a;
+			remoteRef = 57E92AAD0E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AB00E1DA54700D99C3B /* libhugin_vigra_impex.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_vigra_impex.a;
+			remoteRef = 57E92AAF0E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AB20E1DA54700D99C3B /* libhugin_vigra_ext.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_vigra_ext.a;
+			remoteRef = 57E92AB10E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AB40E1DA54700D99C3B /* libhugin_utils.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_utils.a;
+			remoteRef = 57E92AB30E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AB60E1DA54700D99C3B /* libhugin_math.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_math.a;
+			remoteRef = 57E92AB50E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AB80E1DA54700D99C3B /* libhugin_appbase.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_appbase.a;
+			remoteRef = 57E92AB70E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92ABA0E1DA54700D99C3B /* libhugin_panodata.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_panodata.a;
+			remoteRef = 57E92AB90E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92ABC0E1DA54700D99C3B /* libhugin_panotools.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_panotools.a;
+			remoteRef = 57E92ABB0E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92ABE0E1DA54700D99C3B /* libhugin_nona.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_nona.a;
+			remoteRef = 57E92ABD0E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AC00E1DA54700D99C3B /* libhugin_algorithms.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_algorithms.a;
+			remoteRef = 57E92ABF0E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AC20E1DA54700D99C3B /* libhugin_app.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libhugin_app.a;
+			remoteRef = 57E92AC10E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		57E92AC40E1DA54700D99C3B /* align_image_stack */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = align_image_stack;
+			remoteRef = 57E92AC30E1DA54700D99C3B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
 		57E3467A0C4A89B0006AA781 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				737ECC810DA56F81003BC9F5 /* autopano in Resources */,
 				73BDB8950DA552EF00027833 /* matchpoint-complete-mac.sh in Resources */,
-				73AFD4790DA42E61002E2F60 /* matchpoint in Resources */,
-				73AFD4720DA42DE7002E2F60 /* autopano-sift-c in Resources */,
-				73AFD4730DA42DFE002E2F60 /* panomatic in Resources */,
-				73BDB8970DA5548400027833 /* AppSettings.plist in Resources */,
 				57E347780C4A9005006AA781 /* Hugin.icns in Resources */,
 				57E347790C4A9005006AA781 /* HuginFiles.icns in Resources */,
 				57E347770C4A9005006AA781 /* autopano-complete-mac.sh in Resources */,
@@ -4423,6 +4732,48 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi";
 		};
+		571D8AC70E212172006D0305 /* Locale Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Locale Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./localised.sh\nfi";
+		};
+		571D8C740E2132DE006D0305 /* Patch XRC */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Patch XRC";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./patch-xrc.sh\nfi";
+		};
+		571D8C8E0E213833006D0305 /* Localise Help */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Localise Help";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./localise-help.sh\nfi";
+		};
 		576902030D24DA9500A6AD01 /* Complete Bundle */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -4467,6 +4818,20 @@
 			shellPath = /bin/sh;
 			shellScript = "cp -r ../src/hugin_config_mac.h ../src/hugin_config.h\n\n";
 		};
+		57D18D4D0E13B82F0054A523 /* update SVN-rev.xcconfig */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "update SVN-rev.xcconfig";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "rm -f \"./SVN-rev.xcconfig\"\n\nif [ $(svnversion -n \"../\") = \"exported\" ]\nthen\n echo \"\" > \"./SVN-rev.xcconfig\"\nelse\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"./SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"./SVN-rev.xcconfig\"\nfi";
+		};
 		57E122110D2BDDBE00743A93 /* configure hugin_version.h */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -4483,14 +4848,14 @@
 			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_WC_REVISION ]\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";
 		};
-		57E347640C4A8F9F006AA781 /* Resourse Script */ = {
+		57E347640C4A8F9F006AA781 /* Locale Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Resourse Script";
+			name = "Locale Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4790,6 +5155,25 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		57D382D50E2369FC00445A37 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D382D60E2369FC00445A37 /* nona.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		57D382F20E236A0800445A37 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				57D382F30E236A0800445A37 /* APImage.cpp in Sources */,
+				57D382F40E236A0800445A37 /* Descriptor.cpp in Sources */,
+				57D382F50E236A0800445A37 /* HessianDetector.cpp in Sources */,
+				57D382F60E236A0800445A37 /* MatchPoint.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		57E122550D2BE4E800743A93 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -4911,91 +5295,11 @@
 			target = 5796FA730C4395CC006B7C6E /* nona dynamic */;
 			targetProxy = 571046840D25F6A1006A3C69 /* PBXContainerItemProxy */;
 		};
-		5737BC390C4CF7BA00A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC380C4CF7BA00A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC3B0C4CF7CE00A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC3A0C4CF7CE00A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC3D0C4CF7D500A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC3C0C4CF7D500A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC3F0C4CF7D800A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC3E0C4CF7D800A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC410C4CF7E500A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC400C4CF7E500A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC430C4CF7EA00A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC420C4CF7EA00A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC450C4CF7ED00A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC440C4CF7ED00A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC470C4CF7F000A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC460C4CF7F000A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC490C4CF7F400A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC480C4CF7F400A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC4B0C4CF80300A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC4A0C4CF80300A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC4D0C4CF80700A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC4C0C4CF80700A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC4F0C4CF80A00A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC4E0C4CF80A00A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC510C4CF80D00A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC500C4CF80D00A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC530C4CF81400A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC520C4CF81400A61778 /* PBXContainerItemProxy */;
-		};
-		5737BC550C4CF81800A61778 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5737BC540C4CF81800A61778 /* PBXContainerItemProxy */;
-		};
 		57525A2E0C54BC8400BF8096 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 57525A240C54BC4400BF8096 /* Nona */;
 			targetProxy = 57525A2D0C54BC8400BF8096 /* PBXContainerItemProxy */;
 		};
-		57525A320C54BCA400BF8096 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 57525A310C54BCA400BF8096 /* PBXContainerItemProxy */;
-		};
 		576900950D24D26200A6AD01 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
@@ -5066,11 +5370,6 @@
 			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
 			targetProxy = 576901E00D24D8A900A6AD01 /* PBXContainerItemProxy */;
 		};
-		5769F6000D23825700A6AD01 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 57C486290C3121E8002D79F1 /* configure */;
-			targetProxy = 5769F6010D23825700A6AD01 /* PBXContainerItemProxy */;
-		};
 		5769F8840D23AAE800A6AD01 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */;
@@ -5120,6 +5419,46 @@
 			isa = PBXTargetDependency;
 			target = 57E3470D0C4A8E95006AA781 /* lib static */;
 			targetProxy = 57AC37590D2BE7660086D348 /* PBXContainerItemProxy */;
+		};
+		57D382CB0E2369D600445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */;
+			targetProxy = 57D382CA0E2369D600445A37 /* PBXContainerItemProxy */;
+		};
+		57D382CD0E2369D600445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7332AE910D8D4986002BF5FF /* matchpoint dynamic */;
+			targetProxy = 57D382CC0E2369D600445A37 /* PBXContainerItemProxy */;
+		};
+		57D382CF0E2369E400445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73C958F40DA2C9DB00E19110 /* tca_correct static */;
+			targetProxy = 57D382CE0E2369E400445A37 /* PBXContainerItemProxy */;
+		};
+		57D382D10E2369FC00445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 57D382D20E2369FC00445A37 /* PBXContainerItemProxy */;
+		};
+		57D382D30E2369FC00445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 57D382D40E2369FC00445A37 /* PBXContainerItemProxy */;
+		};
+		57D383110E236A3600445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57E3470D0C4A8E95006AA781 /* lib static */;
+			targetProxy = 57D383100E236A3600445A37 /* PBXContainerItemProxy */;
+		};
+		57D3832F0E236B6A00445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57D382D00E2369FC00445A37 /* nona static */;
+			targetProxy = 57D3832E0E236B6A00445A37 /* PBXContainerItemProxy */;
+		};
+		57D383310E236B6A00445A37 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 57D382ED0E236A0800445A37 /* matchpoint static */;
+			targetProxy = 57D383300E236B6A00445A37 /* PBXContainerItemProxy */;
 		};
 		57E347130C4A8EB6006AA781 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
@@ -5558,22 +5897,15 @@
 					"$(value)",
 					"$(REPOSITORY_DIR)/lib",
 				);
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				PER_ARCH_CFLAGS_i386 = "-ftree-vectorize";
-				PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4";
-				REPOSITORY_DIR = "$(DEPENDENCY_PREFIX)";
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+				PRECOMP_MACRO = "";
 				SEPARATE_STRIP = YES;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = all;
 				WARNING_CFLAGS = "-Wall";
-				WX_ARCH = "ppc i386";
-				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)";
-				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSOIN)";
-				WX_MAJOR_VERSOIN = 2.8;
+				WX_ARCH = "$(RELEASE_ARCHS_32)";
+				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)";
+				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSION)";
 				ZERO_LINK = NO;
 			};
 			name = Debug;
@@ -5615,22 +5947,14 @@
 					"$(value)",
 					"$(REPOSITORY_DIR)/lib",
 				);
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				PER_ARCH_CFLAGS_i386 = "-march=prescott -mtune=pentium-m -ftree-vectorize";
-				PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4";
 				PRECOMP_MACRO = HUGIN_PRECOMP;
-				REPOSITORY_DIR = "$(DEPENDENCY_PREFIX)";
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
 				SEPARATE_STRIP = YES;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = all;
 				WX_ARCH = "$(RELEASE_ARCHS_32)";
-				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)";
-				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSOIN)";
-				WX_MAJOR_VERSOIN = 2.8;
+				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)";
+				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSION)";
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -6566,7 +6890,7 @@
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
-				DEBUG_MACRO = "DEBUG=1";
+				DEBUG_MACRO = "";
 				DYLIB_COMPATIBILITY_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).0";
 				DYLIB_CURRENT_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)";
 				GCC_CW_ASM_SYNTAX = NO;
@@ -6596,22 +6920,15 @@
 					"$(value)",
 					"$(REPOSITORY_DIR)/lib",
 				);
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				PER_ARCH_CFLAGS_i386 = "-ftree-vectorize";
-				PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4";
-				REPOSITORY_DIR = "$(DEPENDENCY_PREFIX)";
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+				PRECOMP_MACRO = "";
 				SEPARATE_STRIP = YES;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = all;
 				WARNING_CFLAGS = "-Wall";
 				WX_ARCH = "$(NATIVE_ARCH)";
-				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)";
-				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSOIN)";
-				WX_MAJOR_VERSOIN = 2.8;
+				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)";
+				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSION)";
 				ZERO_LINK = NO;
 			};
 			name = Development;
@@ -6740,7 +7057,7 @@
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
-				DEBUG_MACRO = "DEBUG=1";
+				DEBUG_MACRO = "";
 				DYLIB_COMPATIBILITY_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).0";
 				DYLIB_CURRENT_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)";
 				GCC_CW_ASM_SYNTAX = NO;
@@ -6770,20 +7087,15 @@
 					"$(value)",
 					"$(REPOSITORY_DIR)/lib",
 				);
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				REPOSITORY_DIR = "$(DEPENDENCY_PREFIX)";
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+				PRECOMP_MACRO = "";
 				SEPARATE_STRIP = YES;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = all;
 				WARNING_CFLAGS = "-Wall";
 				WX_ARCH = "$(NATIVE_ARCH)";
-				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)";
-				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSOIN)";
-				WX_MAJOR_VERSOIN = 2.8;
+				WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)";
+				WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSION)";
 				ZERO_LINK = YES;
 			};
 			name = "Development ZeroLink";
@@ -7052,6 +7364,191 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				PRODUCT_NAME = "copy hugin_config.h";
 				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		57D382C60E2369D100445A37 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = "tools - other dynamic";
+			};
+			name = Debug;
+		};
+		57D382C70E2369D100445A37 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = "tools - other dynamic";
+			};
+			name = Development;
+		};
+		57D382C80E2369D100445A37 /* Development ZeroLink */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "tools - other dynamic";
+			};
+			name = "Development ZeroLink";
+		};
+		57D382C90E2369D100445A37 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				PRODUCT_NAME = "tools - other dynamic";
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		57D382E70E2369FC00445A37 /* 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_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = nona;
+			};
+			name = Debug;
+		};
+		57D382E80E2369FC00445A37 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_PREFIX_HEADER = ../src/hugin_base/hugin_base.pch;
+				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_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = nona;
+			};
+			name = Development;
+		};
+		57D382E90E2369FC00445A37 /* Development ZeroLink */ = {
+			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_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = nona;
+			};
+			name = "Development ZeroLink";
+		};
+		57D382EA0E2369FC00445A37 /* Release */ = {
+			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_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = nona;
+			};
+			name = Release;
+		};
+		57D383090E236A0800445A37 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				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 = matchpoint;
+			};
+			name = Debug;
+		};
+		57D3830A0E236A0800445A37 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				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 = matchpoint;
+			};
+			name = Development;
+		};
+		57D3830B0E236A0800445A37 /* Development ZeroLink */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				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 = matchpoint;
+			};
+			name = "Development ZeroLink";
+		};
+		57D3830C0E236A0800445A37 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				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 = matchpoint;
 			};
 			name = Release;
 		};
@@ -8087,6 +8584,39 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
+		57D382E60E2369FC00445A37 /* Build configuration list for PBXNativeTarget "nona static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				57D382E70E2369FC00445A37 /* Debug */,
+				57D382E80E2369FC00445A37 /* Development */,
+				57D382E90E2369FC00445A37 /* Development ZeroLink */,
+				57D382EA0E2369FC00445A37 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+		57D383080E236A0800445A37 /* Build configuration list for PBXNativeTarget "matchpoint static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				57D383090E236A0800445A37 /* Debug */,
+				57D3830A0E236A0800445A37 /* Development */,
+				57D3830B0E236A0800445A37 /* Development ZeroLink */,
+				57D3830C0E236A0800445A37 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+		57D3830F0E236A2900445A37 /* Build configuration list for PBXAggregateTarget "tools - other dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				57D382C60E2369D100445A37 /* Debug */,
+				57D382C70E2369D100445A37 /* Development */,
+				57D382C80E2369D100445A37 /* Development ZeroLink */,
+				57D382C90E2369D100445A37 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
 		57E122620D2BE51000743A93 /* Build configuration list for PBXNativeTarget "align_image_stack static" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -8164,7 +8694,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint" */ = {
+		7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint dynamic" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				7332AEAA0D8D4986002BF5FF /* Debug */,

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks