--- a/mac/Hugin.xcodeproj/project.pbxproj
+++ b/mac/Hugin.xcodeproj/project.pbxproj
@@ -143,29 +143,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 */
 
@@ -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;
-			files = (
-				739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */,
-			);
-			name = "Copy libraries";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		73B9576B0EFADC4200CB2012 /* Copy Frameworks */ = {
+			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;
 			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 */
@@ -2696,6 +2755,64 @@
 				57D383200E236AD900445A37 /* libhugin_levmar.a in Frameworks */,
 				57D383210E236AD900445A37 /* libhugin_nona.a in Frameworks */,
 				57D383220E236AD900445A37 /* libhugin_math.a in Frameworks */,
+			);
+			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;
 		};
@@ -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,42 +2931,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		734FB8CE0EB38AB600CD7122 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		739CADA80EC86B30002FD3AF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-			);
-			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 */,
+				57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -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,8 +3761,24 @@
 				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 */ = {
@@ -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 */,
-			);
-			name = PTBatcher;
+				57D50B020F59714100CCDCB5 /* PBXTargetDependency */,
+			);
+			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,33 +5327,8 @@
 			);
 			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;
@@ -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 */,
-			);
-			name = celeste_standalone;
+				57D50B570F5971F600CCDCB5 /* PBXTargetDependency */,
+				57D50B550F5971F600CCDCB5 /* PBXTargetDependency */,
+			);
+			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,6 +5696,110 @@
 			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/copyExifTool.sh\nfi";
 			showEnvVarsInLog = 0;
 		};
+		57D50A5B0F595A6300CCDCB5 /* 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";
+		};
+		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;
+		};
+		57D50A5D0F595A6300CCDCB5 /* 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;
+		};
+		57D50A720F595D0E00CCDCB5 /* 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";
+		};
+		57D50A940F59631C00CCDCB5 /* 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";
+		};
+		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;
+			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";
+		};
 		57E347640C4A8F9F006AA781 /* Locale Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -5658,93 +5860,6 @@
 			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";
-		};
-		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 */
 
@@ -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;
-			target = 5769FC280D24A26400A6AD01 /* frameworks */;
-			targetProxy = 73C3C93C0ECCB3EB00A3089A /* PBXContainerItemProxy */;
-		};
 		73C958F50DA2C9DB00E19110 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 57E3470D0C4A8E95006AA781 /* lib static */;
@@ -6582,11 +6740,6 @@
 			isa = PBXTargetDependency;
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 73E79F340D674EF400C07126 /* PBXContainerItemProxy */;
-		};
-		73F800130F2CABCA00C22CB9 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */;
-			targetProxy = 73F800120F2CABCA00C22CB9 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -7956,64 +8109,7 @@
 			};
 			name = Release;
 		};
-		57E122630D2BE51000743A93 /* 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_1)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
-				PRODUCT_NAME = align_image_stack;
-			};
-			name = Debug;
-		};
-		57E122640D2BE51000743A93 /* 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_1)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
-				PRODUCT_NAME = align_image_stack;
-			};
-			name = Development;
-		};
-		57E122660D2BE51000743A93 /* 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)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
-				PRODUCT_NAME = align_image_stack;
-			};
-			name = Release;
-		};
-		57E346D30C4A8A2E006AA781 /* Debug */ = {
+		57D50A5F0F595A6300CCDCB5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(WX_ARCH)";
@@ -8036,20 +8132,16 @@
 					"$(WX_INCLUDE_DIR_LIB)",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "../mac/Hugin-Info.plist";
+				INFOPLIST_FILE = "PTBatcherGUI-Info.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_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
-				PRODUCT_NAME = Hugin;
+				);
+				PRODUCT_NAME = PTBatcherGUI;
 			};
 			name = Debug;
 		};
-		57E346D40C4A8A2E006AA781 /* Development */ = {
+		57D50A600F595A6300CCDCB5 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(WX_ARCH)";
@@ -8072,20 +8164,204 @@
 					"$(WX_INCLUDE_DIR_LIB)",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "../mac/Hugin-Info.plist";
+				INFOPLIST_FILE = "PTBatcherGUI-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				PRODUCT_NAME = PTBatcherGUI;
+			};
+			name = Development;
+		};
+		57D50A610F595A6300CCDCB5 /* 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/hugin_base,
+					../src/foreign/vigra,
+					../src/foreign,
+					../src/hugin1,
+					"$(WX_INCLUDE_DIR)",
+					"$(WX_INCLUDE_DIR_LIB)",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "PTBatcherGUI-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				PRODUCT_NAME = PTBatcherGUI;
+			};
+			name = Release;
+		};
+		57D50AD80F596DB700CCDCB5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				PRODUCT_NAME = celeste;
+			};
+			name = Debug;
+		};
+		57D50AD90F596DB700CCDCB5 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				PRODUCT_NAME = celeste;
+			};
+			name = Development;
+		};
+		57D50ADA0F596DB700CCDCB5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				PRODUCT_NAME = celeste;
+			};
+			name = Release;
+		};
+		57D50B4F0F5971A600CCDCB5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					/usr/include,
+					"$(REPOSITORY_DIR)/include",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+					../src/foreign/vigra,
+					../src/celeste,
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
-				PRODUCT_NAME = Hugin;
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = celeste;
+			};
+			name = Debug;
+		};
+		57D50B500F5971A600CCDCB5 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					/usr/include,
+					"$(REPOSITORY_DIR)/include",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+					../src/foreign/vigra,
+					../src/celeste,
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = celeste;
 			};
 			name = Development;
 		};
-		57E346D60C4A8A2E006AA781 /* Release */ = {
+		57D50B510F5971A600CCDCB5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					/usr/include,
+					"$(REPOSITORY_DIR)/include",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+					../src/foreign/vigra,
+					../src/celeste,
+				);
+				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)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = celeste;
+			};
+			name = Release;
+		};
+		57E122630D2BE51000743A93 /* 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_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = align_image_stack;
+			};
+			name = Debug;
+		};
+		57E122640D2BE51000743A93 /* 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_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = align_image_stack;
+			};
+			name = Development;
+		};
+		57E122660D2BE51000743A93 /* 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)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				PRODUCT_NAME = align_image_stack;
+			};
+			name = Release;
+		};
+		57E346D30C4A8A2E006AA781 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(WX_ARCH)";
@@ -8113,11 +8389,79 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				PRODUCT_NAME = Hugin;
+			};
+			name = Debug;
+		};
+		57E346D40C4A8A2E006AA781 /* 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 = "../mac/Hugin-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				PRODUCT_NAME = Hugin;
+			};
+			name = Development;
+		};
+		57E346D60C4A8A2E006AA781 /* 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 = "../mac/Hugin-Info.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 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = Hugin;
 			};
@@ -8420,89 +8764,11 @@
 			};
 			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 = {
-				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;
-				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;
-			};
-			name = Debug;
-		};
-		734BDF5E0EB8EC1A007EBA09 /* 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;
-				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;
-			};
-			name = Development;
-		};
-		734BDF5F0EB8EC1A007EBA09 /* 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 = "";
+				ARCHS = "$(WX_ARCH)";
+				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					WX_PRECOMP,
@@ -8513,280 +8779,32 @@
 				);
 				HEADER_SEARCH_PATHS = (
 					../src/PTBatcher,
-					../src/hugin1/base_wx,
+					../src/hugin1,
 					../src/foreign/vigra,
 					../src/foreign/vigra/vigra,
-					../src/hugin_base/vigra_ext,
-					../src/hugin_base/panodata,
+					../src/hugin_base,
 					"$(REPOSITORY_DIR)/include",
 					"$(inherited)",
 					"$(WX_INCLUDE_DIR)",
 					"$(WX_INCLUDE_DIR_LIB)",
 					"$(REPOSITORY_DIR)/include/OpenEXR",
 				);
-				INSTALL_PATH = /usr/local/bin;
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				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;
+				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 = PTBatcher;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		734FB8D10EB38AB700CD7122 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /usr/local/lib;
-				PREBINDING = NO;
-				PRODUCT_NAME = celeste;
 			};
 			name = Debug;
 		};
-		734FB8D20EB38AB700CD7122 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /usr/local/lib;
-				PREBINDING = NO;
-				PRODUCT_NAME = celeste;
-			};
-			name = Development;
-		};
-		734FB8D30EB38AB700CD7122 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DYLIB_COMPATIBILITY_VERSION = 0.0;
-				DYLIB_CURRENT_VERSION = 0.0;
-				EXECUTABLE_PREFIX = lib;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_MODEL_TUNING = "";
-				HEADER_SEARCH_PATHS = (
-					../src/foreign,
-					../src/foreign/vigra,
-					../src/hugin_base,
-					"$(REPOSITORY_DIR)/include",
-					/usr/include,
-					"$(inherited)",
-				);
-				INSTALL_PATH = "@executable_path/../Libraries";
-				LIBRARY_SEARCH_PATHS = (
-					/usr/lib,
-					"$(value)",
-				);
-				MACOSX_DEPLOYMENT_TARGET = "";
-				OTHER_LDFLAGS = (
-					"-flat_namespace",
-					"-undefined",
-					suppress,
-				);
-				PREBINDING = NO;
-				PRIVATE_HEADERS_FOLDER_PATH = "";
-				PRODUCT_NAME = celeste;
-				PUBLIC_HEADERS_FOLDER_PATH = "";
-				USER_HEADER_SEARCH_PATHS = "$(inherited)";
-				ZERO_LINK = NO;
-			};
-			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 = "";
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
-				HEADER_SEARCH_PATHS = (
-					../src/foreign,
-					../src/foreign/vigra,
-					../src/foreign/vigra/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)";
-				LIBRARY_SEARCH_PATHS = (
-					/usr/lib,
-					"$(value)",
-					"$(REPOSITORY_DIR)/lib",
-				);
-				OTHER_LDFLAGS = (
-					"-flat_namespace",
-					"-framework",
-					Carbon,
-					"-undefined",
-					suppress,
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = celeste;
-				USER_HEADER_SEARCH_PATHS = "$(inherited)";
-				ZERO_LINK = NO;
-			};
-			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;
+		734BDF5E0EB8EC1A007EBA09 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
 				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,
@@ -8796,19 +8814,17 @@
 					NO_GCC_PRAGMA,
 				);
 				HEADER_SEARCH_PATHS = (
-					../src,
+					../src/PTBatcher,
+					../src/hugin1,
+					../src/foreign/vigra,
+					../src/foreign/vigra/vigra,
 					../src/hugin_base,
-					../src/foreign,
-					../src/foreign/vigra,
-					../src/celeste,
 					"$(REPOSITORY_DIR)/include",
-					"$(REPOSITORY_DIR)/include/OpenEXR",
+					"$(inherited)",
 					"$(WX_INCLUDE_DIR)",
 					"$(WX_INCLUDE_DIR_LIB)",
-					../src/hugin1,
-				);
-				INFOPLIST_FILE = "../mac/PTBatcherGUI-Info.plist";
-				INSTALL_PATH = "";
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -8816,35 +8832,99 @@
 				);
 				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;
+				PRODUCT_NAME = PTBatcher;
+			};
+			name = Development;
+		};
+		734BDF5F0EB8EC1A007EBA09 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(WX_ARCH)";
+				DEPLOYMENT_POSTPROCESSING = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					WX_PRECOMP,
+					__WXMAC__,
+					"_FILE_OFFSET_BITS=64",
+					_LARGE_FILES,
+					NO_GCC_PRAGMA,
+				);
+				HEADER_SEARCH_PATHS = (
+					../src/PTBatcher,
+					../src/hugin1,
+					../src/foreign/vigra,
+					../src/foreign/vigra/vigra,
+					../src/hugin_base,
+					"$(REPOSITORY_DIR)/include",
+					"$(inherited)",
+					"$(WX_INCLUDE_DIR)",
+					"$(WX_INCLUDE_DIR_LIB)",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				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\"";
+				PRODUCT_NAME = PTBatcher;
 			};
 			name = Release;
 		};
-		73C959100DA2C9DB00E19110 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
+		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 = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -8947,55 +9027,6 @@
 		73EBC0920EC9E0B30068B821 /* 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;
-				INSTALL_PATH = /usr/local/bin;
-				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-static\"";
-				PREBINDING = NO;
-				PRODUCT_NAME = celeste_standalone;
-			};
-			name = Debug;
-		};
-		73EBC0930EC9E0B30068B821 /* 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;
-				INSTALL_PATH = /usr/local/bin;
-				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-static\"";
-				PREBINDING = NO;
-				PRODUCT_NAME = celeste_standalone;
-			};
-			name = Development;
-		};
-		73EBC0940EC9E0B30068B821 /* 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 = "";
 				HEADER_SEARCH_PATHS = (
 					/usr/include,
 					"$(REPOSITORY_DIR)/include",
@@ -9003,53 +9034,56 @@
 					../src/foreign/vigra,
 					../src/celeste,
 				);
-				INSTALL_PATH = "";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = celeste;
+			};
+			name = Debug;
+		};
+		73EBC0930EC9E0B30068B821 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					/usr/include,
+					"$(REPOSITORY_DIR)/include",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+					../src/foreign/vigra,
+					../src/celeste,
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				PRODUCT_NAME = celeste;
+			};
+			name = Development;
+		};
+		73EBC0940EC9E0B30068B821 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					/usr/include,
+					"$(REPOSITORY_DIR)/include",
+					"$(REPOSITORY_DIR)/include/OpenEXR",
+					../src/foreign/vigra,
+					../src/celeste,
+				);
 				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)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
-				OTHER_LDFLAGS = (
-					"-flat_namespace",
-					"-undefined",
-					suppress,
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = celeste_standalone;
-				ZERO_LINK = NO;
-			};
-			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;
+				PRODUCT_NAME = celeste;
 			};
 			name = Release;
 		};
@@ -9346,6 +9380,36 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		57D50A5E0F595A6300CCDCB5 /* Build configuration list for PBXNativeTarget "PTBatcherGUI" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				57D50A5F0F595A6300CCDCB5 /* Debug */,
+				57D50A600F595A6300CCDCB5 /* Development */,
+				57D50A610F595A6300CCDCB5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		57D50AD70F596DB700CCDCB5 /* Build configuration list for PBXNativeTarget "celeste" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				57D50AD80F596DB700CCDCB5 /* Debug */,
+				57D50AD90F596DB700CCDCB5 /* Development */,
+				57D50ADA0F596DB700CCDCB5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		57D50B4E0F5971A600CCDCB5 /* Build configuration list for PBXNativeTarget "celeste static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				57D50B4F0F5971A600CCDCB5 /* Debug */,
+				57D50B500F5971A600CCDCB5 /* Development */,
+				57D50B510F5971A600CCDCB5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		57E122620D2BE51000743A93 /* Build configuration list for PBXNativeTarget "align_image_stack static" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -9456,32 +9520,12 @@
 			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" */ = {
+		734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher dynamic" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				734BDF5D0EB8EC1A007EBA09 /* Debug */,
 				734BDF5E0EB8EC1A007EBA09 /* Development */,
 				734BDF5F0EB8EC1A007EBA09 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		734FB8D40EB38B0300CD7122 /* Build configuration list for PBXNativeTarget "celeste" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				734FB8D10EB38AB700CD7122 /* Debug */,
-				734FB8D20EB38AB700CD7122 /* Development */,
-				734FB8D30EB38AB700CD7122 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -9496,16 +9540,6 @@
 			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 = (
@@ -9526,7 +9560,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		73EBC0970EC9E0D70068B821 /* Build configuration list for PBXNativeTarget "celeste_standalone" */ = {
+		73EBC0970EC9E0D70068B821 /* Build configuration list for PBXNativeTarget "celeste dynamic" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				73EBC0920EC9E0B30068B821 /* Debug */,
@@ -9536,16 +9570,6 @@
 			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 */;