From: <ip...@us...> - 2008-08-20 04:51:53
|
Revision: 3339 http://hugin.svn.sourceforge.net/hugin/?rev=3339&view=rev Author: ippei Date: 2008-08-20 04:51:50 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Mac: build update, now minimum 10.4+G3, 10.3 build still does not work. Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-08-20 04:23:27 UTC (rev 3338) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-08-20 04:51:50 UTC (rev 3339) @@ -21,7 +21,7 @@ MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5 // special optimization -PER_ARCH_CFLAGS_ppc = -mcpu=G4 -mtune=G4 -ftree-vectorize +PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4 PER_ARCH_CFLAGS_i386 = -march=prescott -mtune=pentium-m -ftree-vectorize PER_ARCH_CFLAGS_ppc64 = -mcpu=G5 -mtune=G5 -ftree-vectorize PER_ARCH_CFLAGS_x86_64 = -march=nocona -mtune=generic -ftree-vectorize Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2008-08-20 04:23:27 UTC (rev 3338) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2008-08-20 04:51:50 UTC (rev 3339) @@ -20,7 +20,7 @@ ppcTARGET="powerpc-apple-darwin8" \ ppcOSVERSION="10.4" \ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - ppcOPTIMIZE="-mcpu=G4 -mtune=G4 -ftree-vectorize" \ + ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ \ i386TARGET="i386-apple-darwin8" \ i386OSVERSION="10.4" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2008-08-20 04:23:27 UTC (rev 3338) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2008-08-20 04:51:50 UTC (rev 3339) @@ -20,7 +20,7 @@ ppcTARGET="powerpc-apple-darwin8" \ ppcOSVERSION="10.4" \ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - ppcOPTIMIZE="-mcpu=G4 -mtune=G4 -ftree-vectorize" \ + ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ \ i386TARGET="i386-apple-darwin8" \ i386OSVERSION="10.4" \ Modified: hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2008-08-20 04:23:27 UTC (rev 3338) +++ hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2008-08-20 04:51:50 UTC (rev 3339) @@ -65,8 +65,8 @@ ARCHARGs="$x64ONLYARG" fi - env CFLAGS="-gfull -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-gfull -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I$REPOSITORYDIR/include" \ LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ NEXT_ROOT="$MACSDKDIR" \ Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-20 04:23:27 UTC (rev 3338) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-20 04:51:50 UTC (rev 3339) @@ -582,6 +582,7 @@ 576EDDAC0C3FFF820076A417 /* PTOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA60C3FFF820076A417 /* PTOptimizer.h */; }; 576EDDAD0C3FFF820076A417 /* PhotometricOptimizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA70C3FFF820076A417 /* PhotometricOptimizer.cpp */; }; 576EDDAE0C3FFF820076A417 /* PhotometricOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA80C3FFF820076A417 /* PhotometricOptimizer.h */; }; + 57701A7C0E5B038100E5026B /* autopano-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 57701A750E5B036A00E5026B /* autopano-complete-mac.sh */; }; 5771F4DD0C2FEE0900736343 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DA0C2FEE0900736343 /* exif.cpp */; }; 5771F4DE0C2FEE0900736343 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DC0C2FEE0900736343 /* jpgfile.cpp */; }; 5771F5EF0C3007F300736343 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F5EC0C3007F300736343 /* utils.cpp */; }; @@ -780,7 +781,6 @@ 57E346EC0C4A8AC2006AA781 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; 57E346ED0C4A8AC2006AA781 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; 57E346EE0C4A8AC2006AA781 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; - 57E347770C4A9005006AA781 /* autopano-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */; }; 57E347780C4A9005006AA781 /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 57114EA006BC2301004F4FA7 /* Hugin.icns */; }; 57E347790C4A9005006AA781 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5702996D07F967CB00F1FF15 /* HuginFiles.icns */; }; 57E34AAA0C4ACBD6006AA781 /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331120C4A8859006AA781 /* CommandHistory.cpp */; }; @@ -821,7 +821,6 @@ 7332AEC00D8D4C45002BF5FF /* APImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE560D8D491B002BF5FF /* APImage.cpp */; }; 7332AEC30D8D4C45002BF5FF /* Descriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE790D8D491B002BF5FF /* Descriptor.cpp */; }; 7332AEC40D8D4C45002BF5FF /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; }; - 73BDB8950DA552EF00027833 /* matchpoint-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */; }; 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 */; }; @@ -1622,7 +1621,7 @@ 5749FA9B067B80F000A6EDD4 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = "<group>"; }; 574B81B40E41996700644179 /* LICENCE_JHEAD */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENCE_JHEAD; sourceTree = "<group>"; }; 574B81B50E41996700644179 /* LICENCE_VIGRA */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENCE_VIGRA; sourceTree = "<group>"; }; - 574B81B60E41997700644179 /* README_JP */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README_JP; sourceTree = "<group>"; }; + 574B81B60E41997700644179 /* README_JP */ = {isa = PBXFileReference; fileEncoding = 2147486209; lastKnownFileType = text; path = README_JP; sourceTree = "<group>"; }; 574B81B90E41999300644179 /* platforms */ = {isa = PBXFileReference; lastKnownFileType = folder; path = platforms; sourceTree = "<group>"; }; 57525A250C54BC4400BF8096 /* Nona.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nona.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57565A3F0D088CFD00344F55 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; }; @@ -1710,6 +1709,7 @@ 576EDDA60C3FFF820076A417 /* PTOptimizer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTOptimizer.h; sourceTree = "<group>"; }; 576EDDA70C3FFF820076A417 /* PhotometricOptimizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PhotometricOptimizer.cpp; sourceTree = "<group>"; }; 576EDDA80C3FFF820076A417 /* PhotometricOptimizer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PhotometricOptimizer.h; sourceTree = "<group>"; }; + 57701A750E5B036A00E5026B /* autopano-complete-mac.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "autopano-complete-mac.sh"; path = "../../hugin-0.6.1/mac/autopano-complete-mac.sh"; sourceTree = SOURCE_ROOT; }; 577092FA06BD7388004058A1 /* libpng.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng.dylib; path = lib/libpng.dylib; sourceTree = "<group>"; }; 577092FB06BD7388004058A1 /* libtiff.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtiff.dylib; path = lib/libtiff.dylib; sourceTree = "<group>"; }; 5771F4D90C2FEE0900736343 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; @@ -1796,7 +1796,6 @@ 57A2BC2E0D45422800E9FFEC /* copyExifTool.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = copyExifTool.sh; sourceTree = "<group>"; }; 57A686960D5677F900F215C4 /* RunStitchPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RunStitchPanel.cpp; sourceTree = "<group>"; }; 57A686970D5677F900F215C4 /* RunStitchPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RunStitchPanel.h; sourceTree = "<group>"; }; - 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "autopano-complete-mac.sh"; sourceTree = "<group>"; }; 57AB3D760E1E976300EFD03F /* BuildConfig.xcconfig.orig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BuildConfig.xcconfig.orig; sourceTree = "<group>"; }; 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Panorama.cpp; sourceTree = "<group>"; }; 57B88E5E0C36CD7E00EC6519 /* Panorama.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Panorama.h; sourceTree = "<group>"; }; @@ -1951,7 +1950,7 @@ 57E34A5C0C4ACAA1006AA781 /* libhugin_wxbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_wxbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57E34AB20C4ACC04006AA781 /* CPFineTuneFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPFineTuneFrame.cpp; sourceTree = "<group>"; }; 57E34AB30C4ACC04006AA781 /* CPFineTuneFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPFineTuneFrame.h; sourceTree = "<group>"; }; - 57E34ACC0C4ACE46006AA781 /* math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; }; + 57E34ACC0C4ACE46006AA781 /* math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = math.h; path = /usr/include/math.h; sourceTree = "<absolute>"; }; 57E92A8C0E1DA35A00D99C3B /* align_image_stack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = align_image_stack.xcodeproj; path = "/Users/ippei/dev/hugin/hugin-svn/mac/align_image_stack.xcodeproj"; sourceTree = "<absolute>"; }; 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_algorithms.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57EA83A00C3A7AA900E4965E /* PanoramaAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PanoramaAlgorithm.h; path = algorithm/PanoramaAlgorithm.h; sourceTree = "<group>"; }; @@ -2013,7 +2012,6 @@ 7332AE8F0D8D491C002BF5FF /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; 7332AEAE0D8D4986002BF5FF /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; - 73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "matchpoint-complete-mac.sh"; sourceTree = "<group>"; }; 73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; 73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -2468,8 +2466,6 @@ 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */, 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */, 5769F6320D23825700A6AD01 /* hugin_stitch_project-Info.plist */, - 73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */, - 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */, 57114EA006BC2301004F4FA7 /* Hugin.icns */, 5702996D07F967CB00F1FF15 /* HuginFiles.icns */, 57B8C693083AB7F400283C06 /* localised.sh */, @@ -2483,6 +2479,7 @@ 576900800D24D14500A6AD01 /* vigra_impex-Info.plist */, 576900AB0D24D29300A6AD01 /* hugin_base-Info.plist */, 576900E20D24D32C00A6AD01 /* base_wx-Info.plist */, + 57701A750E5B036A00E5026B /* autopano-complete-mac.sh */, ); path = mac; sourceTree = "<group>"; @@ -3397,7 +3394,7 @@ 57E34ACC0C4ACE46006AA781 /* math.h */, ); name = math.h; - path = /Developer/SDKs/MacOSX10.4u.sdk/usr/include; + path = /; sourceTree = "<absolute>"; }; 57E92A980E1DA54700D99C3B /* Products */ = { @@ -4670,11 +4667,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 73BDB8950DA552EF00027833 /* matchpoint-complete-mac.sh in Resources */, 57E347780C4A9005006AA781 /* Hugin.icns in Resources */, 57E347790C4A9005006AA781 /* HuginFiles.icns in Resources */, - 57E347770C4A9005006AA781 /* autopano-complete-mac.sh in Resources */, 5769F8940D23AB7300A6AD01 /* HuginStitchProject.app in Resources */, + 57701A7C0E5B038100E5026B /* autopano-complete-mac.sh in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6885,7 +6881,7 @@ ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; - DEBUG_MACRO = ""; + DEBUG_MACRO = "DEBUG=1"; DYLIB_COMPATIBILITY_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).0"; DYLIB_CURRENT_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)"; GCC_CW_ASM_SYNTAX = NO; @@ -6923,7 +6919,7 @@ STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; WARNING_CFLAGS = "-Wall"; - WX_ARCH = "$(NATIVE_ARCH)"; + WX_ARCH = "$(RELEASE_ARCHS_32)"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)"; WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSION)"; ZERO_LINK = NO; @@ -7054,7 +7050,7 @@ ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; - DEBUG_MACRO = ""; + DEBUG_MACRO = "DEBUG=1"; DYLIB_COMPATIBILITY_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).0"; DYLIB_CURRENT_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)"; GCC_CW_ASM_SYNTAX = NO; @@ -7092,7 +7088,7 @@ STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; WARNING_CFLAGS = "-Wall"; - WX_ARCH = "$(NATIVE_ARCH)"; + WX_ARCH = "$(RELEASE_ARCHS_32)"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)"; WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSION)"; ZERO_LINK = YES; @@ -7656,7 +7652,6 @@ "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Hugin; }; name = Debug; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-08-22 06:20:37
|
Revision: 3348 http://hugin.svn.sourceforge.net/hugin/?rev=3348&view=rev Author: ippei Date: 2008-08-22 06:20:35 +0000 (Fri, 22 Aug 2008) Log Message: ----------- Mac: plugin architecture finish up Modified Paths: -------------- hugin/trunk/mac/Hugin-Info.plist Added Paths: ----------- hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript Modified: hugin/trunk/mac/Hugin-Info.plist =================================================================== --- hugin/trunk/mac/Hugin-Info.plist 2008-08-21 15:16:20 UTC (rev 3347) +++ hugin/trunk/mac/Hugin-Info.plist 2008-08-22 06:20:35 UTC (rev 3348) @@ -24,6 +24,18 @@ <key>LSTypeIsPackage</key> <false/> </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>huginAutoCP</string> + </array> + <key>CFBundleTypeName</key> + <string>Hugin Automatic Control-point Detection plugin</string> + <key>CFBundleTypeRole</key> + <string>None</string> + <key>LSTypeIsPackage</key> + <true/> + </dict> </array> <key>CFBundleExecutable</key> <string>Hugin</string> Added: hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript =================================================================== --- hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript (rev 0) +++ hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript 2008-08-22 06:20:35 UTC (rev 3348) @@ -0,0 +1,23 @@ +to open the droppedFiles + repeat with eachFile in droppedFiles + installAutoCP(eachFile) + end repeat +end open + +installAutoCP(choose file with prompt "Choose AutoCP plugin for Hugin" of type {"BNDL", "????"} without invisibles) + +to installAutoCP(theFile) + tell application "Finder" to set theExtension to the name extension of theFile + if theExtension is not equal to "huginAutoCP" then + display alert "Wrong file type" message \xC2 + "The file extension ." & theExtension & " indicates this file is not an AutoCP plugin for Hugin." buttons {"Quit"} as critical + quit + end if + + set theDestination to (the path to application support from user domain as text) & "Hugin:Autopano:" + tell application "Finder" + if not (exists theDestination) then do shell script "mkdir -p \"" & (POSIX path of theDestination) & "\"" + if (exists (theDestination & the name of theFile)) then delete (theDestination & the name of theFile) + duplicate theFile to theDestination + end tell +end installAutoCP \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-08-24 10:18:09
|
Revision: 3358 http://hugin.svn.sourceforge.net/hugin/?rev=3358&view=rev Author: ippei Date: 2008-08-24 10:18:06 +0000 (Sun, 24 Aug 2008) Log Message: ----------- Mac: script now runs on Tiger as well; made sure it opens in UTF-16 in Xcode Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-24 04:29:55 UTC (rev 3357) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-24 10:18:06 UTC (rev 3358) @@ -891,7 +891,7 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781; remoteInfo = "lib static"; }; 576900940D24D26200A6AD01 /* PBXContainerItemProxy */ = { @@ -1602,7 +1602,7 @@ 57565A790D088F2E00344F55 /* ComputeImageROI.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ComputeImageROI.cpp; path = algorithms/nona/ComputeImageROI.cpp; sourceTree = "<group>"; }; 57565A7A0D088F2E00344F55 /* ComputeImageROI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ComputeImageROI.h; path = algorithms/nona/ComputeImageROI.h; sourceTree = "<group>"; }; 575670980D089B1F00344F55 /* hugin_stitch_project.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hugin_stitch_project.cpp; sourceTree = "<group>"; }; - 5758E0FB0E5F1091001E74F2 /* PutAutoCPtoApplicationSupport.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = PutAutoCPtoApplicationSupport.applescript; sourceTree = "<group>"; }; + 5758E0FB0E5F1091001E74F2 /* PutAutoCPtoApplicationSupport.applescript */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = sourcecode.applescript; path = PutAutoCPtoApplicationSupport.applescript; sourceTree = "<group>"; }; 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_appbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5759D9B50C3271640043F754 /* Command.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Command.h; sourceTree = "<group>"; }; 5759D9B60C3271640043F754 /* CommandHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CommandHistory.h; sourceTree = "<group>"; }; Modified: hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript =================================================================== --- hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript 2008-08-24 04:29:55 UTC (rev 3357) +++ hugin/trunk/mac/PutAutoCPtoApplicationSupport.applescript 2008-08-24 10:18:06 UTC (rev 3358) @@ -1,5 +1,10 @@ -\xFF\xFE - |
From: <har...@us...> - 2008-08-28 13:45:19
|
Revision: 3369 http://hugin.svn.sourceforge.net/hugin/?rev=3369&view=rev Author: harryvanderwolf Date: 2008-08-28 13:45:15 +0000 (Thu, 28 Aug 2008) Log Message: ----------- move scripted build directory to mac development directory instead of mac platform tools Added Paths: ----------- hugin/trunk/mac/scripted_universal_build/ hugin/trunk/mac/scripted_universal_build/00-Readme.txt hugin/trunk/mac/scripted_universal_build/01-Compile_hugin.sh hugin/trunk/mac/scripted_universal_build/02-Make_bundle.sh hugin/trunk/mac/scripted_universal_build/03-localise-bundle.sh hugin/trunk/mac/scripted_universal_build/04-create_dmg_gz.sh hugin/trunk/mac/scripted_universal_build/bundle_constants.txt hugin/trunk/mac/scripted_universal_build/hugin_config.h Added: hugin/trunk/mac/scripted_universal_build/00-Readme.txt =================================================================== --- hugin/trunk/mac/scripted_universal_build/00-Readme.txt (rev 0) +++ hugin/trunk/mac/scripted_universal_build/00-Readme.txt 2008-08-28 13:45:15 UTC (rev 3369) @@ -0,0 +1,50 @@ +BUILDING A UNIVERSAL HUGIN BUNDLE WITH SCRIPTS + +*** +This is in alpha stage. +*** + +INTRODUCTION +Until now the way to build a Universal Hugin bundle was to do it via Xcode. +Recently Ippei Ukai, the creator of the XCode project, udapted the XCode project +with functionality that is not suported on tiger (at least it seams like that). +Leopard uses XCode 3.0, whereas Tiger uses 2.5 (or 2.4.1). Apple said that +as long as you did not use the extra functionality of 3.0, the XCode projects +are backwards compatible. This is not true however for the Hugin project. +That's why I built a scripted version. + +PREREQUISITES +1. You need to have XCode installed +2. You need to have cmake installed +3. You need to have subversion (SVN) installed +4. You need to have built the dependent libraries and binaries + with the scripts in the <hugin_trunk>/mac/ExternalPrograms directory. +5. You need to have a correct SetEnv-universal.txt available (which is a + prerequisite for 4 anyway) and you need to have a configured + bundle_constants.txt (in this directory). + +HOWTO BUILD A UNIVERSAL HUGIN BUNDLE +1. Build all libraries and binaries from <hugin_trunk>/mac/ExternalPrograms. + +2. Compile Hugin + cd into the hugin main source directory. From that directory you need to + run the script: ./mac/scripted_universal_build/01-Compile_hugin.sh + Wait till it's finished (and that will take quite some time). + +3. Build Universal portable bundle + Cd into the mac/scripted_universal_build directory and issue the + command: ./02-Make_bundle.sh + +4. Add localisation and help to the bundle. + From the mac/scripted_universal_build directory issue the + command: ./03-localise-bundle.sh + + After this step you have a fully portable Hugin bundle. + +5. Make archive for upload + From the mac/scripted_universal_build directory issue the + command: ./04-create_dmg_tgz.sh + +This will finish it up. Share your bundle with the community. + + Added: hugin/trunk/mac/scripted_universal_build/01-Compile_hugin.sh =================================================================== --- hugin/trunk/mac/scripted_universal_build/01-Compile_hugin.sh (rev 0) +++ hugin/trunk/mac/scripted_universal_build/01-Compile_hugin.sh 2008-08-28 13:45:15 UTC (rev 3369) @@ -0,0 +1,281 @@ +# -------------------- +# Hugin 0.7.0 +# -------------------- +# $Id: 01-compile_hugin.sh 1905 2007-02-05 00:11:26Z ippei $ +# script skeleton by Ippei Ukai +# cmake part Harry van der Wolf + +# NOTE: This script needs to be run from the hugin source directory + +# prepare +source ./mac/ExternalPrograms/scripts/SetEnv-universal.txt; + +# export ="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +HUGINVER_FULL="0.0" + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppc64MACSDKDIR + ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" + fi + + mkdir -p $ARCH; + cd $ARCH; + rm CMakeCache.txt; + + # We do not want any interruption from pkg-configs, wx-configs and so on + # from MacPorts or Fink, who's paths were added to the PATH + #export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$REPOSITORYDIR/bin + + # If you are on Tiger and you have dowloaded the binary subversion from + # Martin Ott's webpage, you also need to add /usr/local/bin + # In that case uncomment the line below and outcomment the above PATH statement + export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:$REPOSITORYDIR/bin + +# export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH:$REPOSITORYDIR/lib/wx/include/mac-unicode-release-2.8"; + + export PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig"; + +cmake \ + -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_INSTALL_PREFIX="$REPOSITORYDIR/arch/$ARCH" \ + -DCMAKE_OSX_ARCHITECTURES="$TARGET" \ + -DCMAKE_OSX_SYSROOT="$MACSDKDIR"\ + -DCMAKE_C_FLAGS="-arch $ARCH -O2 -dead_strip -I/usr/include -I$REPOSITORYDIR/include" \ + -DCMAKE_CXX_FLAGS="-arch $ARCH -O2 -dead_strip -I/usr/include -I$REPOSITORYDIR/include" \ + -DCMAKE_LDFLAGS="-L/usr/lib -L$REPOSITORYDIR/lib -dead_strip -prebind -liconv" \ + -DEXIV2_INCLUDE_DIR=$REPOSITORYDIR/include \ + -DEXIV2_LIBRARIES=$REPOSITORYDIR/lib/libexiv2.dylib \ + -DOPENEXR_INCLUDE_DIR=$REPOSITORYDIR/include/OpenEXR \ + ..; + +# -DCMAKE_C_FLAGS="-arch $ARCH -O2 -dead_strip -I/usr/include -I$REPOSITORYDIR/include -I$REPOSITORYDIR/lib/wx/include/mac-unicode-release-2.8" \ +# -DCMAKE_CXX_FLAGS="-arch $ARCH -O2 -dead_strip -I/usr/include -I$REPOSITORYDIR/include -I$REPOSITORYDIR/lib/wx/include/mac-unicode-release-2.8" \ + + + + # patch hugin_config.h + cp "../platforms/mac/scripted_universal_build/hugin_config.h" "src/hugin_config.h" + + make; + make install; + + cd .. + +done + +# Correct install_names in Hugin and HuginStitchProject binaries +for ARCH in $ARCHS +do + echo "$ARCH" + bins="$REPOSITORYDIR/arch/$ARCH/Application/Hugin.app/Contents/MacOS/Hugin $REPOSITORYDIR/arch/$ARCH/Application/HuginStitchProject.app/Contents/MacOS/HuginStitchProject" + for exec_file in $bins + do + lib_path="`otool -L $exec_file 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $ARCH`" + for lib in $lib_path + do + echo $lib + libbase="`echo $lib | sed -e 's/ (.*$//' -e 's/^.*\///'`" + echo " Changing install name for: $libbase" + install_name_tool -change "$lib" "$REPOSITORYDIR/lib/$libbase" $exec_file + done + done +done + +# Correct install_names in nona, hugin_hdrmerge and pto2mk binaries +for ARCH in $ARCHS +do + echo "$ARCH" + bins="$REPOSITORYDIR/arch/$ARCH/bin/nona $REPOSITORYDIR/arch/$ARCH/bin/hugin_hdrmerge $REPOSITORYDIR/arch/$ARCH/bin/pto2mk" + for exec_file in $bins + do + lib_path="`otool -L $exec_file 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep libhugin`" + for lib in $lib_path + do + echo $lib + libbase="`echo $lib | sed -e 's/ (.*$//' -e 's/^.*\///'`" + echo " Changing install name for: $libbase" + install_name_tool -change "$lib" "$REPOSITORYDIR/lib/$libbase" $exec_file + done + done +done + +# merge execs +echo "merge executables from Hugin" + +for program in bin/vig_optimize bin/tca_correct bin/pto2mk bin/nona bin/fulla bin/autooptimiser bin/align_image_stack bin/nona_gui bin/matchpoint bin/hugin_hdrmerge +do + + LIPOARGs="" + + for ARCH in $ARCHS + do + + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCH/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + break; + else + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + fi + + done + +done + + +# merge libhugin*.dylibs +echo "Merging the libhugin*.dylibs" + +for liba in lib/libhuginANN.$HUGINVER_FULL.dylib lib/libhuginbase.$HUGINVER_FULL.dylib lib/libhuginjhead.$HUGINVER_FULL.dylib lib/libhuginvigraimpex.$HUGINVER_FULL.dylib +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + if [[ $liba == *.a ]] + then + ranlib "$REPOSITORYDIR/$liba"; + fi + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + if [[ $liba == *.a ]] + then + ranlib "$REPOSITORYDIR/$liba"; + fi + +done + + +if [ -f "$REPOSITORYDIR/lib/libhuginANN.$HUGINVER_FULL.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libhuginANN.$HUGINVER_FULL.dylib" "$REPOSITORYDIR/lib/libhuginANN.$HUGINVER_FULL.dylib" + ln -sfn libhuginANN.$HUGINVER_FULL.dylib $REPOSITORYDIR/lib/libhuginANN.dylib; +fi + +if [ -f "$REPOSITORYDIR/lib/libhuginbase.$HUGINVER_FULL.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libhuginbase.$HUGINVER_FULL.dylib" "$REPOSITORYDIR/lib/libhuginbase.$HUGINVER_FULL.dylib" + ln -sfn libhuginbase.$HUGINVER_FULL.dylib $REPOSITORYDIR/lib/libhuginbase.dylib; +fi + +if [ -f "$REPOSITORYDIR/lib/libhuginjhead.$HUGINVER_FULL.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libhuginjhead.$HUGINVER_FULL.dylib" "$REPOSITORYDIR/lib/libhuginjhead.$HUGINVER_FULL.dylib" + ln -sfn libhuginjhead.$HUGINVER_FULL.dylib $REPOSITORYDIR/lib/libhuginjhead.dylib; +fi + +if [ -f "$REPOSITORYDIR/lib/libhuginvigraimpex.$HUGINVER_FULL.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/libhuginvigraimpex.$HUGINVER_FULL.dylib" "$REPOSITORYDIR/lib/libhuginvigraimpex.$HUGINVER_FULL.dylib" + ln -sfn libhuginvigraimpex.$HUGINVER_FULL.dylib $REPOSITORYDIR/lib/libhuginvigraimpex.dylib; +fi + + + +# merge minimal bundles to universal minimal bundle +# echo "merge minimal bundles to universal minimal bundles" + + + +for ARCH in $ARCHS +do + mkdir -p "$REPOSITORYDIR/Application" + rm -rf "$REPOSITORYDIR/Application/Hugin.app" + rm -rf "$REPOSITORYDIR/Application/HuginStichProject.app" + + cp -R "$REPOSITORYDIR/arch/$ARCH/Application/Hugin.app" "$REPOSITORYDIR/Application/" + cp -R "$REPOSITORYDIR/arch/$ARCH/Application/HuginStitchProject.app" "$REPOSITORYDIR/Application/" + break; +done + + +for program in Application/Hugin.app/Contents/MacOS/Hugin Application/HuginStitchProject.app/Contents/MacOS/HuginStitchProject +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + strip "$REPOSITORYDIR/$program"; + +done Property changes on: hugin/trunk/mac/scripted_universal_build/01-Compile_hugin.sh ___________________________________________________________________ Added: svn:executable + * Added: hugin/trunk/mac/scripted_universal_build/02-Make_bundle.sh =================================================================== --- hugin/trunk/mac/scripted_universal_build/02-Make_bundle.sh (rev 0) +++ hugin/trunk/mac/scripted_universal_build/02-Make_bundle.sh 2008-08-28 13:45:15 UTC (rev 3369) @@ -0,0 +1,138 @@ +#!/bin/sh +# 02-Make_bundle.sh +# Harry van der Wolf, 2008 + +# Set correct environment +source ../ExternalPrograms/scripts/SetEnv-universal.txt +source ./bundle_constants.txt + +# take care of build directory +mkdir -p build + +# Set some variables +H_app="build/Hugin.app" +H_binary="$H_app/Contents/MacOS/Hugin" +RES_dir="$H_app/Contents/Resources" +HSP_app="$RES_dir/HuginStitchProject.app" +HSP_binary="$HSP_app/Contents/MacOS/HuginStitchProject" +dylib_dir="$REPOSITORYDIR/lib" +old_install_name_dirname="$REPOSITORYDIR/lib" +dylib_install_loc="Libraries" +new_install_name_dirname="@executable_path/../$dylib_install_loc" +exiftoolDir="$EXIFTOOL_DIR" + + + +# Copy minimal bundles to build directory +echo "Copy minimal bundles to build directory" +rm -rf build/Hugin.app + +cp -R "$REPOSITORYDIR/Application/Hugin.app" "build" +cp -R "$REPOSITORYDIR/Application/HuginStitchProject.app" "$RES_dir" + + +# Copy binaries in relevant bundle +H_bins="autopano-sift-c autopano matchpoint panomatic" +HSP_bins="PTmasker PTroller PTblender PTmender enblend enfuse gnumake hugin_hdrmerge nona pto2mk" + +#for bins in $H_bins +#do +# echo "Copying $bins into bundle" +# cp -Rf $REPOSITORYDIR/bin/$bins "$RES_dir" +#done + +for bins in $HSP_bins +do + echo "Copying $bins into bundle" + cp -Rf $REPOSITORYDIR/bin/$bins "$HSP_app/Contents/MacOS" +done + + +# Copy necessary libraries into bundle +# Find out libs we need and loop until no changes. +echo "" +echo "Find the libraries we need and loop until no new ones are added." + +mkdir -p $H_app/Contents/$dylib_install_loc + +a=1 +nfiles=0 +endl=true +while $endl; do + echo "Looking for dependencies and copying them into the bundle. Round " $a + libs="`otool -L $dylib_dir/* $RES_dir/* $H_binary $HSP_app/Contents/MacOS/* 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep "$REPOSITORYDIR" | sort | uniq`" + cp -f $libs $H_app/Contents/$dylib_install_loc + let "a+=1" + nnfiles=`ls $H_app/Contents/$dylib_install_loc | wc -l` + if [ $nnfiles = $nfiles ]; then + endl=false + else + nfiles=$nnfiles + fi +done +echo "finished copying necessary libs from $REPOSITORYDIR" + + + +# replace old install_name_dirname to new install_name_dirname +echo "replace old install_name_dirname to new install_name_dirname" +binaries="$H_app/Contents/$dylib_install_loc/*.dylib $RES_dir/* $H_binary $HSP_app/Contents/MacOS/*" + +for exec_file in $binaries +do + + echo "Processing: $exec_file" + + if [[ $exec_file = *.dylib ]] + then + for lib in $(otool -D $exec_file | grep $old_install_name_dirname | sed -e 's/ (.*$//' -e 's/^.*\///') + do + echo " Changing own install name." + install_name_tool -id "$new_install_name_dirname/$lib" $exec_file + done + fi + + for lib in $(otool -L $exec_file | grep $old_install_name_dirname | sed -e 's/ (.*$//' -e 's/^.*\///') + do + echo " Changing install name for: $lib" + install_name_tool -change "$old_install_name_dirname/$lib" "$new_install_name_dirname/$lib" $exec_file + done + +done + +# Copy "control point" scripts into bundle +H_scripts="autopano-complete-mac.sh matchpoint-complete-mac.sh" +#for scripts in $H_scripts +#do +# echo "Copying $scripts into bundle" +# cp -Rf "../../../mac/$scripts" "$RES_dir" +#done + +# Copy Exiftool into the bundle +echo "" +echo "# Now copying Exiftool into the bundle. There is no error checking. If exiftool is" +echo "# not available your bundle will function just as well but without that functionality." +echo "" +rm -rf $RES_dir/ExifTool; +mkdir -p $RES_dir/ExifTool; + +cp $exiftoolDir/exiftool $RES_dir/ExifTool/; +cp -r $exiftoolDir/lib $RES_dir/ExifTool/; + + + +# Embed HuginStitchProject inside Hugin +rm -Rf "$HSP_app/Contents/$dylib_install_loc" +ln -s "../../../$dylib_install_loc" "$HSP_app/Contents/$dylib_install_loc" + +if (file "$HSP_app/Contents/Resources" | grep -q -v "symbolic link") +then + cp -r "$HSP_app/Contents/Resources"/* "$H_app/Contents/Resources/" +fi +rm -Rf "$HSP_app/Contents/Resources" +ln -s "../../../Resources" "$HSP_app/Contents/Resources" + +# Copy Info.plists into bundle +cp ../Hugin-Info.plist $H_app/Contents/Info.plist +cp ../hugin_stitch_project-Info.plist $HSP_app/Contents/Info.plist + Property changes on: hugin/trunk/mac/scripted_universal_build/02-Make_bundle.sh ___________________________________________________________________ Added: svn:executable + * Added: hugin/trunk/mac/scripted_universal_build/03-localise-bundle.sh =================================================================== --- hugin/trunk/mac/scripted_universal_build/03-localise-bundle.sh (rev 0) +++ hugin/trunk/mac/scripted_universal_build/03-localise-bundle.sh 2008-08-28 13:45:15 UTC (rev 3369) @@ -0,0 +1,157 @@ +#!/bin/sh +# 03-localise-bundle.sh +# Harry van der Wolf, 2008 +# This file is almost completely copied from Ippei Ukai's localisation scripts + +# Set correct environment +source ../ExternalPrograms/scripts/SetEnv-universal.txt +source ./bundle_constants.txt + + # We do not want any interruption from pkg-configs, wx-configs and so on + # from MacPorts or Fink, who's paths were added to the PATH + #export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$REPOSITORYDIR/bin + + # If you are on Tiger and you have dowloaded the binary subversion from + # Martin Ott's webpage, you also need to add /usr/local/bin + # In that case uncomment the line below and outcomment the above PATH statement + export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:$REPOSITORYDIR/bin + + + +# Set some variables +H_app="build/Hugin.app" +wxWidgetsLocaleDir="$WX_LOCALE_DIR" +huginBuilder="$HUGIN_BUILDER" +resdir="$H_app/Contents/Resources" +huginsrcdir="../../../src/hugin1/hugin" +xrcsrcdir="$huginsrcdir/xrc" +translationsdir="../../../src/translations" + + + +####### +# First patch xrc + +rm -fR $resdir/xrc +echo "" +echo "copying xrc folder to $resdir/xrc" +cp -R $xrcsrcdir $resdir/ +echo "removing extra files from xrc folder" +for DIR in $resdir/xrc "$resdir/xrc/??*" "$resdir/xrc/??*/??*" +do + rm -fR $DIR/.svn + rm -f $DIR/.??* + rm -fR $DIR/CVS + rm -f $DIR/Makefil* + rm -f $DIR/CMake* +done + +echo "patching $resdir/xrc/cp_editor_panel.xrc to use wxChoice instead of wxNotebook" +mv $resdir/xrc/cp_editor_panel.xrc $resdir/xrc/cp_editor_panel.xrc-bk +sed -e s/wxNotebook/wxChoice/ -e s/cp_editor_left_tab/cp_editor_left_choice/ -e s/cp_editor_right_tab/cp_editor_right_choice/ $resdir/xrc/cp_editor_panel.xrc-bk > $resdir/xrc/cp_editor_panel.xrc +rm $resdir/xrc/cp_editor_panel.xrc-bk + +echo "patching $resdir/xrc/main_frame.xrc to have no border around the tab control." +mv $resdir/xrc/main_frame.xrc $resdir/xrc/main_frame.xrc-bk +sed -e s/wxALL// $resdir/xrc/main_frame.xrc-bk > $resdir/xrc/main_frame.xrc +rm $resdir/xrc/main_frame.xrc-bk + +#echo "generating about.htm from about.htm.in" +#sed -e "s/\${HUGIN_PACKAGE_VERSION}/$huginVer/g" \ +# -e "s/\${HUGIN_BUILDER}/$huginBuilder/g" \ +# $resdir/xrc/data/about.htm.in > $resdir/xrc/data/about.htm +#rm $resdir/xrc/data/about.htm.in + +cp $REPOSITORYDIR/share/hugin/xrc/data/about.htm $resdir/xrc/data/about.htm + + +######## +# Add localisation +echo "" +echo "Adding localisation files to the bundle" +for lang in "en" $(ls $translationsdir/*.po | sed -e "s/^.*\///g" -e "s/\.po//g") +do + + echo + echo "Language: $lang" + + localisedresdir="$resdir/$lang.lproj" + localedir="$localisedresdir/locale" + + rm -fR $localisedresdir + echo "deleting $localisedresdir" + + mkdir "$localisedresdir" + echo "making $localisedresdir" + mkdir "$localedir" + echo "making $localedir" + + if [ $lang = "en" ] + then + continue + fi + + echo "$lang/hugin.mo from $lang.po" + msgfmt -v -o "$localedir/hugin.mo" "$translationsdir/$lang.po" + + echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$lang.po" + if [ -f "$wxWidgetsLocaleDir/$lang.po" ] + then + msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$lang.po" + else + echo "$lang.po not found;" + parentLang=`echo $lang|sed s/_.*//` + echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$parentLang.po" + if [ -f "$wxWidgetsLocaleDir/$parentLang.po" ] + then + msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$parentLang.po" + else + echo "$parentLang.po not found;" + fi + fi + + for file in `ls $xrcsrcdir/data | grep _$lang.htm` + do + echo copying $file to $localisedresdir/`echo $file|sed s/_$lang//` + echo rewriting \'src=\"\' to \'src=\"../xrc/data/\' + sed s/src\=\"/src\=\"..\\/xrc\\/data\\// "$xrcsrcdir/data/$file" > $localisedresdir/`echo $file|sed s/_$lang//` + done + + for file in `ls $xrcsrcdir/data | grep _$lang.html` + do + echo copying $file to $localisedresdir/`echo $file|sed s/_$lang//` + echo rewriting \'src=\"\' to \'src=\"../xrc/data/\' + sed s/src\=\"/src\=\"..\\/xrc\\/data\\// "$xrcsrcdir/data/$file" > $localisedresdir/`echo $file|sed s/_$lang//` + done + + +done + +######## +# Install and "correct" help files +echo "" +echo "Install help files and change HTML src paths" +for helplang in "en_EN fr_FR" +do + + localisedresdir="$resdir/$(echo en_EN | grep -o '^[^_]*').lproj" + + if [ -d "$xrcsrcdir/data/help_$helplang" ] + then + echo "moving help_$helplang to $localisedresdir/help" + cp -R "$resdir/xrc/data/help_$helplang" "$localisedresdir/help" + for file in `ls $localisedresdir/help | grep .html` + do + echo rewriting \'src=\"../help_common\' to \'src=\"../../xrc/data/help_common\' + sed s/src\=\"..\\/help_common/src\=\"..\\/..\\/xrc\\/data\\/help_common/ "$localisedresdir/help/$file" > $localisedresdir/help/$file-copy + mv $localisedresdir/help/$file-copy $localisedresdir/help/$file + done + fi + +done + +echo "" +echo "All done. You should now have a working and fully portable Universal bundle." +echo "" +echo "" + Property changes on: hugin/trunk/mac/scripted_universal_build/03-localise-bundle.sh ___________________________________________________________________ Added: svn:executable + * Added: hugin/trunk/mac/scripted_universal_build/04-create_dmg_gz.sh =================================================================== --- hugin/trunk/mac/scripted_universal_build/04-create_dmg_gz.sh (rev 0) +++ hugin/trunk/mac/scripted_universal_build/04-create_dmg_gz.sh 2008-08-28 13:45:15 UTC (rev 3369) @@ -0,0 +1,51 @@ +#!/bin/sh +# 04-create_dmg_tgz.sh +# Harry van der Wolf, 2008 + +# Make a compressed image and gzip that for higher compression + +mkdir -p archives + +if [ $# -ne 1 ]; then + echo "" + echo 1>&2 "" + echo "You need to specify a name for the archive to be created. Please do not add an extention." + echo "Like ./04-create_dmg_tgz.sh hugin0.7_svn1234_20080810" + echo "" + exit 127 +fi + +archive=$1 + +echo "# Creating directory $archive in archives. Hugin.app and some more will be copied into this" +echo "# directory and from this directory the $archive.dmg and $archive.dmg.gz will be created" +rm -rf archives/$archive +mkdir -p archives/$archive + +# copy Hugin.app +cp -R build/Hugin.app archives/$archive/Hugin.app + +# I always copy some Docs and and the relevant License files into the bundle. +# Comment these lines out if you don't want to do that +cd archives +cp -R Docs $archive +cp -R Licenses $archive +cp *.webloc $archive +cp "Read me first (Mac).rtf" $archive +cp "Pre-release Note.txt" $archive + +# Temporarily copy autopano-sift-c.autocp in +cp -R Autopano-SIFT $archive + + + + +# Create .dmg from folder +hdiutil create -srcfolder "$archive" "$archive.dmg" + +# Gzip to compress it even a little further +gzip -9 "$archive.dmg" + +echo "Done. Your $archive.dmg.gz has been created in the directory archives" + + Property changes on: hugin/trunk/mac/scripted_universal_build/04-create_dmg_gz.sh ___________________________________________________________________ Added: svn:executable + * Added: hugin/trunk/mac/scripted_universal_build/bundle_constants.txt =================================================================== --- hugin/trunk/mac/scripted_universal_build/bundle_constants.txt (rev 0) +++ hugin/trunk/mac/scripted_universal_build/bundle_constants.txt 2008-08-28 13:45:15 UTC (rev 3369) @@ -0,0 +1,21 @@ +# Configuration for scripted build of universal Hugin.app +# Copyright (c) 2008, Harry van der Wolf + +# This config file contains some constants to be able to build the bundle + +# YOU NEED TO SPECIFY WHERE YOU HAVE ExifTool +# This needs to be the absolute path +EXIFTOOL_DIR="$REPOSITORYDIR/../Image-ExifTool-7.25" + +# Specify where your WxWidgets (a.k.a WxMac a.k.a. wxWindows) locale directory is +# Note: this is inside your wxWidgets source directory +WX_LOCALE_DIR="$REPOSITORYDIR/../wxMac-2.8.8/locale" + +# Type your name into this variable +HUGIN_BUILDER="spiderman" + +export EXIFTOOL_DIR; +export WX_LOCALE_DIR; +export HUGIN_BUILDER; + + Added: hugin/trunk/mac/scripted_universal_build/hugin_config.h =================================================================== --- hugin/trunk/mac/scripted_universal_build/hugin_config.h (rev 0) +++ hugin/trunk/mac/scripted_universal_build/hugin_config.h 2008-08-28 13:45:15 UTC (rev 3369) @@ -0,0 +1,62 @@ +#ifndef __CONFIG_H__ + +/* Define to 1 if you have the <pano12/queryfeature.h> header file. */ +#define HAVE_PANO12_QUERYFEATURE_H 1 + +/* various libraries. For compatability with the old source code + * most cmake variables are defined under a second name as well */ + +/* Define if you have JPEG library */ +#define JPEG_FOUND 1 +/* Define if you have JPEG library (old style) */ +#ifdef JPEG_FOUND +#define HasJPEG 1 +#endif + +/* Define if you have PNG library */ +#define PNG_FOUND 1 +#ifdef PNG_FOUND +#define HasPNG 1 +#endif + +/* Define if you have TIFF library */ +#define TIFF_FOUND 1 +#ifdef TIFF_FOUND +#define HasTIFF 1 +#endif + +/* Define if you have OpenEXR library */ +#define OPENEXR_FOUND 1 +#ifdef OPENEXR_FOUND +#define HasEXR 1 +#endif + +/* Define if you have Panotools library (pano13) */ +/* #undef TLALLI_FOUND 1 */ +#define PANO13_FOUND 1 +#define PANO12_FOUND 1 + +#ifdef TLALLI_FOUND +#define HasTLALLI 1 +#elif defined PANO13_FOUND +#define HasPANO13 1 +#elif defined PANO12_FOUND +#define HasPANO12 1 +#endif + +/* locate of the xrc files, as defined during configuration */ +#define INSTALL_LOCALE_DIR "" + +/* Location for XRC files and other data, as defined during configuration*/ +#define INSTALL_XRC_DIR "" + +/* Use exiv2, if found */ +#define EXIV2_FOUND 1 +#ifdef EXIV2_FOUND +#define HUGIN_USE_EXIV2 1 +#endif + +/* Build a fully self contained OSX bundle (with embedded ressources) */ +#define MAC_SELF_CONTAINED_BUNDLE 1 + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-08-30 03:13:59
|
Revision: 3377 http://hugin.svn.sourceforge.net/hugin/?rev=3377&view=rev Author: ippei Date: 2008-08-30 03:13:57 +0000 (Sat, 30 Aug 2008) Log Message: ----------- Mac: hopefully xcode 2.4 compatibility has benn restored Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-08-29 07:48:56 UTC (rev 3376) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-08-30 03:13:57 UTC (rev 3377) @@ -11,20 +11,20 @@ // SDK target SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk -SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk -SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk +//SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk +//SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk // deployment target MACOSX_DEPLOYMENT_TARGET_ppc = 10.4 MACOSX_DEPLOYMENT_TARGET_i386 = 10.4 -MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5 -MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5 +//MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5 +//MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5 // special optimization PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4 PER_ARCH_CFLAGS_i386 = -march=prescott -mtune=pentium-m -ftree-vectorize -PER_ARCH_CFLAGS_ppc64 = -mcpu=G5 -mtune=G5 -ftree-vectorize -PER_ARCH_CFLAGS_x86_64 = -march=nocona -mtune=generic -ftree-vectorize +//PER_ARCH_CFLAGS_ppc64 = -mcpu=G5 -mtune=G5 -ftree-vectorize +//PER_ARCH_CFLAGS_x86_64 = -march=nocona -mtune=generic -ftree-vectorize // wxWidgets WX_MAJOR_VERSION = 2.8 Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-29 07:48:56 UTC (rev 3376) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-30 03:13:57 UTC (rev 3377) @@ -1419,7 +1419,7 @@ 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = autooptimiser.cpp; sourceTree = "<group>"; }; 5709A0890C4543E100BD1C53 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; }; 570D581A082A9ED50030E768 /* enblend */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = enblend; path = bin/enblend; sourceTree = "<group>"; }; - 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Hugin-Info.plist"; sourceTree = "<group>"; }; + 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Hugin-Info.plist"; sourceTree = "<group>"; }; 57114EA006BC2301004F4FA7 /* Hugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Hugin.icns; sourceTree = "<group>"; }; 57114F0206BC2301004F4FA7 /* auto_file.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = auto_file.hxx; sourceTree = "<group>"; }; 57114F0306BC2301004F4FA7 /* bmp.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = bmp.cxx; sourceTree = "<group>"; }; @@ -1631,14 +1631,14 @@ 576482E20C469056003AFC2F /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; }; 576482E80C469093003AFC2F /* fulla.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fulla.cpp; sourceTree = "<group>"; }; 576482E90C469093003AFC2F /* vig_optimize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vig_optimize.cpp; sourceTree = "<group>"; }; - 576900800D24D14500A6AD01 /* vigra_impex-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "vigra_impex-Info.plist"; sourceTree = "<group>"; }; + 576900800D24D14500A6AD01 /* vigra_impex-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "vigra_impex-Info.plist"; sourceTree = "<group>"; }; 576900AA0D24D29300A6AD01 /* HuginBase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginBase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 576900AB0D24D29300A6AD01 /* hugin_base-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "hugin_base-Info.plist"; sourceTree = "<group>"; }; + 576900AB0D24D29300A6AD01 /* hugin_base-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "hugin_base-Info.plist"; sourceTree = "<group>"; }; 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginBaseWx.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 576900E20D24D32C00A6AD01 /* base_wx-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "base_wx-Info.plist"; sourceTree = "<group>"; }; + 576900E20D24D32C00A6AD01 /* base_wx-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "base_wx-Info.plist"; sourceTree = "<group>"; }; 576902090D24DBA100A6AD01 /* complete-bundle.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "complete-bundle.sh"; sourceTree = "<group>"; }; 5769F6300D23825700A6AD01 /* HuginStitchProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HuginStitchProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 5769F6320D23825700A6AD01 /* hugin_stitch_project-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "hugin_stitch_project-Info.plist"; sourceTree = "<group>"; }; + 5769F6320D23825700A6AD01 /* hugin_stitch_project-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "hugin_stitch_project-Info.plist"; sourceTree = "<group>"; }; 5769F79E0D239D6A00A6AD01 /* enfuse */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = enfuse; path = bin/enfuse; sourceTree = "<group>"; }; 5769F79F0D239D6A00A6AD01 /* PTblender */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = PTblender; path = bin/PTblender; sourceTree = "<group>"; }; 5769F7A00D239D6A00A6AD01 /* PTmasker */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = PTmasker; path = bin/PTmasker; sourceTree = "<group>"; }; @@ -1773,7 +1773,7 @@ 57CCCC3C086C957E000EBC4A /* LICENCE */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = LICENCE; sourceTree = "<group>"; }; 57CCCC4E086C957E000EBC4A /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; 57CCCC5C086C9651000EBC4A /* utils */ = {isa = PBXFileReference; lastKnownFileType = folder; path = utils; sourceTree = "<group>"; }; - 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "nona_gui-Info.plist"; sourceTree = "<group>"; }; + 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "nona_gui-Info.plist"; sourceTree = "<group>"; }; 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.dylib; path = lib/libjpeg.dylib; sourceTree = "<group>"; }; 57D18D8E0E13BD340054A523 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; }; 57D18D8F0E13BD340054A523 /* SVN-rev.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "SVN-rev.xcconfig"; sourceTree = "<group>"; }; @@ -1919,31 +1919,6 @@ 57FD3E5E06E98ED50070426B /* pano13 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = pano13; sourceTree = "<group>"; }; 7332AE560D8D491B002BF5FF /* APImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = APImage.cpp; sourceTree = "<group>"; }; 7332AE570D8D491B002BF5FF /* APImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = APImage.h; sourceTree = "<group>"; }; - 7332AE590D8D491B002BF5FF /* cmake_install.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cmake_install.cmake; sourceTree = "<group>"; }; - 7332AE5A0D8D491B002BF5FF /* CMakeCache.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeCache.txt; sourceTree = "<group>"; }; - 7332AE5C0D8D491B002BF5FF /* cmake.check_cache */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cmake.check_cache; sourceTree = "<group>"; }; - 7332AE5D0D8D491B002BF5FF /* CMakeCCompiler.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeCCompiler.cmake; sourceTree = "<group>"; }; - 7332AE5E0D8D491B002BF5FF /* CMakeCXXCompiler.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeCXXCompiler.cmake; sourceTree = "<group>"; }; - 7332AE5F0D8D491B002BF5FF /* CMakeDirectoryInformation.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeDirectoryInformation.cmake; sourceTree = "<group>"; }; - 7332AE600D8D491B002BF5FF /* CMakeOutput.log */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeOutput.log; sourceTree = "<group>"; }; - 7332AE610D8D491B002BF5FF /* CMakeSystem.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeSystem.cmake; sourceTree = "<group>"; }; - 7332AE650D8D491B002BF5FF /* Makefile.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.cmake; sourceTree = "<group>"; }; - 7332AE660D8D491B002BF5FF /* Makefile2 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile2; sourceTree = "<group>"; }; - 7332AE680D8D491B002BF5FF /* build.make */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = build.make; sourceTree = "<group>"; }; - 7332AE690D8D491B002BF5FF /* cmake_clean.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cmake_clean.cmake; sourceTree = "<group>"; }; - 7332AE6A0D8D491B002BF5FF /* cmake_clean_target.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cmake_clean_target.cmake; sourceTree = "<group>"; }; - 7332AE6B0D8D491B002BF5FF /* CXX.includecache */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CXX.includecache; sourceTree = "<group>"; }; - 7332AE6C0D8D491B002BF5FF /* depend.internal */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = depend.internal; sourceTree = "<group>"; }; - 7332AE6D0D8D491B002BF5FF /* depend.make */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = depend.make; sourceTree = "<group>"; }; - 7332AE6E0D8D491B002BF5FF /* depend.make.mark */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = depend.make.mark; sourceTree = "<group>"; }; - 7332AE6F0D8D491B002BF5FF /* DependInfo.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DependInfo.cmake; sourceTree = "<group>"; }; - 7332AE700D8D491B002BF5FF /* flags.make */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = flags.make; sourceTree = "<group>"; }; - 7332AE710D8D491B002BF5FF /* progress.make */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = progress.make; sourceTree = "<group>"; }; - 7332AE730D8D491B002BF5FF /* 1 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = 1; sourceTree = "<group>"; }; - 7332AE740D8D491B002BF5FF /* count.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = count.txt; sourceTree = "<group>"; }; - 7332AE750D8D491B002BF5FF /* progress.make */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = progress.make; sourceTree = "<group>"; }; - 7332AE760D8D491B002BF5FF /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; }; - 7332AE770D8D491B002BF5FF /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; 7332AE780D8D491B002BF5FF /* COPYING */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = COPYING; sourceTree = "<group>"; }; 7332AE790D8D491B002BF5FF /* Descriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Descriptor.cpp; sourceTree = "<group>"; }; 7332AE7A0D8D491B002BF5FF /* Descriptor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Descriptor.h; sourceTree = "<group>"; }; @@ -3427,104 +3402,23 @@ children = ( 7332AE560D8D491B002BF5FF /* APImage.cpp */, 7332AE570D8D491B002BF5FF /* APImage.h */, - 7332AE580D8D491B002BF5FF /* build */, - 7332AE770D8D491B002BF5FF /* CMakeLists.txt */, - 7332AE780D8D491B002BF5FF /* COPYING */, 7332AE790D8D491B002BF5FF /* Descriptor.cpp */, 7332AE7A0D8D491B002BF5FF /* Descriptor.h */, 7332AE7B0D8D491B002BF5FF /* edgedetection.hxx */, - 7332AE7C0D8D491C002BF5FF /* evaluation */, 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */, 7332AE850D8D491C002BF5FF /* HessianDetector.h */, - 7332AE860D8D491C002BF5FF /* java */, 7332AE890D8D491C002BF5FF /* main.cpp */, 7332AE8A0D8D491C002BF5FF /* MatchPoint.cpp */, 7332AE8B0D8D491C002BF5FF /* Praprot.jpg */, + 7332AE780D8D491B002BF5FF /* COPYING */, 7332AE8C0D8D491C002BF5FF /* README */, + 7332AE7C0D8D491C002BF5FF /* evaluation */, + 7332AE860D8D491C002BF5FF /* java */, 7332AE8D0D8D491C002BF5FF /* test */, ); path = matchpoint; sourceTree = "<group>"; }; - 7332AE580D8D491B002BF5FF /* build */ = { - isa = PBXGroup; - children = ( - 7332AE590D8D491B002BF5FF /* cmake_install.cmake */, - 7332AE5A0D8D491B002BF5FF /* CMakeCache.txt */, - 7332AE5B0D8D491B002BF5FF /* CMakeFiles */, - 7332AE760D8D491B002BF5FF /* Makefile */, - ); - path = build; - sourceTree = "<group>"; - }; - 7332AE5B0D8D491B002BF5FF /* CMakeFiles */ = { - isa = PBXGroup; - children = ( - 7332AE5C0D8D491B002BF5FF /* cmake.check_cache */, - 7332AE5D0D8D491B002BF5FF /* CMakeCCompiler.cmake */, - 7332AE5E0D8D491B002BF5FF /* CMakeCXXCompiler.cmake */, - 7332AE5F0D8D491B002BF5FF /* CMakeDirectoryInformation.cmake */, - 7332AE600D8D491B002BF5FF /* CMakeOutput.log */, - 7332AE610D8D491B002BF5FF /* CMakeSystem.cmake */, - 7332AE620D8D491B002BF5FF /* CMakeTmp */, - 7332AE650D8D491B002BF5FF /* Makefile.cmake */, - 7332AE660D8D491B002BF5FF /* Makefile2 */, - 7332AE670D8D491B002BF5FF /* matchpoint.dir */, - 7332AE720D8D491B002BF5FF /* Progress */, - 7332AE750D8D491B002BF5FF /* progress.make */, - ); - path = CMakeFiles; - sourceTree = "<group>"; - }; - 7332AE620D8D491B002BF5FF /* CMakeTmp */ = { - isa = PBXGroup; - children = ( - 7332AE630D8D491B002BF5FF /* CMakeFiles */, - ); - path = CMakeTmp; - sourceTree = "<group>"; - }; - 7332AE630D8D491B002BF5FF /* CMakeFiles */ = { - isa = PBXGroup; - children = ( - 7332AE640D8D491B002BF5FF /* cmTryCompileExec.dir */, - ); - path = CMakeFiles; - sourceTree = "<group>"; - }; - 7332AE640D8D491B002BF5FF /* cmTryCompileExec.dir */ = { - isa = PBXGroup; - children = ( - ); - path = cmTryCompileExec.dir; - sourceTree = "<group>"; - }; - 7332AE670D8D491B002BF5FF /* matchpoint.dir */ = { - isa = PBXGroup; - children = ( - 7332AE680D8D491B002BF5FF /* build.make */, - 7332AE690D8D491B002BF5FF /* cmake_clean.cmake */, - 7332AE6A0D8D491B002BF5FF /* cmake_clean_target.cmake */, - 7332AE6B0D8D491B002BF5FF /* CXX.includecache */, - 7332AE6C0D8D491B002BF5FF /* depend.internal */, - 7332AE6D0D8D491B002BF5FF /* depend.make */, - 7332AE6E0D8D491B002BF5FF /* depend.make.mark */, - 7332AE6F0D8D491B002BF5FF /* DependInfo.cmake */, - 7332AE700D8D491B002BF5FF /* flags.make */, - 7332AE710D8D491B002BF5FF /* progress.make */, - ); - path = matchpoint.dir; - sourceTree = "<group>"; - }; - 7332AE720D8D491B002BF5FF /* Progress */ = { - isa = PBXGroup; - children = ( - 7332AE730D8D491B002BF5FF /* 1 */, - 7332AE740D8D491B002BF5FF /* count.txt */, - ); - path = Progress; - sourceTree = "<group>"; - }; 7332AE7C0D8D491C002BF5FF /* evaluation */ = { isa = PBXGroup; children = ( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-08-30 06:15:17
|
Revision: 3378 http://hugin.svn.sourceforge.net/hugin/?rev=3378&view=rev Author: ippei Date: 2008-08-30 06:15:14 +0000 (Sat, 30 Aug 2008) Log Message: ----------- Mac: set HUGIN_WC_REVISION manually if exported Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/Version.xcconfig Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-30 03:13:57 UTC (rev 3377) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-30 06:15:14 UTC (rev 3378) @@ -36,11 +36,11 @@ isa = PBXAggregateTarget; buildConfigurationList = 57C4862A0C312226002D79F1 /* Build configuration list for PBXAggregateTarget "configure" */; buildPhases = ( - 575484FB0E5FB4C30039E174 /* update SVN-rev.xcconfig */, - 57C4863E0C3122C4002D79F1 /* copy hugin_config.h */, - 57E122110D2BDDBE00743A93 /* configure hugin_version.h */, ); dependencies = ( + 57FF7DA70E69184600553709 /* PBXTargetDependency */, + 57FF7DC80E691AAC00553709 /* PBXTargetDependency */, + 57FF7DC60E691AAB00553709 /* PBXTargetDependency */, ); name = configure; productName = "copy hugin_config.h"; @@ -110,6 +110,40 @@ name = tools; productName = tools; }; + 57FF7DA00E6917BF00553709 /* set svn revision */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57FF7DA50E6917FE00553709 /* Build configuration list for PBXAggregateTarget "set svn revision" */; + buildPhases = ( + 57FF7D9F0E6917BF00553709 /* Run Script */, + ); + dependencies = ( + ); + name = "set svn revision"; + productName = "svn revision"; + }; + 57FF7DBB0E6919F400553709 /* copy hugin_config.h */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57FF7DBF0E691A1700553709 /* Build configuration list for PBXAggregateTarget "copy hugin_config.h" */; + buildPhases = ( + 57FF7DBA0E6919F400553709 /* ShellScript */, + ); + dependencies = ( + ); + name = "copy hugin_config.h"; + productName = "copy hugin_config.h"; + }; + 57FF7DC10E691A1800553709 /* configure hugin_version.h */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57FF7DCC0E691AAF00553709 /* Build configuration list for PBXAggregateTarget "configure hugin_version.h" */; + buildPhases = ( + 57FF7DC00E691A1800553709 /* ShellScript */, + ); + dependencies = ( + 57FF7DEB0E691C4600553709 /* PBXTargetDependency */, + ); + name = "configure hugin_version.h"; + productName = "configure hugin_version.h"; + }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -1307,6 +1341,34 @@ remoteGlobalIDString = 57E122580D2BE4E900743A93; remoteInfo = "align_image_stack static"; }; + 57FF7DA60E69184600553709 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57FF7DA00E6917BF00553709 /* svn revision */; + remoteInfo = "svn revision"; + }; + 57FF7DC50E691AAB00553709 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57FF7DBB0E6919F400553709 /* copy hugin_config.h */; + remoteInfo = "copy hugin_config.h"; + }; + 57FF7DC70E691AAC00553709 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57FF7DC10E691A1800553709 /* configure hugin_version.h */; + remoteInfo = "configure hugin_version.h"; + }; + 57FF7DEA0E691C4600553709 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57FF7DA00E6917BF00553709 /* set svn revision */; + remoteInfo = "set svn revision"; + }; 7332AE930D8D4986002BF5FF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -4375,6 +4437,9 @@ projectRoot = ..; targets = ( 57C486290C3121E8002D79F1 /* configure */, + 57FF7DA00E6917BF00553709 /* set svn revision */, + 57FF7DC10E691A1800553709 /* configure hugin_version.h */, + 57FF7DBB0E6919F400553709 /* copy hugin_config.h */, 57E3470D0C4A8E95006AA781 /* lib static */, 5720E4720BD456CD00E63404 /* levmar */, 5749F8A2067B60CA00A6EDD4 /* jhead */, @@ -4612,99 +4677,96 @@ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/localise-help.sh\nfi"; showEnvVarsInLog = 0; }; - 575484FB0E5FB4C30039E174 /* update SVN-rev.xcconfig */ = { + 576902030D24DA9500A6AD01 /* Complete Bundle */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "update SVN-rev.xcconfig"; + name = "Complete Bundle"; outputPaths = ( - "../mac/SVN-rev.xcconfig", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"../mac/SVN-rev.xcconfig\"\n\nif [ $(svnversion -n \"../\") = \"exported\" ]\nthen\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\nelse\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"../mac/SVN-rev.xcconfig\"\nfi"; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi"; + showEnvVarsInLog = 0; }; - 576902030D24DA9500A6AD01 /* Complete Bundle */ = { + 579374850D47E7E500A52730 /* Copy ExifTool */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Complete Bundle"; + name = "Copy ExifTool"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi"; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/copyExifTool.sh\nfi"; showEnvVarsInLog = 0; }; - 579374850D47E7E500A52730 /* Copy ExifTool */ = { + 57E347640C4A8F9F006AA781 /* Locale Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy ExifTool"; + name = "Locale Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/copyExifTool.sh\nfi"; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/localised.sh\nfi"; showEnvVarsInLog = 0; }; - 57C4863E0C3122C4002D79F1 /* copy hugin_config.h */ = { + 57FF7D9F0E6917BF00553709 /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - ../src/hugin_config_mac.h, ); - name = "copy hugin_config.h"; + name = "Run Script"; outputPaths = ( - ../src/hugin_config.h, ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cp -r ../src/hugin_config_mac.h ../src/hugin_config.h\n\n"; - showEnvVarsInLog = 0; + shellScript = "if [ -f \"../mac/SVN-rev.xcconfig\" ]\nthen\n if [ $(svnversion -n \"../\") != \"exported\" ]\n then\n if [ $(svnversion -n \"../\" | grep -o '^[0-9]*') = \"${HUGIN_WC_REVISION}\" ]\n then\n exit 0\n fi\n else\n if [ ${HUGIN_WC_REVISION} != \"\" ]\n then\n exit 0\n fi\n fi\nfi\n\nif [ $(svnversion -n \"../\") != \"exported\" ]\nthen\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"../mac/SVN-rev.xcconfig\"\nelse\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\n echo 'Need to set SVN revision ${HUGIN_WC_REVISION} manually in Version.xcconfig.' >&2\n exit 1\nfi"; }; - 57E122110D2BDDBE00743A93 /* configure hugin_version.h */ = { + 57FF7DBA0E6919F400553709 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - ../src/hugin_version.h.in.cmake, + ../src/hugin_config_mac.h, ); - name = "configure hugin_version.h"; outputPaths = ( - ../src/hugin_version.h, + ../src/hugin_config.h, ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ $HUGIN_WC_REVISION ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; - showEnvVarsInLog = 0; + shellScript = "cp -r ../src/hugin_config_mac.h ../src/hugin_config.h\n\n"; }; - 57E347640C4A8F9F006AA781 /* Locale Script */ = { + 57FF7DC00E691A1800553709 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "../mac/SVN-rev.xcconfig", + ../mac/Version.xcconfig, + ../src/hugin_version.h.in.cmake, ); - name = "Locale Script"; outputPaths = ( + ../src/hugin_version.h, ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/localised.sh\nfi"; - showEnvVarsInLog = 0; + shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ $HUGIN_WC_REVISION ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; }; /* End PBXShellScriptBuildPhase section */ @@ -5380,6 +5442,26 @@ target = 57E3467D0C4A89B0006AA781 /* Hugin */; targetProxy = 57E347460C4A8EF8006AA781 /* PBXContainerItemProxy */; }; + 57FF7DA70E69184600553709 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57FF7DA00E6917BF00553709 /* set svn revision */; + targetProxy = 57FF7DA60E69184600553709 /* PBXContainerItemProxy */; + }; + 57FF7DC60E691AAB00553709 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57FF7DBB0E6919F400553709 /* copy hugin_config.h */; + targetProxy = 57FF7DC50E691AAB00553709 /* PBXContainerItemProxy */; + }; + 57FF7DC80E691AAC00553709 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57FF7DC10E691A1800553709 /* configure hugin_version.h */; + targetProxy = 57FF7DC70E691AAC00553709 /* PBXContainerItemProxy */; + }; + 57FF7DEB0E691C4600553709 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57FF7DA00E6917BF00553709 /* set svn revision */; + targetProxy = 57FF7DEA0E691C4600553709 /* PBXContainerItemProxy */; + }; 7332AE920D8D4986002BF5FF /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; @@ -7111,6 +7193,69 @@ }; name = Release; }; + 57FF7DA10E6917BF00553709 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "set svn revision"; + }; + name = Debug; + }; + 57FF7DA20E6917BF00553709 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "set svn revision"; + }; + name = Development; + }; + 57FF7DA30E6917BF00553709 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "set svn revision"; + }; + name = Release; + }; + 57FF7DBC0E6919F400553709 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "copy hugin_config.h"; + }; + name = Debug; + }; + 57FF7DBD0E6919F400553709 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "copy hugin_config.h"; + }; + name = Development; + }; + 57FF7DBE0E6919F400553709 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "copy hugin_config.h"; + }; + name = Release; + }; + 57FF7DC20E691A1800553709 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "configure hugin_version.h"; + }; + name = Debug; + }; + 57FF7DC30E691A1800553709 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "configure hugin_version.h"; + }; + name = Development; + }; + 57FF7DC40E691A1800553709 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "configure hugin_version.h"; + }; + name = Release; + }; 7332AEAA0D8D4986002BF5FF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -7633,6 +7778,36 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 57FF7DA50E6917FE00553709 /* Build configuration list for PBXAggregateTarget "set svn revision" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57FF7DA10E6917BF00553709 /* Debug */, + 57FF7DA20E6917BF00553709 /* Development */, + 57FF7DA30E6917BF00553709 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 57FF7DBF0E691A1700553709 /* Build configuration list for PBXAggregateTarget "copy hugin_config.h" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57FF7DBC0E6919F400553709 /* Debug */, + 57FF7DBD0E6919F400553709 /* Development */, + 57FF7DBE0E6919F400553709 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 57FF7DCC0E691AAF00553709 /* Build configuration list for PBXAggregateTarget "configure hugin_version.h" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57FF7DC20E691A1800553709 /* Debug */, + 57FF7DC30E691A1800553709 /* Development */, + 57FF7DC40E691A1800553709 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint dynamic" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/trunk/mac/Version.xcconfig =================================================================== --- hugin/trunk/mac/Version.xcconfig 2008-08-30 03:13:57 UTC (rev 3377) +++ hugin/trunk/mac/Version.xcconfig 2008-08-30 06:15:14 UTC (rev 3378) @@ -1,7 +1,14 @@ #include "SVN-rev.xcconfig" +//set the SVN revision number manually +//HUGIN_WC_REVISION = 3000 + +//set or override the prerelease tag manually +//HUGIN_PRERELEASE_VERSION_TAG = -RC4 + HUGIN_VERSION_MAJOR = 0 HUGIN_VERSION_MINOR = 7 HUGIN_VERSION_PATCH = 0 + HUGIN_PACKAGE_VERSION = $(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)$(HUGIN_PRERELEASE_VERSION_TAG) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-09-01 02:26:50
|
Revision: 3390 http://hugin.svn.sourceforge.net/hugin/?rev=3390&view=rev Author: ippei Date: 2008-09-01 02:26:44 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Mac: exported code now compiles as release version. Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/Version.xcconfig Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-08-31 21:22:28 UTC (rev 3389) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-09-01 02:26:44 UTC (rev 3390) @@ -1345,28 +1345,28 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57FF7DA00E6917BF00553709 /* svn revision */; + remoteGlobalIDString = 57FF7DA00E6917BF00553709; remoteInfo = "svn revision"; }; 57FF7DC50E691AAB00553709 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57FF7DBB0E6919F400553709 /* copy hugin_config.h */; + remoteGlobalIDString = 57FF7DBB0E6919F400553709; remoteInfo = "copy hugin_config.h"; }; 57FF7DC70E691AAC00553709 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57FF7DC10E691A1800553709 /* configure hugin_version.h */; + remoteGlobalIDString = 57FF7DC10E691A1800553709; remoteInfo = "configure hugin_version.h"; }; 57FF7DEA0E691C4600553709 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57FF7DA00E6917BF00553709 /* set svn revision */; + remoteGlobalIDString = 57FF7DA00E6917BF00553709; remoteInfo = "set svn revision"; }; 7332AE930D8D4986002BF5FF /* PBXContainerItemProxy */ = { @@ -1547,10 +1547,11 @@ 57237F4B0C391053005818A4 /* Stitcher4.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher4.cpp; sourceTree = "<group>"; }; 5731C4910D5532D400605D22 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexiv2.a; path = lib/libexiv2.a; sourceTree = "<group>"; }; 5731C4920D5532D400605D22 /* libexpat.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libexpat.dylib; path = lib/libexpat.dylib; sourceTree = "<group>"; }; + 5739F53E0E6A4986001C3F0E /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; }; 573B8F85067BAAB900B7B355 /* libpano13.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpano13.dylib; path = lib/libpano13.dylib; sourceTree = "<group>"; }; 573E2E470B76AC8900E86281 /* readme.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = readme.txt; sourceTree = "<group>"; }; 573E2E5F0B76AD0100E86281 /* HOWTO-autopanosift.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "HOWTO-autopanosift.txt"; sourceTree = "<group>"; }; - 573E2E600B76AD0100E86281 /* ReadMe-Mac.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "ReadMe-Mac.txt"; sourceTree = "<group>"; }; + 573E2E600B76AD0100E86281 /* ReadMe-Mac.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "ReadMe-Mac.txt"; sourceTree = "<group>"; wrapsLines = 1; }; 573F32B109F79B730088B333 /* accessor.hxx */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = accessor.hxx; sourceTree = "<group>"; }; 573F32B209F79B730088B333 /* array_vector.hxx */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = array_vector.hxx; sourceTree = "<group>"; }; 573F32B309F79B730088B333 /* basicgeometry.hxx */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = basicgeometry.hxx; sourceTree = "<group>"; }; @@ -2839,6 +2840,7 @@ 574B81B50E41996700644179 /* LICENCE_VIGRA */, 57CCCC4E086C957E000EBC4A /* README */, 574B81B60E41997700644179 /* README_JP */, + 5739F53E0E6A4986001C3F0E /* TODO */, 574B81B90E41999300644179 /* platforms */, 57CCCC5C086C9651000EBC4A /* utils */, ); @@ -4734,7 +4736,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ -f \"../mac/SVN-rev.xcconfig\" ]\nthen\n if [ $(svnversion -n \"../\") != \"exported\" ]\n then\n if [ $(svnversion -n \"../\" | grep -o '^[0-9]*') = \"${HUGIN_WC_REVISION}\" ]\n then\n exit 0\n fi\n else\n if [ ${HUGIN_WC_REVISION} != \"\" ]\n then\n exit 0\n fi\n fi\nfi\n\nif [ $(svnversion -n \"../\") != \"exported\" ]\nthen\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"../mac/SVN-rev.xcconfig\"\nelse\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\n echo 'Need to set SVN revision ${HUGIN_WC_REVISION} manually in Version.xcconfig.' >&2\n exit 1\nfi"; + shellScript = "if [ -f \"../mac/SVN-rev.xcconfig\" ]\nthen\n if [ $(svnversion -n \"../\") != \"exported\" ]\n then\n if [ $(svnversion -n \"../\" | grep -o '^[0-9]*') = \"${HUGIN_WC_REVISION}\" ]\n then\n exit 0\n fi\n else\n if [ ${HUGIN_WC_REVISION} != \"\" ]\n then\n exit 0\n fi\n fi\nfi\n\nif [ $(svnversion -n \"../\") != \"exported\" ]\nthen\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_DEVELOPMENT_VERSION = 1' >> \"../mac/SVN-rev.xcconfig\"\nelse\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\n echo 'Need to set SVN revision ${HUGIN_WC_REVISION} manually in Version.xcconfig.' >&2\n exit 1\nfi"; }; 57FF7DBA0E6919F400553709 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -4766,7 +4768,7 @@ ); 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_WC_REVISION ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; + shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; }; /* End PBXShellScriptBuildPhase section */ Modified: hugin/trunk/mac/Version.xcconfig =================================================================== --- hugin/trunk/mac/Version.xcconfig 2008-08-31 21:22:28 UTC (rev 3389) +++ hugin/trunk/mac/Version.xcconfig 2008-09-01 02:26:44 UTC (rev 3390) @@ -1,14 +1,17 @@ -#include "SVN-rev.xcconfig" +//consider to be release unless otherwise specified +HUGIN_DEVELOPMENT_VERSION = 0 //set the SVN revision number manually -//HUGIN_WC_REVISION = 3000 +HUGIN_WC_REVISION = 9999 -//set or override the prerelease tag manually -//HUGIN_PRERELEASE_VERSION_TAG = -RC4 +//set the prerelease tag manually if beta release; comment out if version release +HUGIN_PRERELEASE_VERSION_TAG = -RC4 +//overrides above values if checked out from SVN +#include "../mac/SVN-rev.xcconfig" + HUGIN_VERSION_MAJOR = 0 HUGIN_VERSION_MINOR = 7 HUGIN_VERSION_PATCH = 0 - HUGIN_PACKAGE_VERSION = $(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)$(HUGIN_PRERELEASE_VERSION_TAG) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-09-12 02:59:08
|
Revision: 3410 http://hugin.svn.sourceforge.net/hugin/?rev=3410&view=rev Author: ippei Date: 2008-09-12 02:59:05 +0000 (Fri, 12 Sep 2008) Log Message: ----------- Mac: GCC4.2 and 64bit support; minor adjustments to the build scripts, loosen deployment stripping to avoid 64bit crash (symbol visibility conflict?). Expect general performance improvement with newer compiler. Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/complete-bundle.sh Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-09-12 02:59:05 UTC (rev 3410) @@ -4,6 +4,9 @@ REPOSITORY_ABSOLUTE_PATH = /PATH/TO/HUGIN/SOURCE/mac/ExternalPrograms/repository REPOSITORY_DIR = ./ExternalPrograms/repository +// GCC version can be 4.2 with Xcode 3.1 +//GCC_VERSION = 4.2 + // release architectures: RELEASE_ARCHS_32 = ppc i386 //RELEASE_ARCHS_64 = ppc64 x86_64 @@ -24,7 +27,7 @@ PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4 PER_ARCH_CFLAGS_i386 = -march=prescott -mtune=pentium-m -ftree-vectorize //PER_ARCH_CFLAGS_ppc64 = -mcpu=G5 -mtune=G5 -ftree-vectorize -//PER_ARCH_CFLAGS_x86_64 = -march=nocona -mtune=generic -ftree-vectorize +//PER_ARCH_CFLAGS_x86_64 = -march=core2 -mtune=core2 -ftree-vectorize // wxWidgets WX_MAJOR_VERSION = 2.8 @@ -35,4 +38,4 @@ // Boost Thread BOOST_VER = 1_36 -BOOST_THREAD_LIB = libboost_thread-xgcc40-mt +BOOST_THREAD_LIB = libboost_thread Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2008-09-12 02:59:05 UTC (rev 3410) @@ -10,6 +10,9 @@ PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +export \ + CC="gcc-4.2" \ + CXX="g++-4.2"; mkdir -p $myREPOSITORYDIR; @@ -35,7 +38,7 @@ x64TARGET="x86_64-apple-darwin9" \ x64OSVERSION="10.5" \ x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - x64OPTIMIZE="-march=nocona -mtune=generic -ftree-vectorize" \ + x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ \ OTHERARGs="" \ OTHERMAKEARGs="--jobs=$PROCESSNUM"; Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2008-09-12 02:59:05 UTC (rev 3410) @@ -20,7 +20,6 @@ BOOST_VER="1_36" -BOOST_THREAD_LIB="libboost_thread-xgcc40-mt" # install headers @@ -54,6 +53,7 @@ for ARCH in $ARCHS do + rm -rf "stage-$ARCH"; mkdir -p "stage-$ARCH"; if [ $ARCH = "i386" -o $ARCH = "i686" ] @@ -88,38 +88,49 @@ SDKVRSION=$(echo $MACSDKDIR | sed 's/^[^1]*\([[:digit:]]*\.[[:digit:]]*\).*/\1/') + if [ $CXX = "" ] + then + boostTOOLSET="--toolset=darwin" + CXX="g++" + else + echo "using darwin : : $CXX ;" > ./TEMP-userconf.jam + boostTOOLSET="--user-config=./TEMP-userconf.jam" + fi # hack that sends extra arguments to g++ - $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR --toolset="darwin" -n stage \ + $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR $boostTOOLSET -n stage \ --with-thread \ variant=release link=static \ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ - | grep "^ " | sed 's/"//g' | sed s/g++/g++\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ + | grep "^ " | sed 's/"//g' | sed s/$CXX/$CXX\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ | while read COMMAND do echo "running command: $COMMAND" $COMMAND - done + done; # hack that sends extra arguments to g++ - $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR --toolset="darwin" -n stage \ + $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR $boostTOOLSET -n stage \ --with-thread \ variant=release \ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ - | grep "^ " | sed 's/"//g' | sed s/g++/g++\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ + | grep "^ " | sed 's/"//g' | sed s/$CXX/$CXX\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ | while read COMMAND do echo "running command: $COMMAND" $COMMAND - done + done; + + mv ./stage-$ARCH/lib/libboost_thread-*.dylib ./stage-$ARCH/lib/libboost_thread-$BOOST_VER.dylib + mv ./stage-$ARCH/lib/libboost_thread-*.a ./stage-$ARCH/lib/libboost_thread-$BOOST_VER.a done # merge libboost_thread -for liba in "lib/$BOOST_THREAD_LIB-$BOOST_VER.a" "lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib" +for liba in "lib/libboost_thread-$BOOST_VER.a" "lib/libboost_thread-$BOOST_VER.dylib" do if [ $NUMARCH -eq 1 ] @@ -148,14 +159,12 @@ done -if [ -f "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.a" ] +if [ -f "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.a" ] then - ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.a $REPOSITORYDIR/lib/$BOOST_THREAD_LIB.a; - ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread.a; + ln -sfn libboost_thread-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread.a; fi -if [ -f "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib" ] +if [ -f "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.dylib" ] then - install_name_tool -id "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib" "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib"; - ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.dylib $REPOSITORYDIR/lib/$BOOST_THREAD_LIB.dylib; - ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.dylib $REPOSITORYDIR/lib/libboost_thread.dylib; + install_name_tool -id "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.dylib" "$REPOSITORYDIR/lib/libboost_thread-$BOOST_VER.dylib"; + ln -sfn libboost_thread-$BOOST_VER.dylib $REPOSITORYDIR/lib/libboost_thread.dylib; fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/ExternalPrograms/scripts/enblend31.sh 2008-09-12 02:59:05 UTC (rev 3410) @@ -82,6 +82,10 @@ -e 's/rpl_malloc/malloc/' \ "./config.h-copy" > "./config.h"; + # well, I prefer -O2 + mv src/Makefile src/Makefile.copy + sed 's/-O3/-O2/g' src/Makefile.copy > src/Makefile + make clean; make $OTHERMAKEARGs all; make install; @@ -114,11 +118,7 @@ done -# strip only 32bit for now; it appears one of our 64bit library gets namespace wrong. -for ARCH in i386 i686 ppc ppc750 ppc7400 +for program in bin/enblend bin/enfuse do - for program in bin/enblend bin/enfuse - do - strip -arch $ARCH "$REPOSITORYDIR/$program" - done + strip -x "$REPOSITORYDIR/$program" done Modified: hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/ExternalPrograms/scripts/ilmbase.sh 2008-09-12 02:59:05 UTC (rev 3410) @@ -95,6 +95,16 @@ mv "libtool" "libtool-bk"; sed -e "s/-dynamiclib/-dynamiclib -arch $ARCH -isysroot $(echo $MACSDKDIR | sed 's/\//\\\//g')/g" "libtool-bk" > "libtool"; + #hack for apple-gcc 4.2 + if [ $CC != "" ] + then + for dir in Half Iex IlmThread Imath + do + mv $dir/Makefile $dir/Makefile.bk + sed 's/-Wno-long-double//g' $dir/Makefile.bk > $dir/Makefile + done + fi + make clean; make $OTHERMAKEARGs all; make install; Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2008-09-12 02:59:05 UTC (rev 3410) @@ -20,7 +20,7 @@ -PNGVER="1.2.30" +PNGVER="1.2.31" # init @@ -40,13 +40,18 @@ # patch # makefile.darwin -if [ `uname -r | grep 9.` ] -then # hack for leopard; libpng bug #2009836 +# includes hack for libpng bug #2009836 +if [ $CC != "" ] +then sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ - -e 's/_version \$(PNGVER)/_version 1.2.29/g' \ + -e "s/CC=cc/CC=$CC/" \ + -e 's/_version \$(PNGVER)/_version \$(PNGMIN)/g' \ scripts/makefile.darwin > makefile; else - sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' scripts/makefile.darwin > makefile; + sed -e 's/-dynamiclib/-dynamiclib \$\(GCCLDFLAGS\)/g' \ + -e 's/CC=cc/CC=gcc/' \ + -e 's/_version \$(PNGVER)/_version \$(PNGMIN)/g' \ + scripts/makefile.darwin > makefile; fi # pngconf.h @@ -109,7 +114,7 @@ # merge libpng -for liba in lib/libpng12.a lib/libpng12.0.$PNGVER.dylib lib/libpng.3.$PNGVER.dylib +for liba in lib/libpng12.a lib/libpng12.12.$PNGVER.dylib lib/libpng.3.$PNGVER.dylib do if [ $NUMARCH -eq 1 ] @@ -143,11 +148,11 @@ ln -sfn libpng12.a $REPOSITORYDIR/lib/libpng.a; fi -if [ -f "$REPOSITORYDIR/lib/libpng12.0.$PNGVER.dylib" ] +if [ -f "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" ] then - install_name_tool -id "$REPOSITORYDIR/lib/libpng12.0.dylib" "$REPOSITORYDIR/lib/libpng12.0.$PNGVER.dylib" - ln -sfn libpng12.0.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.0.dylib; - ln -sfn libpng12.0.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.dylib; + install_name_tool -id "$REPOSITORYDIR/lib/libpng12.1.dylib" "$REPOSITORYDIR/lib/libpng12.12.$PNGVER.dylib" + ln -sfn libpng12.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.12.dylib; + ln -sfn libpng12.$PNGVER.dylib $REPOSITORYDIR/lib/libpng12.dylib; fi if [ -f "$REPOSITORYDIR/lib/libpng.3.$PNGVER.dylib" ] then Modified: hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh 2008-09-12 02:59:05 UTC (rev 3410) @@ -101,6 +101,16 @@ mv "libtool" "libtool-bk"; sed -e "s/-dynamiclib/-dynamiclib -arch $ARCH -isysroot $(echo $MACSDKDIR | sed 's/\//\\\//g')/g" "libtool-bk" > "libtool"; + #hack for apple-gcc 4.2 + if [ $CC != "" ] + then + for dir in IlmImf exrenvmap exrheader exrmakepreview exrmaketiled exrstdattr + do + mv $dir/Makefile $dir/Makefile.bk + sed 's/-Wno-long-double//g' $dir/Makefile.bk > $dir/Makefile + done + fi + make clean; make $OTHERMAKEARGs all; make install; Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-09-12 02:59:05 UTC (rev 3410) @@ -4604,7 +4604,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi"; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi"; showEnvVarsInLog = 0; }; 5710465D0D25F490006A3C69 /* Complete Embedding */ = { @@ -4691,7 +4691,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi"; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi"; showEnvVarsInLog = 0; }; 579374850D47E7E500A52730 /* Copy ExifTool */ = { @@ -5718,7 +5718,7 @@ GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_PASCAL_STRINGS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -5743,7 +5743,7 @@ SEPARATE_STRIP = YES; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; - STRIP_STYLE = all; + STRIP_STYLE = "non-global"; WARNING_CFLAGS = "-Wall"; WX_ARCH = "$(RELEASE_ARCHS_32)"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)"; @@ -5764,13 +5764,14 @@ COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; DEBUG_MACRO = ""; + DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).0"; DYLIB_CURRENT_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)"; GCC_CW_ASM_SYNTAX = NO; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_PASCAL_STRINGS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 2; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -5795,7 +5796,7 @@ SEPARATE_STRIP = YES; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = YES; - STRIP_STYLE = all; + STRIP_STYLE = "non-global"; WX_ARCH = "$(RELEASE_ARCHS_32)"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)"; WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-$(WX_MAJOR_VERSION)"; @@ -5895,7 +5896,6 @@ "$(inherited)", ); INFOPLIST_FILE = "../mac/nona_gui-Info.plist"; - INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -6128,7 +6128,6 @@ 576900B00D24D29300A6AD01 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - DEPLOYMENT_POSTPROCESSING = YES; HEADER_SEARCH_PATHS = ( ../src/foreign, ../src/foreign/vigra, @@ -6138,7 +6137,6 @@ INFOPLIST_FILE = "../mac/hugin_base-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = HuginBase; - STRIP_INSTALLED_PRODUCT = NO; }; name = Release; }; @@ -6169,6 +6167,7 @@ INSTALL_PATH = "@executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = HuginBaseWx; + STRIP_INSTALLED_PRODUCT = NO; }; name = Debug; }; @@ -6198,6 +6197,7 @@ INSTALL_PATH = "@executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = HuginBaseWx; + STRIP_INSTALLED_PRODUCT = NO; }; name = Development; }; @@ -6205,7 +6205,6 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(WX_ARCH)"; - DEPLOYMENT_POSTPROCESSING = YES; GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -6228,7 +6227,6 @@ INSTALL_PATH = "@executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = HuginBaseWx; - STRIP_INSTALLED_PRODUCT = NO; }; name = Release; }; @@ -6256,7 +6254,6 @@ "$(inherited)", ); INFOPLIST_FILE = "../mac/hugin_stitch_project-Info.plist"; - INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -6289,7 +6286,6 @@ "$(inherited)", ); INFOPLIST_FILE = "../mac/hugin_stitch_project-Info.plist"; - INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -6322,7 +6318,6 @@ "$(inherited)", ); INFOPLIST_FILE = "../mac/hugin_stitch_project-Info.plist"; - INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -6426,11 +6421,9 @@ 5769FE3E0D24CFED00A6AD01 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - DEPLOYMENT_POSTPROCESSING = YES; INFOPLIST_FILE = "../mac/vigra_impex-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = HuginVigraImpex; - STRIP_INSTALLED_PRODUCT = NO; USER_HEADER_SEARCH_PATHS = "../src/foreign/vigra $(inherited)"; }; name = Release; @@ -6471,7 +6464,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_PASCAL_STRINGS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -6499,7 +6492,7 @@ SEPARATE_STRIP = YES; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; - STRIP_STYLE = all; + STRIP_STYLE = "non-global"; WARNING_CFLAGS = "-Wall"; WX_ARCH = "$(NATIVE_ARCH)"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSION)"; @@ -6937,7 +6930,6 @@ "$(inherited)", ); INFOPLIST_FILE = "../mac/Hugin-Info.plist"; - INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -6970,7 +6962,6 @@ "$(inherited)", ); INFOPLIST_FILE = "../mac/Hugin-Info.plist"; - INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -7003,7 +6994,6 @@ "$(inherited)", ); INFOPLIST_FILE = "../mac/Hugin-Info.plist"; - INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2008-09-09 22:56:36 UTC (rev 3409) +++ hugin/trunk/mac/complete-bundle.sh 2008-09-12 02:59:05 UTC (rev 3410) @@ -10,7 +10,7 @@ App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libpano13 libboost_thread $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat" +libs="libwx_macu-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat" binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2008-11-09 19:05:02
|
Revision: 3536 http://hugin.svn.sourceforge.net/hugin/?rev=3536&view=rev Author: harryvanderwolf Date: 2008-11-09 19:04:54 +0000 (Sun, 09 Nov 2008) Log Message: ----------- Hugin XCode project modified to support at least the OpenGL fast preview. Need to work on celeste model and PTBatcher(Gui) Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/complete-bundle.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-11-08 22:25:21 UTC (rev 3535) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-11-09 19:04:54 UTC (rev 3536) @@ -229,7 +229,6 @@ 5731CA840D55FB1B00605D22 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; 5731CA850D55FB1B00605D22 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; 5731CA8A0D55FB7D00605D22 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; - 5731CA8B0D55FB7D00605D22 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; 5731CA8F0D56055B00605D22 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 5731CA900D56057A00605D22 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 5739AEC40D251B51000DBBF3 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; @@ -611,7 +610,6 @@ 576EDDAC0C3FFF820076A417 /* PTOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA60C3FFF820076A417 /* PTOptimizer.h */; }; 576EDDAD0C3FFF820076A417 /* PhotometricOptimizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA70C3FFF820076A417 /* PhotometricOptimizer.cpp */; }; 576EDDAE0C3FFF820076A417 /* PhotometricOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA80C3FFF820076A417 /* PhotometricOptimizer.h */; }; - 57701A7C0E5B038100E5026B /* autopano-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 57701A750E5B036A00E5026B /* autopano-complete-mac.sh */; }; 5771F4DD0C2FEE0900736343 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DA0C2FEE0900736343 /* exif.cpp */; }; 5771F4DE0C2FEE0900736343 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DC0C2FEE0900736343 /* jpgfile.cpp */; }; 5771F5EF0C3007F300736343 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F5EC0C3007F300736343 /* utils.cpp */; }; @@ -685,15 +683,6 @@ 57A6869D0D567BFB00F215C4 /* RunStitchPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57A686960D5677F900F215C4 /* RunStitchPanel.cpp */; }; 57A6869E0D567BFB00F215C4 /* RunStitchPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 57A686970D5677F900F215C4 /* RunStitchPanel.h */; }; 57AC372B0D2BE6340086D348 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 57AC372C0D2BE6340086D348 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; - 57AC372D0D2BE6340086D348 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; - 57AC372E0D2BE6340086D348 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; - 57AC372F0D2BE6340086D348 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; - 57AC37300D2BE6340086D348 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; - 57AC37310D2BE6340086D348 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; - 57AC37320D2BE6340086D348 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; - 57AC37330D2BE6340086D348 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; - 57AC37340D2BE6340086D348 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; 57AC37350D2BE6340086D348 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; 57AC37360D2BE6340086D348 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; 57AC37370D2BE6340086D348 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; @@ -705,7 +694,6 @@ 57AC373D0D2BE6340086D348 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; 57AC37410D2BE68D0086D348 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; 57AC37430D2BE6950086D348 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; - 57AC37450D2BE6A00086D348 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; 57B88E5F0C36CD7E00EC6519 /* Panorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */; }; 57C313C00C37E04500E00EDC /* PTScriptParsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */; }; 57C4868E0C31299E002D79F1 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; }; @@ -850,6 +838,58 @@ 7332AEC00D8D4C45002BF5FF /* APImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE560D8D491B002BF5FF /* APImage.cpp */; }; 7332AEC30D8D4C45002BF5FF /* Descriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE790D8D491B002BF5FF /* Descriptor.cpp */; }; 7332AEC40D8D4C45002BF5FF /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; }; + 734BDF6E0EB8EC7B007EBA09 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF620EB8EC7B007EBA09 /* Batch.cpp */; }; + 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 */; }; + 734FBA5E0EB3A20500CD7122 /* GLViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3D0EB3A20500CD7122 /* GLViewer.cpp */; }; + 734FBA5F0EB3A20500CD7122 /* MeshManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3F0EB3A20500CD7122 /* MeshManager.cpp */; }; + 734FBA600EB3A20500CD7122 /* MeshRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA410EB3A20500CD7122 /* MeshRemapper.cpp */; }; + 734FBA610EB3A20500CD7122 /* OutputProjectionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA430EB3A20500CD7122 /* OutputProjectionInfo.cpp */; }; + 734FBA620EB3A20500CD7122 /* PreviewCropTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA450EB3A20500CD7122 /* PreviewCropTool.cpp */; }; + 734FBA630EB3A20500CD7122 /* PreviewDifferenceTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA470EB3A20500CD7122 /* PreviewDifferenceTool.cpp */; }; + 734FBA640EB3A20500CD7122 /* PreviewDragTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA490EB3A20500CD7122 /* PreviewDragTool.cpp */; }; + 734FBA650EB3A20500CD7122 /* PreviewIdentifyTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4B0EB3A20500CD7122 /* PreviewIdentifyTool.cpp */; }; + 734FBA660EB3A20500CD7122 /* PreviewPanoMaskTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4D0EB3A20500CD7122 /* PreviewPanoMaskTool.cpp */; }; + 734FBA670EB3A20500CD7122 /* PreviewTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4F0EB3A20500CD7122 /* PreviewTool.cpp */; }; + 734FBA680EB3A20500CD7122 /* PreviewToolHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA510EB3A20500CD7122 /* PreviewToolHelper.cpp */; }; + 734FBA690EB3A20500CD7122 /* TexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA530EB3A20500CD7122 /* TexCoordRemapper.cpp */; }; + 734FBA6A0EB3A20500CD7122 /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA550EB3A20500CD7122 /* TextureManager.cpp */; }; + 734FBA6B0EB3A20500CD7122 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; }; + 734FBA6C0EB3A20500CD7122 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; }; + 734FBA850EB3A40300CD7122 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; }; + 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 */; }; 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 */; }; @@ -890,6 +930,24 @@ 73E79F1F0D674EAC00C07126 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; 73E79F360D674F4600C07126 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; 73E79F370D674F4600C07126 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 73EAB5410E86CF130020D514 /* libboost_thread-xgcc40-mt-1_36.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */; }; + 73EAB5420E86CF130020D514 /* libboost_thread-xgcc40-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5270E86CF120020D514 /* libboost_thread-xgcc40-mt.a */; }; + 73EAB5430E86CF130020D514 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5280E86CF120020D514 /* libboost_thread.a */; }; + 73EAB5440E86CF130020D514 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; }; + 73EAB5450E86CF130020D514 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52A0E86CF120020D514 /* libexpat.a */; }; + 73EAB5460E86CF130020D514 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52B0E86CF120020D514 /* libHalf.a */; }; + 73EAB5470E86CF130020D514 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52C0E86CF120020D514 /* libIex.a */; }; + 73EAB5480E86CF130020D514 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52D0E86CF120020D514 /* libIlmImf.a */; }; + 73EAB5490E86CF130020D514 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52E0E86CF120020D514 /* libIlmThread.a */; }; + 73EAB54A0E86CF130020D514 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52F0E86CF120020D514 /* libImath.a */; }; + 73EAB54B0E86CF130020D514 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5300E86CF120020D514 /* libjpeg.a */; }; + 73EAB54C0E86CF130020D514 /* liblcms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5310E86CF120020D514 /* liblcms.a */; }; + 73EAB54D0E86CF130020D514 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5320E86CF120020D514 /* libpano13.a */; }; + 73EAB54E0E86CF130020D514 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5330E86CF120020D514 /* libpng.a */; }; + 73EAB54F0E86CF130020D514 /* libpng12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5340E86CF120020D514 /* libpng12.a */; }; + 73EAB5500E86CF130020D514 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5350E86CF120020D514 /* libtiff.a */; }; + 73EAB5510E86CF130020D514 /* libtiffxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5360E86CF120020D514 /* libtiffxx.a */; }; + 73EAB5520E86CF130020D514 /* libxmi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5370E86CF120020D514 /* libxmi.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1465,6 +1523,16 @@ name = "Copy Executable Files"; runOnlyForDeploymentPostprocessing = 0; }; + 739F84940EC75736004771D6 /* Copy libraries */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ../Libraries; + dstSubfolderSpec = 16; + files = ( + ); + name = "Copy libraries"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -2002,9 +2070,137 @@ 7332AE8E0D8D491C002BF5FF /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; 7332AE8F0D8D491C002BF5FF /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; 7332AEAE0D8D4986002BF5FF /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; }; + 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>"; }; + 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteGlobals.h; sourceTree = "<group>"; }; + 734FB8E10EB38B9400CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; + 734FB8E20EB38B9400CD7122 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; }; + 734FB8E30EB38B9400CD7122 /* Config.h.linux */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Config.h.linux; sourceTree = "<group>"; }; + 734FB8E40EB38B9400CD7122 /* Config.h.win32 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Config.h.win32; sourceTree = "<group>"; }; + 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContrastFilter.cpp; sourceTree = "<group>"; }; + 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContrastFilter.h; sourceTree = "<group>"; }; + 734FB8E80EB38B9400CD7122 /* celeste.model */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = celeste.model; sourceTree = "<group>"; }; + 734FB8E90EB38B9400CD7122 /* Gabor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Gabor.cpp; sourceTree = "<group>"; }; + 734FB8EA0EB38B9400CD7122 /* Gabor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Gabor.h; sourceTree = "<group>"; }; + 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GaborFilter.cpp; sourceTree = "<group>"; }; + 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GaborFilter.h; sourceTree = "<group>"; }; + 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GaborGlobal.h; sourceTree = "<group>"; }; + 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GaborJet.cpp; sourceTree = "<group>"; }; + 734FB8EF0EB38B9400CD7122 /* GaborJet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GaborJet.h; sourceTree = "<group>"; }; + 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageFile.cpp; sourceTree = "<group>"; }; + 734FB8F10EB38B9400CD7122 /* ImageFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageFile.h; sourceTree = "<group>"; }; + 734FB8F20EB38B9400CD7122 /* LICENCE_GABOR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENCE_GABOR; sourceTree = "<group>"; }; + 734FB8F30EB38B9400CD7122 /* LICENCE_LIBSVM */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENCE_LIBSVM; sourceTree = "<group>"; }; + 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LogPolar.cpp; sourceTree = "<group>"; }; + 734FB8F50EB38B9500CD7122 /* LogPolar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogPolar.h; sourceTree = "<group>"; }; + 734FB8F60EB38B9500CD7122 /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Main.cpp; sourceTree = "<group>"; }; + 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PGMImage.cpp; sourceTree = "<group>"; }; + 734FB8F80EB38B9500CD7122 /* PGMImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PGMImage.h; sourceTree = "<group>"; }; + 734FB8F90EB38B9500CD7122 /* svm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svm.cpp; sourceTree = "<group>"; }; + 734FB8FA0EB38B9500CD7122 /* svm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svm.h; sourceTree = "<group>"; }; + 734FB8FC0EB38B9500CD7122 /* CelesteTrain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CelesteTrain.cpp; sourceTree = "<group>"; }; + 734FB8FD0EB38B9500CD7122 /* CelesteTrain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteTrain.h; sourceTree = "<group>"; }; + 734FB8FE0EB38B9500CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; + 734FB8FF0EB38B9500CD7122 /* create_svm_data_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = create_svm_data_10_fold.pl; sourceTree = "<group>"; }; + 734FB9000EB38B9500CD7122 /* get_flickr_clouds.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = get_flickr_clouds.pl; sourceTree = "<group>"; }; + 734FB9010EB38B9500CD7122 /* parse_results.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = parse_results.pl; sourceTree = "<group>"; }; + 734FB9020EB38B9500CD7122 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; + 734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = svm_learn_class_10_fold.pl; sourceTree = "<group>"; }; + 734FB9040EB38B9500CD7122 /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utilities.cpp; sourceTree = "<group>"; }; + 734FB9050EB38B9500CD7122 /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; }; + 734FB9B20EB3929500CD7122 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = ../../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; }; + 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>"; }; + 734FBA3A0EB3A20500CD7122 /* GLPreviewFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLPreviewFrame.h; sourceTree = "<group>"; }; + 734FBA3B0EB3A20500CD7122 /* GLRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GLRenderer.cpp; sourceTree = "<group>"; }; + 734FBA3C0EB3A20500CD7122 /* GLRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLRenderer.h; sourceTree = "<group>"; }; + 734FBA3D0EB3A20500CD7122 /* GLViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GLViewer.cpp; sourceTree = "<group>"; }; + 734FBA3E0EB3A20500CD7122 /* GLViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLViewer.h; sourceTree = "<group>"; }; + 734FBA3F0EB3A20500CD7122 /* MeshManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MeshManager.cpp; sourceTree = "<group>"; }; + 734FBA400EB3A20500CD7122 /* MeshManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeshManager.h; sourceTree = "<group>"; }; + 734FBA410EB3A20500CD7122 /* MeshRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MeshRemapper.cpp; sourceTree = "<group>"; }; + 734FBA420EB3A20500CD7122 /* MeshRemapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeshRemapper.h; sourceTree = "<group>"; }; + 734FBA430EB3A20500CD7122 /* OutputProjectionInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OutputProjectionInfo.cpp; sourceTree = "<group>"; }; + 734FBA440EB3A20500CD7122 /* OutputProjectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputProjectionInfo.h; sourceTree = "<group>"; }; + 734FBA450EB3A20500CD7122 /* PreviewCropTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewCropTool.cpp; sourceTree = "<group>"; }; + 734FBA460EB3A20500CD7122 /* PreviewCropTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewCropTool.h; sourceTree = "<group>"; }; + 734FBA470EB3A20500CD7122 /* PreviewDifferenceTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewDifferenceTool.cpp; sourceTree = "<group>"; }; + 734FBA480EB3A20500CD7122 /* PreviewDifferenceTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewDifferenceTool.h; sourceTree = "<group>"; }; + 734FBA490EB3A20500CD7122 /* PreviewDragTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewDragTool.cpp; sourceTree = "<group>"; }; + 734FBA4A0EB3A20500CD7122 /* PreviewDragTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewDragTool.h; sourceTree = "<group>"; }; + 734FBA4B0EB3A20500CD7122 /* PreviewIdentifyTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewIdentifyTool.cpp; sourceTree = "<group>"; }; + 734FBA4C0EB3A20500CD7122 /* PreviewIdentifyTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewIdentifyTool.h; sourceTree = "<group>"; }; + 734FBA4D0EB3A20500CD7122 /* PreviewPanoMaskTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewPanoMaskTool.cpp; sourceTree = "<group>"; }; + 734FBA4E0EB3A20500CD7122 /* PreviewPanoMaskTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewPanoMaskTool.h; sourceTree = "<group>"; }; + 734FBA4F0EB3A20500CD7122 /* PreviewTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewTool.cpp; sourceTree = "<group>"; }; + 734FBA500EB3A20500CD7122 /* PreviewTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewTool.h; sourceTree = "<group>"; }; + 734FBA510EB3A20500CD7122 /* PreviewToolHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewToolHelper.cpp; sourceTree = "<group>"; }; + 734FBA520EB3A20500CD7122 /* PreviewToolHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewToolHelper.h; sourceTree = "<group>"; }; + 734FBA530EB3A20500CD7122 /* TexCoordRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TexCoordRemapper.cpp; sourceTree = "<group>"; }; + 734FBA540EB3A20500CD7122 /* TexCoordRemapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TexCoordRemapper.h; sourceTree = "<group>"; }; + 734FBA550EB3A20500CD7122 /* TextureManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureManager.cpp; sourceTree = "<group>"; }; + 734FBA560EB3A20500CD7122 /* TextureManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureManager.h; sourceTree = "<group>"; }; + 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VertexCoordRemapper.cpp; sourceTree = "<group>"; }; + 734FBA580EB3A20500CD7122 /* VertexCoordRemapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VertexCoordRemapper.h; sourceTree = "<group>"; }; + 734FBA590EB3A20500CD7122 /* ViewState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewState.cpp; sourceTree = "<group>"; }; + 734FBA5A0EB3A20500CD7122 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; + 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonaOptionsDialog.cpp; sourceTree = "<group>"; }; + 734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonaOptionsDialog.h; sourceTree = "<group>"; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; + 739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; + 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "../../ExternalPrograms/repository/lib/libwx_macu_gl-2.8.dylib"; sourceTree = SOURCE_ROOT; }; 73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; 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; }; + 73EAB5270E86CF120020D514 /* libboost_thread-xgcc40-mt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-xgcc40-mt.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-xgcc40-mt.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5280E86CF120020D514 /* libboost_thread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_thread.a; path = "../../ExternalPrograms/repository/lib-static/libboost_thread.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5290E86CF120020D514 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexiv2.a; path = "../../ExternalPrograms/repository/lib-static/libexiv2.a"; sourceTree = SOURCE_ROOT; }; + 73EAB52A0E86CF120020D514 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "../../ExternalPrograms/repository/lib-static/libexpat.a"; sourceTree = SOURCE_ROOT; }; + 73EAB52B0E86CF120020D514 /* libHalf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libHalf.a; path = "../../ExternalPrograms/repository/lib-static/libHalf.a"; sourceTree = SOURCE_ROOT; }; + 73EAB52C0E86CF120020D514 /* libIex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIex.a; path = "../../ExternalPrograms/repository/lib-static/libIex.a"; sourceTree = SOURCE_ROOT; }; + 73EAB52D0E86CF120020D514 /* libIlmImf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmImf.a; path = "../../ExternalPrograms/repository/lib-static/libIlmImf.a"; sourceTree = SOURCE_ROOT; }; + 73EAB52E0E86CF120020D514 /* libIlmThread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmThread.a; path = "../../ExternalPrograms/repository/lib-static/libIlmThread.a"; sourceTree = SOURCE_ROOT; }; + 73EAB52F0E86CF120020D514 /* libImath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libImath.a; path = "../../ExternalPrograms/repository/lib-static/libImath.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5300E86CF120020D514 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../ExternalPrograms/repository/lib-static/libjpeg.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5310E86CF120020D514 /* liblcms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblcms.a; path = "../../ExternalPrograms/repository/lib-static/liblcms.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5320E86CF120020D514 /* libpano13.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano13.a; path = "../../ExternalPrograms/repository/lib-static/libpano13.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5330E86CF120020D514 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../ExternalPrograms/repository/lib-static/libpng.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5340E86CF120020D514 /* libpng12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng12.a; path = "../../ExternalPrograms/repository/lib-static/libpng12.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5350E86CF120020D514 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = "../../ExternalPrograms/repository/lib-static/libtiff.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5360E86CF120020D514 /* libtiffxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiffxx.a; path = "../../ExternalPrograms/repository/lib-static/libtiffxx.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5370E86CF120020D514 /* libxmi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxmi.a; path = "../../ExternalPrograms/repository/lib-static/libxmi.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5390E86CF130020D514 /* exiv2.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = exiv2.pc; sourceTree = "<group>"; }; + 73EAB53A0E86CF130020D514 /* IlmBase.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IlmBase.pc; sourceTree = "<group>"; }; + 73EAB53B0E86CF130020D514 /* OpenEXR.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenEXR.pc; sourceTree = "<group>"; }; + 73EAB5400E86CF130020D514 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2319,18 +2515,7 @@ files = ( 57AC372B0D2BE6340086D348 /* libz.dylib in Frameworks */, 5731CA900D56057A00605D22 /* libiconv.dylib in Frameworks */, - 57AC37450D2BE6A00086D348 /* libboost_thread.dylib in Frameworks */, - 57AC372C0D2BE6340086D348 /* libpng.dylib in Frameworks */, - 57AC372D0D2BE6340086D348 /* libtiff.dylib in Frameworks */, - 57AC372E0D2BE6340086D348 /* libjpeg.dylib in Frameworks */, - 57AC372F0D2BE6340086D348 /* libIex.dylib in Frameworks */, - 57AC37300D2BE6340086D348 /* libIlmThread.dylib in Frameworks */, - 57AC37310D2BE6340086D348 /* libIlmImf.dylib in Frameworks */, - 57AC37320D2BE6340086D348 /* libImath.dylib in Frameworks */, - 57AC37330D2BE6340086D348 /* libHalf.dylib in Frameworks */, - 57AC37340D2BE6340086D348 /* libpano13.dylib in Frameworks */, 5731CA8A0D55FB7D00605D22 /* libexiv2.a in Frameworks */, - 5731CA8B0D55FB7D00605D22 /* libexpat.dylib in Frameworks */, 57AC37350D2BE6340086D348 /* libhugin_jhead.a in Frameworks */, 57AC37360D2BE6340086D348 /* libhugin_vigra_impex.a in Frameworks */, 57AC37370D2BE6340086D348 /* libhugin_utils.a in Frameworks */, @@ -2342,6 +2527,24 @@ 57AC373D0D2BE6340086D348 /* libhugin_levmar.a in Frameworks */, 57AC37430D2BE6950086D348 /* libhugin_nona.a in Frameworks */, 57AC37410D2BE68D0086D348 /* libhugin_math.a in Frameworks */, + 73EAB5410E86CF130020D514 /* libboost_thread-xgcc40-mt-1_36.a in Frameworks */, + 73EAB5420E86CF130020D514 /* libboost_thread-xgcc40-mt.a in Frameworks */, + 73EAB5430E86CF130020D514 /* libboost_thread.a in Frameworks */, + 73EAB5440E86CF130020D514 /* libexiv2.a in Frameworks */, + 73EAB5450E86CF130020D514 /* libexpat.a in Frameworks */, + 73EAB5460E86CF130020D514 /* libHalf.a in Frameworks */, + 73EAB5470E86CF130020D514 /* libIex.a in Frameworks */, + 73EAB5480E86CF130020D514 /* libIlmImf.a in Frameworks */, + 73EAB5490E86CF130020D514 /* libIlmThread.a in Frameworks */, + 73EAB54A0E86CF130020D514 /* libImath.a in Frameworks */, + 73EAB54B0E86CF130020D514 /* libjpeg.a in Frameworks */, + 73EAB54C0E86CF130020D514 /* liblcms.a in Frameworks */, + 73EAB54D0E86CF130020D514 /* libpano13.a in Frameworks */, + 73EAB54E0E86CF130020D514 /* libpng.a in Frameworks */, + 73EAB54F0E86CF130020D514 /* libpng12.a in Frameworks */, + 73EAB5500E86CF130020D514 /* libtiff.a in Frameworks */, + 73EAB5510E86CF130020D514 /* libtiffxx.a in Frameworks */, + 73EAB5520E86CF130020D514 /* libxmi.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2355,6 +2558,7 @@ 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 */, @@ -2370,6 +2574,10 @@ 576901EC0D24D95100A6AD01 /* HuginBase.framework in Frameworks */, 576901ED0D24D95100A6AD01 /* HuginBaseWx.framework in Frameworks */, 5731C7820D553C3D00605D22 /* libhugin_jhead.a 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 */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2391,6 +2599,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 734BDF590EB8EC19007EBA09 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 734FB8CE0EB38AB600CD7122 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C958F90DA2C9DB00E19110 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -2765,6 +2987,9 @@ 5745FBE5094E1C4700E6B672 /* repository */ = { isa = PBXGroup; children = ( + 734FB9B20EB3929500CD7122 /* libGLEW.a */, + 734FB9B30EB3929500CD7122 /* libGLEW.dylib */, + 73EAB5250E86CEA90020D514 /* lib-static */, 570898E30D4CB635008949E7 /* gnumake */, 5769F7A10D239D6A00A6AD01 /* PTmender */, 5769F79F0D239D6A00A6AD01 /* PTblender */, @@ -2783,6 +3008,7 @@ 577786110BF347B80041F8FF /* libIlmThread.dylib */, 577786180BF348E90041F8FF /* libHalf.dylib */, 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */, + 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */, 5731C4920D5532D400605D22 /* libexpat.dylib */, 5731C4910D5532D400605D22 /* libexiv2.a */, 57452CC1094E4EC500E6B672 /* include */, @@ -2816,6 +3042,7 @@ 5749F84D067B601A00A6EDD4 /* Mac OS SDK */ = { isa = PBXGroup; children = ( + 739F846B0EC75402004771D6 /* OpenGL.framework */, 5749FA9B067B80F000A6EDD4 /* Carbon.framework */, 57989595068E2FEC009F90BF /* libpthread.dylib */, 57989581068E2FD7009F90BF /* libiconv.dylib */, @@ -3137,6 +3364,8 @@ 579D36060C0EFD4D00BFC58C /* src */ = { isa = PBXGroup; children = ( + 734BDF610EB8EC7B007EBA09 /* PTBatcher */, + 734FB8DC0EB38B9400CD7122 /* celeste */, 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */, 57E122480D2BE45700743A93 /* hugin_version.h */, 5771F5E60C3007B300736343 /* hugin_base */, @@ -3146,6 +3375,7 @@ 5769F83C0D23A9F400A6AD01 /* deghosting */, 7332AE550D8D491B002BF5FF /* matchpoint */, 57D475B60D3CE0AB003CF158 /* translations */, + 734FBA2B0EB39F5100CD7122 /* PTBatcherGUI */, ); path = src; sourceTree = "<group>"; @@ -3322,6 +3552,44 @@ 57E330FE0C4A8859006AA781 /* hugin */ = { isa = PBXGroup; children = ( + 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */, + 734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */, + 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */, + 734FBA380EB3A20500CD7122 /* ChoosyRemapper.h */, + 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */, + 734FBA3A0EB3A20500CD7122 /* GLPreviewFrame.h */, + 734FBA3B0EB3A20500CD7122 /* GLRenderer.cpp */, + 734FBA3C0EB3A20500CD7122 /* GLRenderer.h */, + 734FBA3D0EB3A20500CD7122 /* GLViewer.cpp */, + 734FBA3E0EB3A20500CD7122 /* GLViewer.h */, + 734FBA3F0EB3A20500CD7122 /* MeshManager.cpp */, + 734FBA400EB3A20500CD7122 /* MeshManager.h */, + 734FBA410EB3A20500CD7122 /* MeshRemapper.cpp */, + 734FBA420EB3A20500CD7122 /* MeshRemapper.h */, + 734FBA430EB3A20500CD7122 /* OutputProjectionInfo.cpp */, + 734FBA440EB3A20500CD7122 /* OutputProjectionInfo.h */, + 734FBA450EB3A20500CD7122 /* PreviewCropTool.cpp */, + 734FBA460EB3A20500CD7122 /* PreviewCropTool.h */, + 734FBA470EB3A20500CD7122 /* PreviewDifferenceTool.cpp */, + 734FBA480EB3A20500CD7122 /* PreviewDifferenceTool.h */, + 734FBA490EB3A20500CD7122 /* PreviewDragTool.cpp */, + 734FBA4A0EB3A20500CD7122 /* PreviewDragTool.h */, + 734FBA4B0EB3A20500CD7122 /* PreviewIdentifyTool.cpp */, + 734FBA4C0EB3A20500CD7122 /* PreviewIdentifyTool.h */, + 734FBA4D0EB3A20500CD7122 /* PreviewPanoMaskTool.cpp */, + 734FBA4E0EB3A20500CD7122 /* PreviewPanoMaskTool.h */, + 734FBA4F0EB3A20500CD7122 /* PreviewTool.cpp */, + 734FBA500EB3A20500CD7122 /* PreviewTool.h */, + 734FBA510EB3A20500CD7122 /* PreviewToolHelper.cpp */, + 734FBA520EB3A20500CD7122 /* PreviewToolHelper.h */, + 734FBA530EB3A20500CD7122 /* TexCoordRemapper.cpp */, + 734FBA540EB3A20500CD7122 /* TexCoordRemapper.h */, + 734FBA550EB3A20500CD7122 /* TextureManager.cpp */, + 734FBA560EB3A20500CD7122 /* TextureManager.h */, + 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */, + 734FBA580EB3A20500CD7122 /* VertexCoordRemapper.h */, + 734FBA590EB3A20500CD7122 /* ViewState.cpp */, + 734FBA5A0EB3A20500CD7122 /* ViewState.h */, 57E331490C4A8859006AA781 /* config.h.tmpl */, 57E3314A0C4A8859006AA781 /* config_defaults.h */, 57E331000C4A8859006AA781 /* AnchorPositionCtrl.h */, @@ -3456,6 +3724,8 @@ 574B81880E4198FE00644179 /* hugin */, 5745FC05094E1D5400E6B672 /* External */, 573B8F3E067BA2EB00B7B355 /* Product */, + 734FB8D00EB38AB600CD7122 /* libceleste.dylib */, + 734BDF5B0EB8EC19007EBA09 /* PTBatcher */, ); sourceTree = "<group>"; }; @@ -3520,6 +3790,176 @@ path = test; sourceTree = "<group>"; }; + 734BDF610EB8EC7B007EBA09 /* PTBatcher */ = { + isa = PBXGroup; + 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 */, + ); + path = PTBatcher; + sourceTree = "<group>"; + }; + 734FB8DC0EB38B9400CD7122 /* celeste */ = { + isa = PBXGroup; + children = ( + 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */, + 734FB8DE0EB38B9400CD7122 /* Celeste.h */, + 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */, + 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */, + 734FB8E10EB38B9400CD7122 /* CMakeLists.txt */, + 734FB8E20EB38B9400CD7122 /* Config.h */, + 734FB8E30EB38B9400CD7122 /* Config.h.linux */, + 734FB8E40EB38B9400CD7122 /* Config.h.win32 */, + 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */, + 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */, + 734FB8E70EB38B9400CD7122 /* data */, + 734FB8E90EB38B9400CD7122 /* Gabor.cpp */, + 734FB8EA0EB38B9400CD7122 /* Gabor.h */, + 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */, + 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */, + 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */, + 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */, + 734FB8EF0EB38B9400CD7122 /* GaborJet.h */, + 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */, + 734FB8F10EB38B9400CD7122 /* ImageFile.h */, + 734FB8F20EB38B9400CD7122 /* LICENCE_GABOR */, + 734FB8F30EB38B9400CD7122 /* LICENCE_LIBSVM */, + 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */, + 734FB8F50EB38B9500CD7122 /* LogPolar.h */, + 734FB8F60EB38B9500CD7122 /* Main.cpp */, + 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */, + 734FB8F80EB38B9500CD7122 /* PGMImage.h */, + 734FB8F90EB38B9500CD7122 /* svm.cpp */, + 734FB8FA0EB38B9500CD7122 /* svm.h */, + 734FB8FB0EB38B9500CD7122 /* training */, + 734FB9040EB38B9500CD7122 /* Utilities.cpp */, + 734FB9050EB38B9500CD7122 /* Utilities.h */, + ); + path = celeste; + sourceTree = "<group>"; + }; + 734FB8E70EB38B9400CD7122 /* data */ = { + isa = PBXGroup; + children = ( + 734FB8E80EB38B9400CD7122 /* celeste.model */, + ); + path = data; + sourceTree = "<group>"; + }; + 734FB8FB0EB38B9500CD7122 /* training */ = { + isa = PBXGroup; + children = ( + 734FB8FC0EB38B9500CD7122 /* CelesteTrain.cpp */, + 734FB8FD0EB38B9500CD7122 /* CelesteTrain.h */, + 734FB8FE0EB38B9500CD7122 /* CMakeLists.txt */, + 734FB8FF0EB38B9500CD7122 /* create_svm_data_10_fold.pl */, + 734FB9000EB38B9500CD7122 /* get_flickr_clouds.pl */, + 734FB9010EB38B9500CD7122 /* parse_results.pl */, + 734FB9020EB38B9500CD7122 /* README */, + 734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */, + ); + path = training; + sourceTree = "<group>"; + }; + 734FBA2B0EB39F5100CD7122 /* PTBatcherGUI */ = { + isa = PBXGroup; + 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 */ = { + isa = PBXGroup; + children = ( + 73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */, + 73EAB5270E86CF120020D514 /* libboost_thread-xgcc40-mt.a */, + 73EAB5280E86CF120020D514 /* libboost_thread.a */, + 73EAB5290E86CF120020D514 /* libexiv2.a */, + 73EAB52A0E86CF120020D514 /* libexpat.a */, + 73EAB52B0E86CF120020D514 /* libHalf.a */, + 73EAB52C0E86CF120020D514 /* libIex.a */, + 73EAB52D0E86CF120020D514 /* libIlmImf.a */, + 73EAB52E0E86CF120020D514 /* libIlmThread.a */, + 73EAB52F0E86CF120020D514 /* libImath.a */, + 73EAB5300E86CF120020D514 /* libjpeg.a */, + 73EAB5310E86CF120020D514 /* liblcms.a */, + 73EAB5320E86CF120020D514 /* libpano13.a */, + 73EAB5330E86CF120020D514 /* libpng.a */, + 73EAB5340E86CF120020D514 /* libpng12.a */, + 73EAB5350E86CF120020D514 /* libtiff.a */, + 73EAB5360E86CF120020D514 /* libtiffxx.a */, + 73EAB5370E86CF120020D514 /* libxmi.a */, + 73EAB5380E86CF120020D514 /* pkgconfig */, + 73EAB53C0E86CF130020D514 /* wx */, + ); + name = "lib-static"; + sourceTree = "<group>"; + }; + 73EAB5380E86CF120020D514 /* pkgconfig */ = { + isa = PBXGroup; + children = ( + 73EAB5390E86CF130020D514 /* exiv2.pc */, + 73EAB53A0E86CF130020D514 /* IlmBase.pc */, + 73EAB53B0E86CF130020D514 /* OpenEXR.pc */, + ); + name = pkgconfig; + path = "../../ExternalPrograms/repository/lib-static/pkgconfig"; + sourceTree = SOURCE_ROOT; + }; + 73EAB53C0E86CF130020D514 /* wx */ = { + isa = PBXGroup; + children = ( + 73EAB53D0E86CF130020D514 /* include */, + ); + name = wx; + path = "../../ExternalPrograms/repository/lib-static/wx"; + sourceTree = SOURCE_ROOT; + }; + 73EAB53D0E86CF130020D514 /* include */ = { + isa = PBXGroup; + children = ( + 73EAB53E0E86CF130020D514 /* mac-unicode-release-2.8 */, + ); + path = include; + sourceTree = "<group>"; + }; + 73EAB53E0E86CF130020D514 /* mac-unicode-release-2.8 */ = { + isa = PBXGroup; + children = ( + 73EAB53F0E86CF130020D514 /* wx */, + ); + path = "mac-unicode-release-2.8"; + sourceTree = "<group>"; + }; + 73EAB53F0E86CF130020D514 /* wx */ = { + isa = PBXGroup; + children = ( + 73EAB5400E86CF130020D514 /* setup.h */, + ); + path = wx; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -3859,6 +4299,26 @@ ); 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; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -4298,6 +4758,7 @@ 57E3467B0C4A89B0006AA781 /* Sources */, 57E3467C0C4A89B0006AA781 /* Frameworks */, 576901E60D24D93300A6AD01 /* Copy Frameworks */, + 739F84940EC75736004771D6 /* Copy libraries */, 57E3467A0C4A89B0006AA781 /* Resources */, 571D8C740E2132DE006D0305 /* Patch XRC */, 57E347640C4A8F9F006AA781 /* Locale Script */, @@ -4367,6 +4828,39 @@ productReference = 7332AEAE0D8D4986002BF5FF /* matchpoint */; productType = "com.apple.product-type.tool"; }; + 734BDF5A0EB8EC19007EBA09 /* PTBatcher */ = { + isa = PBXNativeTarget; + buildConfigurationList = 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher" */; + buildPhases = ( + 734BDF580EB8EC19007EBA09 /* Sources */, + 734BDF590EB8EC19007EBA09 /* Frameworks */, + ); + buildRules = ( ... [truncated message content] |
From: <har...@us...> - 2008-11-10 17:25:13
|
Revision: 3541 http://hugin.svn.sourceforge.net/hugin/?rev=3541&view=rev Author: harryvanderwolf Date: 2008-11-10 17:25:05 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Ugly hack to get correct celeste.dylib into bundle Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/complete-bundle.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-11-10 14:28:22 UTC (rev 3540) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-11-10 17:25:05 UTC (rev 3541) @@ -888,8 +888,51 @@ 734FBA6B0EB3A20500CD7122 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; }; 734FBA6C0EB3A20500CD7122 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; }; 734FBA850EB3A40300CD7122 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; }; + 739CADC80EC86F44002FD3AF /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; }; + 739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; }; + 739CADCA0EC86F44002FD3AF /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; }; + 739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; }; + 739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; }; + 739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; }; + 739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; }; + 739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; }; + 739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; }; + 739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; }; + 739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; }; + 739CADD30EC86F44002FD3AF /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; }; + 739CADD40EC86F44002FD3AF /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; }; + 739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; }; + 739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; }; + 739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; }; + 739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; }; + 739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; }; + 739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; }; + 739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; }; + 739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; }; + 739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; }; + 739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; }; + 739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; }; + 739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; }; 739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; }; 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; + 739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 739F84D10EC77EB6004771D6 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739F84D20EC77EB6004771D6 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739F84D30EC77EB6004771D6 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 739F84D40EC77EB6004771D6 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; + 739F84D50EC77EB6004771D6 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 739F84D60EC77EB6004771D6 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 739F84D70EC77EB6004771D6 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 739F84D80EC77EB6004771D6 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 739F84D90EC77EB6004771D6 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 739F84DA0EC77EB6004771D6 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 739F84DB0EC77EB6004771D6 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 739F84DC0EC77EB6004771D6 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 739F84DD0EC77EB6004771D6 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 739F84DE0EC77EB6004771D6 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; + 739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; 73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; 73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; @@ -1441,6 +1484,20 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; + 739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 739F84FF0EC7803F004771D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; 73C958F60DA2C9DB00E19110 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1526,9 +1583,10 @@ 739F84940EC75736004771D6 /* Copy libraries */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = ../Libraries; - dstSubfolderSpec = 16; + dstPath = ""; + dstSubfolderSpec = 7; files = ( + 739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */, ); name = "Copy libraries"; runOnlyForDeploymentPostprocessing = 0; @@ -2175,6 +2233,9 @@ 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonaOptionsDialog.cpp; sourceTree = "<group>"; }; 734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonaOptionsDialog.h; sourceTree = "<group>"; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; + 739CADAA0EC86B30002FD3AF /* celeste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = celeste.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste Framework-Info.plist"; sourceTree = "<group>"; }; + 739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste2 Framework-Info.plist"; sourceTree = "<group>"; }; 739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "../../ExternalPrograms/repository/lib/libwx_macu_gl-2.8.dylib"; sourceTree = SOURCE_ROOT; }; 73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2603,6 +2664,24 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */, + 739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */, + 739F84D10EC77EB6004771D6 /* HuginBase.framework in Frameworks */, + 739F84D20EC77EB6004771D6 /* HuginVigraImpex.framework in Frameworks */, + 739F84D30EC77EB6004771D6 /* libboost_thread.dylib in Frameworks */, + 739F84D40EC77EB6004771D6 /* libexiv2.a in Frameworks */, + 739F84D50EC77EB6004771D6 /* libexpat.dylib in Frameworks */, + 739F84D60EC77EB6004771D6 /* libHalf.dylib in Frameworks */, + 739F84D70EC77EB6004771D6 /* libiconv.dylib in Frameworks */, + 739F84D80EC77EB6004771D6 /* libIex.dylib in Frameworks */, + 739F84D90EC77EB6004771D6 /* libIlmImf.dylib in Frameworks */, + 739F84DA0EC77EB6004771D6 /* libIlmThread.dylib in Frameworks */, + 739F84DB0EC77EB6004771D6 /* libImath.dylib in Frameworks */, + 739F84DC0EC77EB6004771D6 /* libjpeg.dylib in Frameworks */, + 739F84DD0EC77EB6004771D6 /* libpano13.dylib in Frameworks */, + 739F84DE0EC77EB6004771D6 /* libpng.dylib in Frameworks */, + 739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */, + 739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2613,6 +2692,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739CADA80EC86B30002FD3AF /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C958F90DA2C9DB00E19110 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3726,6 +3812,9 @@ 573B8F3E067BA2EB00B7B355 /* Product */, 734FB8D00EB38AB600CD7122 /* libceleste.dylib */, 734BDF5B0EB8EC19007EBA09 /* PTBatcher */, + 739CADAA0EC86B30002FD3AF /* celeste.framework */, + 739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */, + 739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */, ); sourceTree = "<group>"; }; @@ -4319,6 +4408,26 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739CADA50EC86B30002FD3AF /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 739CADC80EC86F44002FD3AF /* Celeste.h in Headers */, + 739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */, + 739CADCA0EC86F44002FD3AF /* Config.h in Headers */, + 739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */, + 739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */, + 739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */, + 739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */, + 739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */, + 739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */, + 739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */, + 739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */, + 739CADD30EC86F44002FD3AF /* svm.h in Headers */, + 739CADD40EC86F44002FD3AF /* Utilities.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -4838,6 +4947,8 @@ buildRules = ( ); dependencies = ( + 739F84FE0EC7803F004771D6 /* PBXTargetDependency */, + 739F85000EC7803F004771D6 /* PBXTargetDependency */, ); name = PTBatcher; productName = PTBatcher; @@ -4861,6 +4972,24 @@ productReference = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; productType = "com.apple.product-type.library.dynamic"; }; + 739CADA90EC86B30002FD3AF /* celeste Framework */ = { + isa = PBXNativeTarget; + buildConfigurationList = 739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */; + buildPhases = ( + 739CADA50EC86B30002FD3AF /* Headers */, + 739CADA60EC86B30002FD3AF /* Resources */, + 739CADA70EC86B30002FD3AF /* Sources */, + 739CADA80EC86B30002FD3AF /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "celeste Framework"; + productName = "celeste Framework"; + productReference = 739CADAA0EC86B30002FD3AF /* celeste.framework */; + productType = "com.apple.product-type.framework"; + }; 73C958F40DA2C9DB00E19110 /* tca_correct static */ = { isa = PBXNativeTarget; buildConfigurationList = 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */; @@ -4954,6 +5083,7 @@ 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */, 576900A90D24D29300A6AD01 /* hugin_base Framework */, 576900D70D24D32C00A6AD01 /* base_wx Framework */, + 739CADA90EC86B30002FD3AF /* celeste Framework */, 571046810D25F698006A3C69 /* bundled tools */, 5796FA730C4395CC006B7C6E /* nona dynamic */, 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */, @@ -5082,6 +5212,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739CADA60EC86B30002FD3AF /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -5711,6 +5848,24 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739CADA70EC86B30002FD3AF /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */, + 739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */, + 739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */, + 739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */, + 739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */, + 739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */, + 739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */, + 739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */, + 739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */, + 739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */, + 739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C958F70DA2C9DB00E19110 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6015,6 +6170,16 @@ target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; targetProxy = 7332AE950D8D4986002BF5FF /* PBXContainerItemProxy */; }; + 739F84FE0EC7803F004771D6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */; + }; + 739F85000EC7803F004771D6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 739F84FF0EC7803F004771D6 /* PBXContainerItemProxy */; + }; 73C958F50DA2C9DB00E19110 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57E3470D0C4A8E95006AA781 /* lib static */; @@ -7872,6 +8037,13 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; PREBINDING = NO; PRODUCT_NAME = PTBatcher; }; @@ -7887,6 +8059,13 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; PREBINDING = NO; PRODUCT_NAME = PTBatcher; }; @@ -7901,6 +8080,8 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( + ../src/hugin1/base_wx, + ../src/foreign/vigra, "$(REPOSITORY_DIR)/include", ../src/PTBatcher, "$(inherited)", @@ -7908,6 +8089,7 @@ "$(WX_INCLUDE_DIR_LIB)", ); INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = "$(inherited)"; PREBINDING = NO; PRODUCT_NAME = PTBatcher; ZERO_LINK = NO; @@ -7986,6 +8168,94 @@ }; name = Release; }; + 739CADAF0EC86B30002FD3AF /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + INFOPLIST_FILE = "celeste Framework-Info.plist"; + INSTALL_PATH = "$(HOME)/Library/Frameworks"; + OTHER_LDFLAGS = ( + "-framework", + Carbon, + ); + PREBINDING = NO; + PRODUCT_NAME = "celeste Framework"; + }; + name = Debug; + }; + 739CADB00EC86B30002FD3AF /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + INFOPLIST_FILE = "celeste Framework-Info.plist"; + INSTALL_PATH = "$(HOME)/Library/Frameworks"; + OTHER_LDFLAGS = ( + "-framework", + Carbon, + ); + PREBINDING = NO; + PRODUCT_NAME = "celeste Framework"; + }; + name = Development; + }; + 739CADB10EC86B30002FD3AF /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DYLIB_COMPATIBILITY_VERSION = 0; + DYLIB_CURRENT_VERSION = 0; + FRAMEWORK_VERSION = A; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + /usr/include, + "$(REPOSITORY_DIR)/include", + "$(inherited)", + ); + INFOPLIST_FILE = "celeste Framework-Info.plist"; + INSTALL_PATH = "@executable_path/../Frameworks"; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + OTHER_LDFLAGS = ( + "-flat_namespace", + "-framework", + Carbon, + "-undefined", + suppress, + ); + PREBINDING = NO; + PRODUCT_NAME = celeste; + USER_HEADER_SEARCH_PATHS = "$(inherited)"; + ZERO_LINK = NO; + }; + name = Release; + }; 73C959100DA2C9DB00E19110 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8517,6 +8787,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 739CADAF0EC86B30002FD3AF /* Debug */, + 739CADB00EC86B30002FD3AF /* Development */, + 739CADB10EC86B30002FD3AF /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2008-11-10 14:28:22 UTC (rev 3540) +++ hugin/trunk/mac/complete-bundle.sh 2008-11-10 17:25:05 UTC (rev 3541) @@ -10,7 +10,7 @@ App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat libceleste libGLEW" +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat libGLEW" binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*" @@ -23,6 +23,12 @@ cp -Rf $dylib_dir/$dylib.*ylib "$App/Contents/$dylib_install_loc/" done +# Temporary fix. Move libcelste.dylib from Resource to $dylib_install_loc +mv "$App/Contents/Resources/libceleste.dylib" "$App/Contents/$dylib_install_loc/" + +# We need to specify this line again, now with libceleste added +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat libceleste libGLEW" + #replace any "$old_install_name_dirname[/*]/" in install_name to "$new_install_name_dirname/" for exec_file in $binaries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2009-01-25 14:33:53
|
Revision: 3591 http://hugin.svn.sourceforge.net/hugin/?rev=3591&view=rev Author: harryvanderwolf Date: 2009-01-25 14:33:45 +0000 (Sun, 25 Jan 2009) Log Message: ----------- Minor XCode improvements; also adding first PtBatcherGui build Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/trunk/mac/celeste-Config.h Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-01-24 22:45:41 UTC (rev 3590) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-01-25 14:33:45 UTC (rev 3591) @@ -144,6 +144,29 @@ name = "configure hugin_version.h"; productName = "configure hugin_version.h"; }; + 733490BB0ECB2B99006309E3 /* Dylibs */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 733490C10ECB2BDA006309E3 /* Build configuration list for PBXAggregateTarget "Dylibs" */; + buildPhases = ( + ); + dependencies = ( + 73F800130F2CABCA00C22CB9 /* PBXTargetDependency */, + 733490C00ECB2BB9006309E3 /* PBXTargetDependency */, + ); + name = Dylibs; + productName = Dylibs; + }; + 73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 73F800110F2CAB7200C22CB9 /* Build configuration list for PBXAggregateTarget "Copy celeste config.h" */; + buildPhases = ( + 73F8000C0F2CAB5300C22CB9 /* ShellScript */, + ); + dependencies = ( + ); + name = "Copy celeste config.h"; + productName = "Copy celeste config.h"; + }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -819,6 +842,17 @@ 57FEE0FF0D28835400DAF7A4 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; 57FEE1000D28835400DAF7A4 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; 57FEE1010D28835400DAF7A4 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 732A11920EDA092E00EB5159 /* RunStitchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF6D0EB8EC7B007EBA09 /* RunStitchFrame.h */; }; + 732A11D60EDA987B00EB5159 /* Batch.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF630EB8EC7B007EBA09 /* Batch.h */; }; + 732A11D70EDA987B00EB5159 /* ProjectArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF660EB8EC7B007EBA09 /* ProjectArray.h */; }; + 732A11D80EDA98C500EB5159 /* BatchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2D0EB39F5100CD7122 /* BatchFrame.h */; }; + 732A11D90EDA98C500EB5159 /* DirTraverser.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2F0EB39F5100CD7122 /* DirTraverser.h */; }; + 732A11DA0EDA98C500EB5159 /* ProjectListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA310EB39F5100CD7122 /* ProjectListBox.h */; }; + 732A11DB0EDA98C500EB5159 /* PTBatcherGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA340EB39F5100CD7122 /* PTBatcherGUI.h */; }; + 732A11DC0EDA993500EB5159 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF620EB8EC7B007EBA09 /* Batch.cpp */; }; + 732A11DD0EDA993500EB5159 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; }; + 732A11DE0EDA993500EB5159 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; }; + 732A11DF0EDA998500EB5159 /* PTBatcherGUI_rc.rc in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA360EB39F5200CD7122 /* PTBatcherGUI_rc.rc */; }; 7332AE990D8D4986002BF5FF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 7332AE9C0D8D4986002BF5FF /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; 7332AE9D0D8D4986002BF5FF /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; @@ -888,6 +922,7 @@ 734FBA6B0EB3A20500CD7122 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; }; 734FBA6C0EB3A20500CD7122 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; }; 734FBA850EB3A40300CD7122 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; }; + 7358165D0ECA0D98009E94DC /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; }; 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; 7394A2020EC8A8F000DCEE85 /* celeste.model in Resources */ = {isa = PBXBuildFile; fileRef = 734FB8E80EB38B9400CD7122 /* celeste.model */; }; 739CADC80EC86F44002FD3AF /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; }; @@ -935,6 +970,31 @@ 739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; 739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; 739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; + 73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 73C0B5760ED024CE00A33108 /* hugin_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E122480D2BE45700743A93 /* hugin_version.h */; }; + 73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; + 73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 73C3C94C0ECCB40900A3089A /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 73C3C94D0ECCB40900A3089A /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; + 73C3C94E0ECCB40900A3089A /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; + 73C3C94F0ECCB40900A3089A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 73C3C9500ECCB4AA00A3089A /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */; }; + 73C3C9510ECCB4AA00A3089A /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */; }; + 73C3C9520ECCB4AA00A3089A /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */; }; 73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; 73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; @@ -1500,11 +1560,25 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; + 733490BF0ECB2BB9006309E3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 734FB8CF0EB38AB600CD7122; + remoteInfo = celeste; + }; + 733490C40ECB2BE9006309E3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 733490BB0ECB2B99006309E3; + remoteInfo = Dylibs; + }; 737E1C1F0EC9EC5100BA4D9B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* configure */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = configure; }; 739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */ = { @@ -1521,6 +1595,13 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; + 73C3C93C0ECCB3EB00A3089A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FC280D24A26400A6AD01; + remoteInfo = frameworks; + }; 73C958F60DA2C9DB00E19110 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1542,6 +1623,13 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; + 73F800120F2CABCA00C22CB9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 73F8000D0F2CAB5300C22CB9; + remoteInfo = "Copy celeste config.h"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1614,6 +1702,19 @@ name = "Copy libraries"; runOnlyForDeploymentPostprocessing = 0; }; + 73B9576B0EFADC4200CB2012 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */, + 73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */, + 73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -2255,13 +2356,16 @@ 734FBA5A0EB3A20500CD7122 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonaOptionsDialog.cpp; sourceTree = "<group>"; }; 734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonaOptionsDialog.h; sourceTree = "<group>"; }; + 7358165C0ECA0D98009E94DC /* CelesteDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteDebug.h; sourceTree = "<group>"; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; 737E1C180EC9EC0300BA4D9B /* hugin_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_config.h; sourceTree = "<group>"; }; - 739CADAA0EC86B30002FD3AF /* celeste Framework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "celeste Framework.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste Framework-Info.plist"; sourceTree = "<group>"; }; 739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste2 Framework-Info.plist"; sourceTree = "<group>"; }; 739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "../../ExternalPrograms/repository/lib/libwx_macu_gl-2.8.dylib"; sourceTree = SOURCE_ROOT; }; + 73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 73C3C9340ECCB39700A3089A /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; }; + 73C3C98E0ECCC9DE00A3089A /* celeste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = celeste.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; 73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; 73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-xgcc40-mt-1_36.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-xgcc40-mt-1_36.a"; sourceTree = SOURCE_ROOT; }; @@ -2724,6 +2828,31 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 73C3C9300ECCB39700A3089A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */, + 73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */, + 73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */, + 73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */, + 73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */, + 73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */, + 73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */, + 73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */, + 73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */, + 73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */, + 73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */, + 73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */, + 73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */, + 73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */, + 73C3C94C0ECCB40900A3089A /* libtiff.dylib in Frameworks */, + 73C3C94D0ECCB40900A3089A /* libwx_macu-2.8.dylib in Frameworks */, + 73C3C94E0ECCB40900A3089A /* libwx_macu_gl-2.8.dylib in Frameworks */, + 73C3C94F0ECCB40900A3089A /* libz.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C958F90DA2C9DB00E19110 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3858,10 +3987,12 @@ 573B8F3E067BA2EB00B7B355 /* Product */, 734FB8D00EB38AB600CD7122 /* libceleste.dylib */, 734BDF5B0EB8EC19007EBA09 /* PTBatcher */, - 739CADAA0EC86B30002FD3AF /* celeste Framework.framework */, 739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */, 739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */, 73EBC0900EC9E0B20068B821 /* celeste_standalone */, + 73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */, + 73C3C9340ECCB39700A3089A /* PTBatcherGUI-Info.plist */, + 73C3C98E0ECCC9DE00A3089A /* celeste.framework */, ); sourceTree = "<group>"; }; @@ -3948,6 +4079,7 @@ 734FB8DC0EB38B9400CD7122 /* celeste */ = { isa = PBXGroup; children = ( + 7358165C0ECA0D98009E94DC /* CelesteDebug.h */, 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */, 734FB8DE0EB38B9400CD7122 /* Celeste.h */, 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */, @@ -4475,11 +4607,27 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 73C0B5780ED024EC00A33108 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 732A11D80EDA98C500EB5159 /* BatchFrame.h in Headers */, + 732A11D90EDA98C500EB5159 /* DirTraverser.h in Headers */, + 732A11DA0EDA98C500EB5159 /* ProjectListBox.h in Headers */, + 732A11DB0EDA98C500EB5159 /* PTBatcherGUI.h in Headers */, + 732A11D60EDA987B00EB5159 /* Batch.h in Headers */, + 732A11D70EDA987B00EB5159 /* ProjectArray.h in Headers */, + 732A11920EDA092E00EB5159 /* RunStitchFrame.h in Headers */, + 73C0B5760ED024CE00A33108 /* hugin_version.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73EBC0CF0EC9E4A00068B821 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */, + 7358165D0ECA0D98009E94DC /* CelesteDebug.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4933,6 +5081,7 @@ buildRules = ( ); dependencies = ( + 733490C50ECB2BE9006309E3 /* PBXTargetDependency */, 576901B80D24D61C00A6AD01 /* PBXTargetDependency */, 5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */, ); @@ -5042,9 +5191,34 @@ ); name = "celeste Framework"; productName = "celeste Framework"; - productReference = 739CADAA0EC86B30002FD3AF /* celeste Framework.framework */; + productReference = 73C3C98E0ECCC9DE00A3089A /* celeste.framework */; productType = "com.apple.product-type.framework"; }; + 73C3C9310ECCB39700A3089A /* PTBatcherGUI */ = { + isa = PBXNativeTarget; + buildConfigurationList = 73C3C9380ECCB39900A3089A /* Build configuration list for PBXNativeTarget "PTBatcherGUI" */; + buildPhases = ( + 73C3C92E0ECCB39700A3089A /* Resources */, + 73C3C92F0ECCB39700A3089A /* Sources */, + 73C3C9300ECCB39700A3089A /* Frameworks */, + 73C0B5780ED024EC00A33108 /* Headers */, + 73B9576B0EFADC4200CB2012 /* Copy Frameworks */, + 73B9574D0EFAD9E500CB2012 /* Patch XRC */, + 73B957560EFADA8D00CB2012 /* Locale Script */, + 73B9575A0EFADAE100CB2012 /* Localise Help */, + 73B957490EFAD9C000CB2012 /* Complete Bundle */, + 73B957620EFADB6500CB2012 /* Complete Embedding */, + ); + buildRules = ( + ); + dependencies = ( + 73C3C93D0ECCB3EB00A3089A /* PBXTargetDependency */, + ); + name = PTBatcherGUI; + productName = PTBatcherGUI; + productReference = 73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */; + productType = "com.apple.product-type.application"; + }; 73C958F40DA2C9DB00E19110 /* tca_correct static */ = { isa = PBXNativeTarget; buildConfigurationList = 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */; @@ -5136,7 +5310,9 @@ 57FF7DA00E6917BF00553709 /* set svn revision */, 57FF7DC10E691A1800553709 /* configure hugin_version.h */, 57FF7DBB0E6919F400553709 /* copy hugin_config.h */, + 73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */, 57E3470D0C4A8E95006AA781 /* lib static */, + 733490BB0ECB2B99006309E3 /* Dylibs */, 5720E4720BD456CD00E63404 /* levmar */, 734FB8CF0EB38AB600CD7122 /* celeste */, 5749F8A2067B60CA00A6EDD4 /* jhead */, @@ -5164,6 +5340,7 @@ 5769F5FF0D23825700A6AD01 /* StitchProject */, 57E3467D0C4A89B0006AA781 /* Hugin */, 57525A240C54BC4400BF8096 /* Nona */, + 73C3C9310ECCB39700A3089A /* PTBatcherGUI */, 57E347330C4A8EED006AA781 /* tools */, 57D382D00E2369FC00445A37 /* nona static */, 57D382ED0E236A0800445A37 /* matchpoint static */, @@ -5294,6 +5471,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 73C3C92E0ECCB39700A3089A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -5475,6 +5659,93 @@ shellPath = /bin/sh; shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; }; + 73B957490EFAD9C000CB2012 /* Complete Bundle */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete Bundle"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi"; + showEnvVarsInLog = 0; + }; + 73B9574D0EFAD9E500CB2012 /* Patch XRC */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Patch XRC"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/patch-xrc.sh\nfi"; + }; + 73B957560EFADA8D00CB2012 /* Locale Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Locale Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localised.sh\nfi"; + showEnvVarsInLog = 0; + }; + 73B9575A0EFADAE100CB2012 /* Localise Help */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Localise Help"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localise-help.sh\nfi"; + showEnvVarsInLog = 0; + }; + 73B957620EFADB6500CB2012 /* Complete Embedding */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete Embedding"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-embed.sh\nfi"; + showEnvVarsInLog = 0; + }; + 73F8000C0F2CAB5300C22CB9 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -5941,6 +6212,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 73C3C92F0ECCB39700A3089A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 732A11DC0EDA993500EB5159 /* Batch.cpp in Sources */, + 732A11DF0EDA998500EB5159 /* PTBatcherGUI_rc.rc in Sources */, + 732A11DD0EDA993500EB5159 /* ProjectArray.cpp in Sources */, + 732A11DE0EDA993500EB5159 /* RunStitchFrame.cpp in Sources */, + 73C3C9500ECCB4AA00A3089A /* BatchFrame.cpp in Sources */, + 73C3C9510ECCB4AA00A3089A /* ProjectListBox.cpp in Sources */, + 73C3C9520ECCB4AA00A3089A /* PTBatcherGUI.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C958F70DA2C9DB00E19110 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6253,6 +6538,16 @@ target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; targetProxy = 7332AE950D8D4986002BF5FF /* PBXContainerItemProxy */; }; + 733490C00ECB2BB9006309E3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 734FB8CF0EB38AB600CD7122 /* celeste */; + targetProxy = 733490BF0ECB2BB9006309E3 /* PBXContainerItemProxy */; + }; + 733490C50ECB2BE9006309E3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 733490BB0ECB2B99006309E3 /* Dylibs */; + targetProxy = 733490C40ECB2BE9006309E3 /* PBXContainerItemProxy */; + }; 737E1C200EC9EC5100BA4D9B /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57C486290C3121E8002D79F1 /* configure */; @@ -6268,6 +6563,11 @@ target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; targetProxy = 739F84FF0EC7803F004771D6 /* PBXContainerItemProxy */; }; + 73C3C93D0ECCB3EB00A3089A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FC280D24A26400A6AD01 /* frameworks */; + targetProxy = 73C3C93C0ECCB3EB00A3089A /* PBXContainerItemProxy */; + }; 73C958F50DA2C9DB00E19110 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57E3470D0C4A8E95006AA781 /* lib static */; @@ -6283,6 +6583,11 @@ target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; targetProxy = 73E79F340D674EF400C07126 /* PBXContainerItemProxy */; }; + 73F800130F2CABCA00C22CB9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */; + targetProxy = 73F800120F2CABCA00C22CB9 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -8115,6 +8420,37 @@ }; name = Release; }; + 733490BC0ECB2B9B006309E3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = Dylibs; + }; + name = Debug; + }; + 733490BD0ECB2B9B006309E3 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = Dylibs; + }; + name = Development; + }; + 733490BE0ECB2B9B006309E3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = Dylibs; + ZERO_LINK = NO; + }; + name = Release; + }; 734BDF5D0EB8EC1A007EBA09 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8166,19 +8502,50 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = dwarf; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; + GCC_MODEL_TUNING = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); HEADER_SEARCH_PATHS = ( + ../src/PTBatcher, ../src/hugin1/base_wx, ../src/foreign/vigra, + ../src/foreign/vigra/vigra, + ../src/hugin_base/vigra_ext, + ../src/hugin_base/panodata, "$(REPOSITORY_DIR)/include", - ../src/PTBatcher, "$(inherited)", "$(WX_INCLUDE_DIR)", "$(WX_INCLUDE_DIR_LIB)", + "$(REPOSITORY_DIR)/include/OpenEXR", ); INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = "$(inherited)"; - PREBINDING = NO; + OTHER_CFLAGS = ( + "-I$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-2.8", + "-I$(REPOSITORY_DIR)/include/wx-2.8", + "-D_FILE_OFFSET_BITS=64", + "-D_LARGE_FILES", + "-D__WXMAC__", + ); + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_1)", + "$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_2)", + "$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_3)", + "$(OTHER_LDFLAGS_QUOTED_FOR_TARGET_4)", + "-dead-strip", + "-lwx_macu-2.8", + ); + OTHER_LDFLAGS_QUOTED_FOR_TARGET_1 = "\"$(REPOSITORY_DIR)/lib\""; + OTHER_LDFLAGS_QUOTED_FOR_TARGET_2 = "\"$(REPOSITORY_DIR)/include\""; + OTHER_LDFLAGS_QUOTED_FOR_TARGET_3 = "\"$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-2.8\""; + OTHER_LDFLAGS_QUOTED_FOR_TARGET_4 = "\"$(REPOSITORY_DIR)/include/wx-2.8\""; + PREBINDING = YES; PRODUCT_NAME = PTBatcher; ZERO_LINK = NO; }; @@ -8230,7 +8597,6 @@ HEADER_SEARCH_PATHS = ( ../src/foreign, ../src/foreign/vigra, - ../src/foreign/vigra/vigra, ../src/hugin_base, "$(REPOSITORY_DIR)/include", /usr/include, @@ -8247,7 +8613,7 @@ "-undefined", suppress, ); - PREBINDING = YES; + PREBINDING = NO; PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_NAME = celeste; PUBLIC_HEADERS_FOLDER_PATH = ""; @@ -8316,12 +8682,13 @@ DYLIB_CURRENT_VERSION = 0; FRAMEWORK_VERSION = A; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; + GCC_MODEL_TUNING = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = ( ../src/foreign, ../src/foreign/vigra, + ../src/foreign/vigra/vigra, ../src/hugin_base, /usr/include, "$(REPOSITORY_DIR)/include", @@ -8330,6 +8697,11 @@ INFOPLIST_FILE = "celeste Framework-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + LIBRARY_SEARCH_PATHS = ( + /usr/lib, + "$(value)", + "$(REPOSITORY_DIR)/lib", + ); OTHER_LDFLAGS = ( "-flat_namespace", "-framework", @@ -8344,6 +8716,126 @@ }; name = Release; }; + 73C3C9350ECCB39900A3089A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + INFOPLIST_FILE = "PTBatcherGUI-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ( + "-framework", + Carbon, + ); + PREBINDING = NO; + PRODUCT_NAME = PTBatcherGUI; + }; + name = Debug; + }; + 73C3C9360ECCB39900A3089A /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + INFOPLIST_FILE = "PTBatcherGUI-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ( + "-framework", + Carbon, + ); + PREBINDING = NO; + PRODUCT_NAME = PTBatcherGUI; + }; + name = Development; + }; + 73C3C9370ECCB39900A3089A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(WX_ARCH)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = NO; + GCC_DEBUGGING_SYMBOLS = default; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src, + ../src/hugin_base, + ../src/foreign, + ../src/foreign/vigra, + ../src/celeste, + "$(REPOSITORY_DIR)/include", + "$(REPOSITORY_DIR)/include/OpenEXR", + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + ../src/hugin1, + ); + INFOPLIST_FILE = "../mac/PTBatcherGUI-Info.plist"; + INSTALL_PATH = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + OTHER_LDFLAGS = ( + "-flat_namespace", + "-undefined", + suppress, + "-lwx_macu_gl-2.8", + "-lwx_macu-2.8", + ); + PREBINDING = YES; + PRODUCT_NAME = PTBatcherGUI; + STRIP_INSTALLED_PRODUCT = YES; + STRIP_STYLE = "non-global"; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + ZERO_LINK = NO; + }; + name = Release; + }; 73C959100DA2C9DB00E19110 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8530,6 +9022,37 @@ }; name = Release; }; + 73F8000E0F2CAB5300C22CB9 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "Copy celeste config.h"; + }; + name = Debug; + }; + 73F8000F0F2CAB5300C22CB9 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "Copy celeste config.h"; + }; + name = Development; + }; + 73F800100F2CAB5300C22CB9 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = "Copy celeste config.h"; + ZERO_LINK = NO; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -8933,6 +9456,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 733490C10ECB2BDA006309E3 /* Build configuration list for PBXAggregateTarget "Dylibs" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 733490BC0ECB2B9B006309E3 /* Debug */, + 733490BD0ECB2B9B006309E3 /* Development */, + 733490BE0ECB2B9B006309E3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -8963,6 +9496,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 73C3C9380ECCB39900A3089A /* Build configuration list for PBXNativeTarget "PTBatcherGUI" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 73C3C9350ECCB39900A3089A /* Debug */, + 73C3C9360ECCB39900A3089A /* Development */, + 73C3C9370ECCB39900A3089A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -8993,6 +9536,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 73F800110F2CAB7200C22CB9 /* Build configuration list for PBXAggregateTarget "Copy celeste config.h" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 73F8000E0F2CAB5300C22CB9 /* Debug */, + 73F8000F0F2CAB5300C22CB9 /* Development */, + 73F800100F2CAB5300C22CB9 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 57FC3AC10675E43600C3E0AC /* Project object */; Added: hugin/trunk/mac/celeste-Config.h =================================================================== --- hugin/trunk/mac/celeste-Config.h (rev 0) +++ hugin/trunk/mac/celeste-Config.h 2009-01-25 14:33:45 UTC (rev 3591) @@ -0,0 +1,4 @@ +#ifndef __CELESTE_CONFIG__ +#define __CELESTE_CONFIG__ + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2009-02-28 14:22:24
|
Revision: 3682 http://hugin.svn.sourceforge.net/hugin/?rev=3682&view=rev Author: ippei Date: 2009-02-28 13:31:12 +0000 (Sat, 28 Feb 2009) Log Message: ----------- Mac: compilation fixed for celeste and PTBatcherGUI. Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/complete-bundle.sh hugin/trunk/mac/copyExifTool.sh hugin/trunk/mac/patch-xrc.sh Added Paths: ----------- hugin/trunk/mac/PTBatcherGUI-Info.plist hugin/trunk/mac/celeste-Info.plist Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-02-28 12:40:28 UTC (rev 3681) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-02-28 13:31:12 UTC (rev 3682) @@ -144,29 +144,6 @@ name = "configure hugin_version.h"; productName = "configure hugin_version.h"; }; - 733490BB0ECB2B99006309E3 /* Dylibs */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 733490C10ECB2BDA006309E3 /* Build configuration list for PBXAggregateTarget "Dylibs" */; - buildPhases = ( - ); - dependencies = ( - 73F800130F2CABCA00C22CB9 /* PBXTargetDependency */, - 733490C00ECB2BB9006309E3 /* PBXTargetDependency */, - ); - name = Dylibs; - productName = Dylibs; - }; - 73F8000D0F2CAB5300C22CB9 /* Copy celeste config.h */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 73F800110F2CAB7200C22CB9 /* Build configuration list for PBXAggregateTarget "Copy celeste config.h" */; - buildPhases = ( - 73F8000C0F2CAB5300C22CB9 /* ShellScript */, - ); - dependencies = ( - ); - name = "Copy celeste config.h"; - productName = "Copy celeste config.h"; - }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -779,10 +756,106 @@ 57D3832B0E236B1D00445A37 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; 57D3832C0E236B1D00445A37 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 57D3832D0E236B1D00445A37 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; + 57D5093C0F5942FB00CCDCB5 /* CPImagesComboBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57D5093A0F5942F200CCDCB5 /* CPImagesComboBox.cpp */; }; + 57D50A390F595A6300CCDCB5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; + 57D50A3A0F595A6300CCDCB5 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; }; + 57D50A3B0F595A6300CCDCB5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 57D50A3C0F595A6300CCDCB5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 57D50A3D0F595A6300CCDCB5 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; + 57D50A3E0F595A6300CCDCB5 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 57D50A3F0F595A6300CCDCB5 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 57D50A400F595A6300CCDCB5 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 57D50A410F595A6300CCDCB5 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 57D50A420F595A6300CCDCB5 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; + 57D50A430F595A6300CCDCB5 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 57D50A440F595A6300CCDCB5 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 57D50A450F595A6300CCDCB5 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 57D50A460F595A6300CCDCB5 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 57D50A470F595A6300CCDCB5 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 57D50A480F595A6300CCDCB5 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 57D50A490F595A6300CCDCB5 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 57D50A4A0F595A6300CCDCB5 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 57D50A4B0F595A6300CCDCB5 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 57D50A4C0F595A6300CCDCB5 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 57D50A4E0F595A6300CCDCB5 /* nona in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5796FA950C4395CC006B7C6E /* nona */; }; + 57D50A4F0F595A6300CCDCB5 /* hugin_hdrmerge in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */; }; + 57D50A500F595A6300CCDCB5 /* enblend in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 570D581A082A9ED50030E768 /* enblend */; }; + 57D50A510F595A6300CCDCB5 /* enfuse in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F79E0D239D6A00A6AD01 /* enfuse */; }; + 57D50A520F595A6300CCDCB5 /* PTblender in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F79F0D239D6A00A6AD01 /* PTblender */; }; + 57D50A530F595A6300CCDCB5 /* PTmasker in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F7A00D239D6A00A6AD01 /* PTmasker */; }; + 57D50A540F595A6300CCDCB5 /* PTmender in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F7A10D239D6A00A6AD01 /* PTmender */; }; + 57D50A550F595A6300CCDCB5 /* PTroller in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F7A20D239D6A00A6AD01 /* PTroller */; }; + 57D50A560F595A6300CCDCB5 /* gnumake in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 570898E30D4CB635008949E7 /* gnumake */; }; + 57D50A580F595A6300CCDCB5 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 57D50A590F595A6300CCDCB5 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 57D50A5A0F595A6300CCDCB5 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 57D50A660F595AD500CCDCB5 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF620EB8EC7B007EBA09 /* Batch.cpp */; }; + 57D50A670F595AD500CCDCB5 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; }; + 57D50A680F595AD500CCDCB5 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; }; + 57D50A690F595AD500CCDCB5 /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */; }; + 57D50A6A0F595AD500CCDCB5 /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */; }; + 57D50A6B0F595AD500CCDCB5 /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */; }; + 57D50AC20F596D4900CCDCB5 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; }; + 57D50AC70F596D6900CCDCB5 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; + 57D50ADC0F596E3D00CCDCB5 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; }; + 57D50ADD0F596E3D00CCDCB5 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; }; + 57D50ADE0F596E3D00CCDCB5 /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; }; + 57D50ADF0F596E3D00CCDCB5 /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; }; + 57D50AE00F596E3D00CCDCB5 /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; }; + 57D50AE10F596E3D00CCDCB5 /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; }; + 57D50AE20F596E3D00CCDCB5 /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; }; + 57D50AE30F596E3D00CCDCB5 /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; }; + 57D50AE40F596E3D00CCDCB5 /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; }; + 57D50AE50F596E3D00CCDCB5 /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; }; + 57D50AE60F596E3D00CCDCB5 /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; }; + 57D50AE70F596E3D00CCDCB5 /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; }; + 57D50AE80F596E3D00CCDCB5 /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; }; + 57D50AE90F596E5300CCDCB5 /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; }; + 57D50AEA0F596E5300CCDCB5 /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; }; + 57D50AEB0F596E5300CCDCB5 /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; }; + 57D50AEC0F596E5300CCDCB5 /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; }; + 57D50AED0F596E5300CCDCB5 /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; }; + 57D50AEE0F596E5300CCDCB5 /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; }; + 57D50AEF0F596E5300CCDCB5 /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; }; + 57D50AF00F596E5300CCDCB5 /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; }; + 57D50AF10F596E5300CCDCB5 /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; }; + 57D50AF20F596E5300CCDCB5 /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; }; + 57D50AF30F596E5300CCDCB5 /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; }; + 57D50B060F59715000CCDCB5 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 57D50B3C0F5971A600CCDCB5 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F60EB38B9500CD7122 /* Main.cpp */; }; + 57D50B400F5971A600CCDCB5 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; + 57D50B410F5971A600CCDCB5 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 57D50B420F5971A600CCDCB5 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 57D50B430F5971A600CCDCB5 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 57D50B440F5971A600CCDCB5 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 57D50B450F5971A600CCDCB5 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 57D50B460F5971A600CCDCB5 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 57D50B470F5971A600CCDCB5 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 57D50B480F5971A600CCDCB5 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 57D50B490F5971A600CCDCB5 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 57D50B4A0F5971A600CCDCB5 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 57D50B4C0F5971A600CCDCB5 /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; + 57D50B4D0F5971A600CCDCB5 /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; }; + 57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libceleste.a */; }; + 57D50B610F59725E00CCDCB5 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; + 57D50B620F59725E00CCDCB5 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; + 57D50B630F59725E00CCDCB5 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; + 57D50B640F59725E00CCDCB5 /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; }; + 57D50B650F59725E00CCDCB5 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 57D50B660F59725E00CCDCB5 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; + 57D50B670F59725E00CCDCB5 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 57D50B680F59725E00CCDCB5 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 57D50B690F59725E00CCDCB5 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 57D50B6A0F59725E00CCDCB5 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; + 57D50B6B0F59725E00CCDCB5 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; + 57D50B6C0F59725E00CCDCB5 /* libhugin_app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhugin_app.a */; }; 57DB9BC10C454BA2004957C2 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; 57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; 57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; + 57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; }; + 57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; }; + 57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; 57E1225C0D2BE50700743A93 /* align_image_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5769F83B0D23A98400A6AD01 /* align_image_stack.cpp */; }; 57E346880C4A89E6006AA781 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331010C4A8859006AA781 /* AssistantPanel.cpp */; }; 57E3468A0C4A89E6006AA781 /* AutoCtrlPointCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */; }; @@ -842,17 +915,6 @@ 57FEE0FF0D28835400DAF7A4 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; 57FEE1000D28835400DAF7A4 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; 57FEE1010D28835400DAF7A4 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; - 732A11920EDA092E00EB5159 /* RunStitchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF6D0EB8EC7B007EBA09 /* RunStitchFrame.h */; }; - 732A11D60EDA987B00EB5159 /* Batch.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF630EB8EC7B007EBA09 /* Batch.h */; }; - 732A11D70EDA987B00EB5159 /* ProjectArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 734BDF660EB8EC7B007EBA09 /* ProjectArray.h */; }; - 732A11D80EDA98C500EB5159 /* BatchFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2D0EB39F5100CD7122 /* BatchFrame.h */; }; - 732A11D90EDA98C500EB5159 /* DirTraverser.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA2F0EB39F5100CD7122 /* DirTraverser.h */; }; - 732A11DA0EDA98C500EB5159 /* ProjectListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA310EB39F5100CD7122 /* ProjectListBox.h */; }; - 732A11DB0EDA98C500EB5159 /* PTBatcherGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FBA340EB39F5100CD7122 /* PTBatcherGUI.h */; }; - 732A11DC0EDA993500EB5159 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF620EB8EC7B007EBA09 /* Batch.cpp */; }; - 732A11DD0EDA993500EB5159 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; }; - 732A11DE0EDA993500EB5159 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; }; - 732A11DF0EDA998500EB5159 /* PTBatcherGUI_rc.rc in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA360EB39F5200CD7122 /* PTBatcherGUI_rc.rc */; }; 7332AE990D8D4986002BF5FF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 7332AE9C0D8D4986002BF5FF /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; 7332AE9D0D8D4986002BF5FF /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; @@ -876,33 +938,7 @@ 734BDF6F0EB8EC7B007EBA09 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */; }; 734BDF700EB8EC7B007EBA09 /* PTBatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF670EB8EC7B007EBA09 /* PTBatcher.cpp */; }; 734BDF710EB8EC7B007EBA09 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */; }; - 734FB9060EB38B9500CD7122 /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; }; - 734FB9070EB38B9500CD7122 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; }; - 734FB9080EB38B9500CD7122 /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; }; - 734FB9090EB38B9500CD7122 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; }; - 734FB90A0EB38B9500CD7122 /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; }; - 734FB90B0EB38B9500CD7122 /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; }; - 734FB90C0EB38B9500CD7122 /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; }; - 734FB90D0EB38B9500CD7122 /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; }; - 734FB90E0EB38B9500CD7122 /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; }; - 734FB90F0EB38B9500CD7122 /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; }; - 734FB9100EB38B9500CD7122 /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; }; - 734FB9110EB38B9500CD7122 /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; }; - 734FB9120EB38B9500CD7122 /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; }; - 734FB9130EB38B9500CD7122 /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; }; - 734FB9140EB38B9500CD7122 /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; }; - 734FB9150EB38B9500CD7122 /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; }; - 734FB9160EB38B9500CD7122 /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; }; - 734FB9170EB38B9500CD7122 /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; }; - 734FB9190EB38B9500CD7122 /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; }; - 734FB91A0EB38B9500CD7122 /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; }; - 734FB91B0EB38B9500CD7122 /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; }; - 734FB91C0EB38B9500CD7122 /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; }; - 734FB91F0EB38B9500CD7122 /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; }; - 734FB9200EB38B9500CD7122 /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; }; - 734FB9A70EB3914E00CD7122 /* libceleste.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; }; 734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB9B20EB3929500CD7122 /* libGLEW.a */; }; - 734FB9B50EB3929500CD7122 /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB9B30EB3929500CD7122 /* libGLEW.dylib */; }; 734FBA5B0EB3A20500CD7122 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */; }; 734FBA5C0EB3A20500CD7122 /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */; }; 734FBA5D0EB3A20500CD7122 /* GLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3B0EB3A20500CD7122 /* GLRenderer.cpp */; }; @@ -949,7 +985,6 @@ 739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; }; 739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; }; 739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; }; - 739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; }; 739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; }; 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; 739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; @@ -970,31 +1005,6 @@ 739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; 739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; 739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; - 73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; - 73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; - 73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; - 73C0B5760ED024CE00A33108 /* hugin_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E122480D2BE45700743A93 /* hugin_version.h */; }; - 73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; - 73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; - 73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; - 73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; - 73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; - 73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; - 73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; - 73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; - 73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; - 73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; - 73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; - 73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; - 73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; - 73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; - 73C3C94C0ECCB40900A3089A /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; - 73C3C94D0ECCB40900A3089A /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; - 73C3C94E0ECCB40900A3089A /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; - 73C3C94F0ECCB40900A3089A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 73C3C9500ECCB4AA00A3089A /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */; }; - 73C3C9510ECCB4AA00A3089A /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */; }; - 73C3C9520ECCB4AA00A3089A /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */; }; 73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; 73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; @@ -1063,8 +1073,6 @@ 73EBC09F0EC9E2BD0068B821 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; 73EBC0A00EC9E2BD0068B821 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; 73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; - 73EBC0A30EC9E2ED0068B821 /* libceleste.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB8D00EB38AB600CD7122 /* libceleste.dylib */; }; - 73EBC0A90EC9E3260068B821 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; }; 73EBC0AC0EC9E3540068B821 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; 73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; /* End PBXBuildFile section */ @@ -1308,6 +1316,76 @@ remoteGlobalIDString = 57D382ED0E236A0800445A37; remoteInfo = "matchpoint static"; }; + 57D50A310F595A6300CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FC280D24A26400A6AD01; + remoteInfo = frameworks; + }; + 57D50A330F595A6300CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5796FA730C4395CC006B7C6E; + remoteInfo = "tools nona"; + }; + 57D50A350F595A6300CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769F8460D23AA5D00A6AD01; + remoteInfo = "tools hugin_hdrmerge"; + }; + 57D50A6E0F595BDE00CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */; + remoteInfo = "celeste Framework"; + }; + 57D50B010F59714100CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900D70D24D32C00A6AD01 /* base_wx Framework */; + remoteInfo = "base_wx Framework"; + }; + 57D50B3A0F5971A600CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57C486290C3121E8002D79F1; + remoteInfo = configure; + }; + 57D50B540F5971F600CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */; + remoteInfo = "celeste Framework"; + }; + 57D50B560F5971F600CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FC280D24A26400A6AD01 /* frameworks */; + remoteInfo = frameworks; + }; + 57D50B580F59720700CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5 /* celeste */; + remoteInfo = celeste; + }; + 57D50B5A0F59720C00CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteInfo = "lib static"; + }; 57E347120C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1560,20 +1638,6 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; - 733490BF0ECB2BB9006309E3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 734FB8CF0EB38AB600CD7122; - remoteInfo = celeste; - }; - 733490C40ECB2BE9006309E3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 733490BB0ECB2B99006309E3; - remoteInfo = Dylibs; - }; 737E1C1F0EC9EC5100BA4D9B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1595,13 +1659,6 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; - 73C3C93C0ECCB3EB00A3089A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5769FC280D24A26400A6AD01; - remoteInfo = frameworks; - }; 73C958F60DA2C9DB00E19110 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1623,13 +1680,6 @@ remoteGlobalIDString = 576900A90D24D29300A6AD01; remoteInfo = "hugin_base Framework"; }; - 73F800120F2CABCA00C22CB9 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 73F8000D0F2CAB5300C22CB9; - remoteInfo = "Copy celeste config.h"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1652,6 +1702,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */, 576901C40D24D7DB00A6AD01 /* HuginVigraImpex.framework in Copy Frameworks */, 576901C50D24D7DB00A6AD01 /* HuginBase.framework in Copy Frameworks */, 576901C60D24D7DB00A6AD01 /* HuginBaseWx.framework in Copy Frameworks */, @@ -1691,26 +1742,34 @@ name = "Copy Executable Files"; runOnlyForDeploymentPostprocessing = 0; }; - 739F84940EC75736004771D6 /* Copy libraries */ = { + 57D50A4D0F595A6300CCDCB5 /* Copy Executable Files */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; - dstSubfolderSpec = 7; + dstSubfolderSpec = 6; files = ( - 739CADFE0EC8741D002FD3AF /* libceleste.dylib in Copy libraries */, + 57D50A4E0F595A6300CCDCB5 /* nona in Copy Executable Files */, + 57D50A4F0F595A6300CCDCB5 /* hugin_hdrmerge in Copy Executable Files */, + 57D50A500F595A6300CCDCB5 /* enblend in Copy Executable Files */, + 57D50A510F595A6300CCDCB5 /* enfuse in Copy Executable Files */, + 57D50A520F595A6300CCDCB5 /* PTblender in Copy Executable Files */, + 57D50A530F595A6300CCDCB5 /* PTmasker in Copy Executable Files */, + 57D50A540F595A6300CCDCB5 /* PTmender in Copy Executable Files */, + 57D50A550F595A6300CCDCB5 /* PTroller in Copy Executable Files */, + 57D50A560F595A6300CCDCB5 /* gnumake in Copy Executable Files */, ); - name = "Copy libraries"; + name = "Copy Executable Files"; runOnlyForDeploymentPostprocessing = 0; }; - 73B9576B0EFADC4200CB2012 /* Copy Frameworks */ = { + 57D50A570F595A6300CCDCB5 /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 73B9576C0EFADC6500CB2012 /* HuginBase.framework in Copy Frameworks */, - 73B9576D0EFADC6500CB2012 /* HuginBaseWx.framework in Copy Frameworks */, - 73B9576E0EFADC6500CB2012 /* HuginVigraImpex.framework in Copy Frameworks */, + 57D50A580F595A6300CCDCB5 /* HuginVigraImpex.framework in Copy Frameworks */, + 57D50A590F595A6300CCDCB5 /* HuginBase.framework in Copy Frameworks */, + 57D50A5A0F595A6300CCDCB5 /* HuginBaseWx.framework in Copy Frameworks */, ); name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -2092,8 +2151,22 @@ 57D382EB0E2369FC00445A37 /* nona */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = BUILT_PRODUCTS_DIR; }; 57D3830D0E236A0800445A37 /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; }; 57D475B60D3CE0AB003CF158 /* translations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = translations; sourceTree = "<group>"; }; + 57D5093A0F5942F200CCDCB5 /* CPImagesComboBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPImagesComboBox.cpp; sourceTree = "<group>"; }; + 57D5093B0F5942F300CCDCB5 /* CPImagesComboBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPImagesComboBox.h; sourceTree = "<group>"; }; + 57D50A620F595A6300CCDCB5 /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 57D50A640F595A6300CCDCB5 /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; }; + 57D50ADB0F596DB700CCDCB5 /* libceleste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libceleste.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = "<group>"; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 4; languageSpecificationIdentifier = c.cpp; path = hugin_config_mac.h; sourceTree = "<group>"; }; + 57DD345E0F5939D80030B958 /* celeste-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "celeste-Info.plist"; sourceTree = "<group>"; }; + 57DD34930F5940840030B958 /* APSIFTFeatureExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APSIFTFeatureExtractor.cpp; sourceTree = "<group>"; }; + 57DD34940F5940840030B958 /* APSIFTFeatureExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APSIFTFeatureExtractor.h; sourceTree = "<group>"; }; + 57DD34950F5940840030B958 /* FeatureExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FeatureExtractor.cpp; sourceTree = "<group>"; }; + 57DD34960F5940840030B958 /* FeatureExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureExtractor.h; sourceTree = "<group>"; }; + 57DD34970F5940840030B958 /* FeatureExtractorZoran.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureExtractorZoran.h; sourceTree = "<group>"; }; + 57DD34980F5940840030B958 /* FeatureMatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FeatureMatcher.cpp; sourceTree = "<group>"; }; + 57DD34990F5940840030B958 /* FeatureMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureMatcher.h; sourceTree = "<group>"; }; 57E122010D2BDBF300743A93 /* BuildConfig.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BuildConfig.xcconfig; sourceTree = SOURCE_ROOT; }; 57E122480D2BE45700743A93 /* hugin_version.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = hugin_version.h; sourceTree = "<group>"; }; 57E122580D2BE4E900743A93 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2255,17 +2328,12 @@ 734BDF5B0EB8EC19007EBA09 /* PTBatcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = PTBatcher; sourceTree = BUILT_PRODUCTS_DIR; }; 734BDF620EB8EC7B007EBA09 /* Batch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Batch.cpp; sourceTree = "<group>"; }; 734BDF630EB8EC7B007EBA09 /* Batch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Batch.h; sourceTree = "<group>"; }; - 734BDF640EB8EC7B007EBA09 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; 734BDF650EB8EC7B007EBA09 /* ProjectArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectArray.cpp; sourceTree = "<group>"; }; 734BDF660EB8EC7B007EBA09 /* ProjectArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectArray.h; sourceTree = "<group>"; }; 734BDF670EB8EC7B007EBA09 /* PTBatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PTBatcher.cpp; sourceTree = "<group>"; }; - 734BDF680EB8EC7B007EBA09 /* PTBatcher.desktop */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcher.desktop; sourceTree = "<group>"; }; 734BDF690EB8EC7B007EBA09 /* PTBatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PTBatcher.h; sourceTree = "<group>"; }; - 734BDF6A0EB8EC7B007EBA09 /* PTBatcher_rc.aps */ = {isa = PBXFileReference; lastKnownFileType = file; path = PTBatcher_rc.aps; sourceTree = "<group>"; }; - 734BDF6B0EB8EC7B007EBA09 /* PTBatcher_rc.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcher_rc.rc; sourceTree = "<group>"; }; 734BDF6C0EB8EC7B007EBA09 /* RunStitchFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunStitchFrame.cpp; sourceTree = "<group>"; }; 734BDF6D0EB8EC7B007EBA09 /* RunStitchFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunStitchFrame.h; sourceTree = "<group>"; }; - 734FB8D00EB38AB600CD7122 /* libceleste.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libceleste.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Celeste.cpp; sourceTree = "<group>"; }; 734FB8DE0EB38B9400CD7122 /* Celeste.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Celeste.h; sourceTree = "<group>"; }; 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CelesteGlobals.cpp; sourceTree = "<group>"; }; @@ -2305,19 +2373,14 @@ 734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = svm_learn_class_10_fold.pl; sourceTree = "<group>"; }; 734FB9040EB38B9500CD7122 /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utilities.cpp; sourceTree = "<group>"; }; 734FB9050EB38B9500CD7122 /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; }; - 734FB9B20EB3929500CD7122 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = ../../ExternalPrograms/repository/lib/libGLEW.a; sourceTree = SOURCE_ROOT; }; - 734FB9B30EB3929500CD7122 /* libGLEW.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLEW.dylib; path = ../../ExternalPrograms/repository/lib/libGLEW.dylib; sourceTree = SOURCE_ROOT; }; + 734FB9B20EB3929500CD7122 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = lib/libGLEW.a; sourceTree = "<group>"; }; 734FBA2C0EB39F5100CD7122 /* BatchFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BatchFrame.cpp; sourceTree = "<group>"; }; 734FBA2D0EB39F5100CD7122 /* BatchFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BatchFrame.h; sourceTree = "<group>"; }; - 734FBA2E0EB39F5100CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; 734FBA2F0EB39F5100CD7122 /* DirTraverser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirTraverser.h; sourceTree = "<group>"; }; 734FBA300EB39F5100CD7122 /* ProjectListBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectListBox.cpp; sourceTree = "<group>"; }; 734FBA310EB39F5100CD7122 /* ProjectListBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectListBox.h; sourceTree = "<group>"; }; 734FBA320EB39F5100CD7122 /* PTBatcherGUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PTBatcherGUI.cpp; sourceTree = "<group>"; }; - 734FBA330EB39F5100CD7122 /* PTBatcherGUI.desktop */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcherGUI.desktop; sourceTree = "<group>"; }; 734FBA340EB39F5100CD7122 /* PTBatcherGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PTBatcherGUI.h; sourceTree = "<group>"; }; - 734FBA350EB39F5200CD7122 /* PTBatcherGUI_rc.aps */ = {isa = PBXFileReference; lastKnownFileType = file; path = PTBatcherGUI_rc.aps; sourceTree = "<group>"; }; - 734FBA360EB39F5200CD7122 /* PTBatcherGUI_rc.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PTBatcherGUI_rc.rc; sourceTree = "<group>"; }; 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChoosyRemapper.cpp; sourceTree = "<group>"; }; 734FBA380EB3A20500CD7122 /* ChoosyRemapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChoosyRemapper.h; sourceTree = "<group>"; }; 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GLPreviewFrame.cpp; sourceTree = "<group>"; }; @@ -2359,13 +2422,9 @@ 7358165C0ECA0D98009E94DC /* CelesteDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteDebug.h; sourceTree = "<group>"; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; 737E1C180EC9EC0300BA4D9B /* hugin_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_config.h; sourceTree = "<group>"; }; - 739CADAE0EC86B30002FD3AF /* celeste Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste Framework-Info.plist"; sourceTree = "<group>"; }; - 739CADC00EC86F12002FD3AF /* celeste2 Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "celeste2 Framework-Info.plist"; sourceTree = "<group>"; }; 739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; - 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "../../ExternalPrograms/repository/lib/libwx_macu_gl-2.8.dylib"; sourceTree = SOURCE_ROOT; }; - 73C3C9320ECCB39700A3089A /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 73C3C9340ECCB39700A3089A /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; }; - 73C3C98E0ECCC9DE00A3089A /* celeste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = celeste.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "lib/libwx_macu_gl-2.8.dylib"; sourceTree = "<group>"; }; + 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginCleste.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; 73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; 73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-xgcc40-mt-1_36.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-xgcc40-mt-1_36.a"; sourceTree = SOURCE_ROOT; }; @@ -2390,7 +2449,7 @@ 73EAB53A0E86CF130020D514 /* IlmBase.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IlmBase.pc; sourceTree = "<group>"; }; 73EAB53B0E86CF130020D514 /* OpenEXR.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenEXR.pc; sourceTree = "<group>"; }; 73EAB5400E86CF130020D514 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; }; - 73EBC0900EC9E0B20068B821 /* celeste_standalone */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste_standalone; sourceTree = BUILT_PRODUCTS_DIR; }; + 73EBC0900EC9E0B20068B821 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2699,6 +2758,64 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57D50A380F595A6300CCDCB5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57D50A390F595A6300CCDCB5 /* Carbon.framework in Frameworks */, + 57D50A3A0F595A6300CCDCB5 /* libpthread.dylib in Frameworks */, + 57D50A3B0F595A6300CCDCB5 /* libiconv.dylib in Frameworks */, + 57D50A3C0F595A6300CCDCB5 /* libz.dylib in Frameworks */, + 57D50A3D0F595A6300CCDCB5 /* libmx.dylib in Frameworks */, + 57D50A3E0F595A6300CCDCB5 /* libpano13.dylib in Frameworks */, + 57D50A3F0F595A6300CCDCB5 /* libpng.dylib in Frameworks */, + 57D50A400F595A6300CCDCB5 /* libtiff.dylib in Frameworks */, + 57D50A410F595A6300CCDCB5 /* libjpeg.dylib in Frameworks */, + 57D50A420F595A6300CCDCB5 /* libwx_macu-2.8.dylib in Frameworks */, + 57D50A430F595A6300CCDCB5 /* libIex.dylib in Frameworks */, + 57D50A440F595A6300CCDCB5 /* libIlmImf.dylib in Frameworks */, + 57D50A450F595A6300CCDCB5 /* libIlmThread.dylib in Frameworks */, + 57D50A460F595A6300CCDCB5 /* libImath.dylib in Frameworks */, + 57D50A470F595A6300CCDCB5 /* libHalf.dylib in Frameworks */, + 57D50A480F595A6300CCDCB5 /* libboost_thread.dylib in Frameworks */, + 57D50A490F595A6300CCDCB5 /* libexpat.dylib in Frameworks */, + 57D50A4A0F595A6300CCDCB5 /* HuginVigraImpex.framework in Frameworks */, + 57D50A4B0F595A6300CCDCB5 /* HuginBase.framework in Frameworks */, + 57D50A4C0F595A6300CCDCB5 /* HuginBaseWx.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 57D50B3D0F5971A600CCDCB5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57D50B610F59725E00CCDCB5 /* libhugin_levmar.a in Frameworks */, + 57D50B620F59725E00CCDCB5 /* libhugin_jhead.a in Frameworks */, + 57D50B630F59725E00CCDCB5 /* libhugin_vigra_impex.a in Frameworks */, + 57D50B640F59725E00CCDCB5 /* libhugin_vigra_ext.a in Frameworks */, + 57D50B650F59725E00CCDCB5 /* libhugin_utils.a in Frameworks */, + 57D50B660F59725E00CCDCB5 /* libhugin_math.a in Frameworks */, + 57D50B670F59725E00CCDCB5 /* libhugin_appbase.a in Frameworks */, + 57D50B680F59725E00CCDCB5 /* libhugin_panodata.a in Frameworks */, + 57D50B690F59725E00CCDCB5 /* libhugin_panotools.a in Frameworks */, + 57D50B6A0F59725E00CCDCB5 /* libhugin_nona.a in Frameworks */, + 57D50B6B0F59725E00CCDCB5 /* libhugin_algorithms.a in Frameworks */, + 57D50B6C0F59725E00CCDCB5 /* libhugin_app.a in Frameworks */, + 57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */, + 57D50B400F5971A600CCDCB5 /* libexiv2.a in Frameworks */, + 57D50B410F5971A600CCDCB5 /* libpano13.dylib in Frameworks */, + 57D50B420F5971A600CCDCB5 /* libboost_thread.dylib in Frameworks */, + 57D50B430F5971A600CCDCB5 /* libHalf.dylib in Frameworks */, + 57D50B440F5971A600CCDCB5 /* libIex.dylib in Frameworks */, + 57D50B450F5971A600CCDCB5 /* libIlmImf.dylib in Frameworks */, + 57D50B460F5971A600CCDCB5 /* libIlmThread.dylib in Frameworks */, + 57D50B470F5971A600CCDCB5 /* libImath.dylib in Frameworks */, + 57D50B480F5971A600CCDCB5 /* libjpeg.dylib in Frameworks */, + 57D50B490F5971A600CCDCB5 /* libpng.dylib in Frameworks */, + 57D50B4A0F5971A600CCDCB5 /* libtiff.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 57E122560D2BE4E800743A93 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -2748,7 +2865,6 @@ 57E346E10C4A8AB3006AA781 /* libz.dylib in Frameworks */, 57E346E20C4A8AB3006AA781 /* libmx.dylib in Frameworks */, 57E346E30C4A8AC2006AA781 /* libpano13.dylib in Frameworks */, - 734FB9A70EB3914E00CD7122 /* libceleste.dylib in Frameworks */, 57E346E40C4A8AC2006AA781 /* libpng.dylib in Frameworks */, 57E346E50C4A8AC2006AA781 /* libtiff.dylib in Frameworks */, 57E346E60C4A8AC2006AA781 /* libjpeg.dylib in Frameworks */, @@ -2764,8 +2880,8 @@ 576901EC0D24D95100A6AD01 /* HuginBase.framework in Frameworks */, 576901ED0D24D95100A6AD01 /* HuginBaseWx.framework in Frameworks */, 5731C7820D553C3D00605D22 /* libhugin_jhead.a in Frameworks */, + 57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */, 734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */, - 734FB9B50EB3929500CD7122 /* libGLEW.dylib in Frameworks */, 739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */, 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */, ); @@ -2793,6 +2909,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 57D50B060F59715000CCDCB5 /* HuginBaseWx.framework in Frameworks */, 739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */, 739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */, 739F84D10EC77EB6004771D6 /* HuginBase.framework in Frameworks */, @@ -2814,45 +2931,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 734FB8CE0EB38AB600CD7122 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 739CADA80EC86B30002FD3AF /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 73C3C9300ECCB39700A3089A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 73C3C93E0ECCB40900A3089A /* HuginBase.framework in Frameworks */, - 73C3C93F0ECCB40900A3089A /* HuginVigraImpex.framework in Frameworks */, - 73C3C9400ECCB40900A3089A /* libboost_thread.dylib in Frameworks */, - 73C3C9410ECCB40900A3089A /* libexiv2.a in Frameworks */, - 73C3C9420ECCB40900A3089A /* libexpat.dylib in Frameworks */, - 73C3C9430ECCB40900A3089A /* libHalf.dylib in Frameworks */, - 73C3C9440ECCB40900A3089A /* libiconv.dylib in Frameworks */, - 73C3C9450ECCB40900A3089A /* libIex.dylib in Frameworks */, - 73C3C9460ECCB40900A3089A /* libIlmImf.dylib in Frameworks */, - 73C3C9470ECCB40900A3089A /* libIlmThread.dylib in Frameworks */, - 73C3C9480ECCB40900A3089A /* libImath.dylib in Frameworks */, - 73C3C9490ECCB40900A3089A /* libjpeg.dylib in Frameworks */, - 73C3C94A0ECCB40900A3089A /* libpano13.dylib in Frameworks */, - 73C3C94B0ECCB40900A3089A /* libpng.dylib in Frameworks */, - 73C3C94C0ECCB40900A3089A /* libtiff.dyli... [truncated message content] |
From: <ip...@us...> - 2009-02-28 14:22:40
|
Revision: 3683 http://hugin.svn.sourceforge.net/hugin/?rev=3683&view=rev Author: ippei Date: 2009-02-28 13:31:53 +0000 (Sat, 28 Feb 2009) Log Message: ----------- Mac: Info files version description revised. Modified Paths: -------------- hugin/trunk/mac/Hugin-Info.plist hugin/trunk/mac/base_wx-Info.plist hugin/trunk/mac/hugin_base-Info.plist hugin/trunk/mac/hugin_stitch_project-Info.plist hugin/trunk/mac/nona_gui-Info.plist hugin/trunk/mac/vigra_impex-Info.plist Modified: hugin/trunk/mac/Hugin-Info.plist =================================================================== --- hugin/trunk/mac/Hugin-Info.plist 2009-02-28 13:31:12 UTC (rev 3682) +++ hugin/trunk/mac/Hugin-Info.plist 2009-02-28 13:31:53 UTC (rev 3683) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> @@ -38,7 +38,7 @@ </dict> </array> <key>CFBundleExecutable</key> - <string>Hugin</string> + <string>${EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> <string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string> <key>CFBundleIconFile</key> Modified: hugin/trunk/mac/base_wx-Info.plist =================================================================== --- hugin/trunk/mac/base_wx-Info.plist 2009-02-28 13:31:12 UTC (rev 3682) +++ hugin/trunk/mac/base_wx-Info.plist 2009-02-28 13:31:53 UTC (rev 3683) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> @@ -16,5 +16,7 @@ <string>????</string> <key>CFBundleVersion</key> <string>1.0</string> + <key>CFBundleGetInfoString</key> + <string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string> </dict> </plist> Modified: hugin/trunk/mac/hugin_base-Info.plist =================================================================== --- hugin/trunk/mac/hugin_base-Info.plist 2009-02-28 13:31:12 UTC (rev 3682) +++ hugin/trunk/mac/hugin_base-Info.plist 2009-02-28 13:31:53 UTC (rev 3683) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> @@ -16,5 +16,7 @@ <string>????</string> <key>CFBundleVersion</key> <string>1.0</string> + <key>CFBundleGetInfoString</key> + <string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string> </dict> </plist> Modified: hugin/trunk/mac/hugin_stitch_project-Info.plist =================================================================== --- hugin/trunk/mac/hugin_stitch_project-Info.plist 2009-02-28 13:31:12 UTC (rev 3682) +++ hugin/trunk/mac/hugin_stitch_project-Info.plist 2009-02-28 13:31:53 UTC (rev 3683) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> @@ -26,9 +26,7 @@ </dict> </array> <key>CFBundleExecutable</key> - <string>HuginStitchProject</string> - <key>CFBundleGetInfoString</key> - <string></string> + <string>${EXECUTABLE_NAME}</string> <key>CFBundleIconFile</key> <string></string> <key>CFBundleIdentifier</key> @@ -37,13 +35,15 @@ <string>6.0</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string></string> <key>CFBundleSignature</key> <string>????</string> + <key>LSUIElement</key> + <string>1</string> <key>CFBundleVersion</key> - <string></string> - <key>LSUIElement</key> - <string>1</string> + <string>${HUGIN_WC_REVISION}</string> + <key>CFBundleShortVersionString</key> + <string>${HUGIN_PACKAGE_VERSION}</string> + <key>CFBundleGetInfoString</key> + <string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string> </dict> </plist> Modified: hugin/trunk/mac/nona_gui-Info.plist =================================================================== --- hugin/trunk/mac/nona_gui-Info.plist 2009-02-28 13:31:12 UTC (rev 3682) +++ hugin/trunk/mac/nona_gui-Info.plist 2009-02-28 13:31:53 UTC (rev 3683) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> @@ -38,10 +38,10 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string></string> + <string>${HUGIN_WC_REVISION}</string> + <key>CFBundleGetInfoString</key> + <string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string> <key>CFBundleShortVersionString</key> - <string></string> - <key>CFBundleGetInfoString</key> - <string></string> + <string>${HUGIN_PACKAGE_VERSION}</string> </dict> </plist> Modified: hugin/trunk/mac/vigra_impex-Info.plist =================================================================== --- hugin/trunk/mac/vigra_impex-Info.plist 2009-02-28 13:31:12 UTC (rev 3682) +++ hugin/trunk/mac/vigra_impex-Info.plist 2009-02-28 13:31:53 UTC (rev 3683) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> @@ -16,5 +16,7 @@ <string>????</string> <key>CFBundleVersion</key> <string>1.0</string> + <key>CFBundleGetInfoString</key> + <string>Hugin ${HUGIN_PACKAGE_VERSION} (Mac)</string> </dict> </plist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2009-02-28 16:21:03
|
Revision: 3686 http://hugin.svn.sourceforge.net/hugin/?rev=3686&view=rev Author: ippei Date: 2009-02-28 16:21:01 +0000 (Sat, 28 Feb 2009) Log Message: ----------- Mac: updated external libraries. Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/readme.txt hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Modified: hugin/trunk/mac/ExternalPrograms/readme.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/readme.txt 2009-02-28 13:34:25 UTC (rev 3685) +++ hugin/trunk/mac/ExternalPrograms/readme.txt 2009-02-28 16:21:01 UTC (rev 3686) @@ -24,36 +24,38 @@ The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. [Dynamic Build for distributable Hugin.app] -boost (1.36) +boost (1.38) libexpat (2.0.1) libjpeg (6b) -libpng (1.2.30) +libpng (1.2.35) libtiff (3.8.2) ilmbase (1.0.1) openexr16 (1.6.1) -pano13 (2.9.12 or svn) +pano13 (2.9.14-beta1) wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693) -static/libexiv2 (0.17.1) +static/libexiv2 (0.18) static/lcms (1.17) static/libxmi (1.2) +static/libglew (1.5.1) gnumake (Darwin 9/gnumake-119/make) -enblend31 (cvs or 3.1) +enblend (3.2) [Static Build for distributable command-line tools] -static/boost (1.36) +static/boost (1.38) static/libexpat (2.0.1) static/libjpeg (6b) -static/libpng (1.2.30) +static/libpng (1.2.35) static/libtiff (3.8.2) static/ilmbase (1.0.1) static/openexr16 (1.6.1) -static/pano13 (2.9.12 or svn) +static/pano13 (2.9.14-beta1) static/wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693) -static/libexiv2 (0.17.1) +static/libexiv2 (0.18) static/lcms (1.17) static/libxmi (1.2) +static/libglew (1.5.1) gnumake (Darwin 9 source: gnumake-119/make) -enblend31 (cvs or 3.1) +enblend31 (3.2) LICENSE: The scripts for compiling universal builds are originally copyrighted by Ippei Ukai (2007-2008), and distributed under the modified BSD license. Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-02-28 13:34:25 UTC (rev 3685) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-02-28 16:21:01 UTC (rev 3686) @@ -19,7 +19,7 @@ # OTHERARGs=""; -BOOST_VER="1_36" +BOOST_VER="1_38" # install headers Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-02-28 13:34:25 UTC (rev 3685) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-02-28 16:21:01 UTC (rev 3686) @@ -20,7 +20,7 @@ -PNGVER="1.2.32" +PNGVER="1.2.35" # init Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-02-28 13:34:25 UTC (rev 3685) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-02-28 16:21:01 UTC (rev 3686) @@ -80,17 +80,18 @@ name = "lib static"; productName = lib; }; - 57E347300C4A8EDF006AA781 /* app */ = { + 57E347300C4A8EDF006AA781 /* Apps */ = { isa = PBXAggregateTarget; - buildConfigurationList = 57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "app" */; + buildConfigurationList = 57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "Apps" */; buildPhases = ( ); dependencies = ( 57E347470C4A8EF8006AA781 /* PBXTargetDependency */, 57525A2E0C54BC8400BF8096 /* PBXTargetDependency */, 5769FDB30D24BB1D00A6AD01 /* PBXTargetDependency */, + 57D50C2A0F59999000CCDCB5 /* PBXTargetDependency */, ); - name = app; + name = Apps; productName = app; }; 57E347330C4A8EED006AA781 /* tools */ = { @@ -1341,14 +1342,14 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */; + remoteGlobalIDString = 739CADA90EC86B30002FD3AF; remoteInfo = "celeste Framework"; }; 57D50B010F59714100CCDCB5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 576900D70D24D32C00A6AD01 /* base_wx Framework */; + remoteGlobalIDString = 576900D70D24D32C00A6AD01; remoteInfo = "base_wx Framework"; }; 57D50B3A0F5971A600CCDCB5 /* PBXContainerItemProxy */ = { @@ -1362,30 +1363,37 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 739CADA90EC86B30002FD3AF /* celeste Framework */; + remoteGlobalIDString = 739CADA90EC86B30002FD3AF; remoteInfo = "celeste Framework"; }; 57D50B560F5971F600CCDCB5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5769FC280D24A26400A6AD01 /* frameworks */; + remoteGlobalIDString = 5769FC280D24A26400A6AD01; remoteInfo = frameworks; }; 57D50B580F59720700CCDCB5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5 /* celeste */; + remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5; remoteInfo = celeste; }; 57D50B5A0F59720C00CCDCB5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781; remoteInfo = "lib static"; }; + 57D50C290F59999000CCDCB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57D50A2F0F595A6300CCDCB5; + remoteInfo = PTBatcherGUI; + }; 57E347120C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -2156,7 +2164,7 @@ 57D50A620F595A6300CCDCB5 /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57D50A640F595A6300CCDCB5 /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; }; 57D50ADB0F596DB700CCDCB5 /* libceleste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libceleste.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = "<group>"; }; + 57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 4; languageSpecificationIdentifier = c.cpp; path = hugin_config_mac.h; sourceTree = "<group>"; }; 57DD345E0F5939D80030B958 /* celeste-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "celeste-Info.plist"; sourceTree = "<group>"; }; @@ -5446,7 +5454,7 @@ 571046810D25F698006A3C69 /* bundled tools */, 5796FA730C4395CC006B7C6E /* nona dynamic */, 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */, - 57E347300C4A8EDF006AA781 /* app */, + 57E347300C4A8EDF006AA781 /* Apps */, 5769F5FF0D23825700A6AD01 /* StitchProject */, 739CADA90EC86B30002FD3AF /* celeste Framework */, 57E3467D0C4A89B0006AA781 /* Hugin */, @@ -6596,6 +6604,11 @@ target = 57E3470D0C4A8E95006AA781 /* lib static */; targetProxy = 57D50B5A0F59720C00CCDCB5 /* PBXContainerItemProxy */; }; + 57D50C2A0F59999000CCDCB5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */; + targetProxy = 57D50C290F59999000CCDCB5 /* PBXContainerItemProxy */; + }; 57E347130C4A8EB6006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 576EC4980C3FC9300076A417 /* huginapp */; @@ -9440,7 +9453,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "app" */ = { + 57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "Apps" */ = { isa = XCConfigurationList; buildConfigurations = ( 57E347520C4A8F24006AA781 /* Debug */, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2009-03-14 16:11:02
|
Revision: 3732 http://hugin.svn.sourceforge.net/hugin/?rev=3732&view=rev Author: harryvanderwolf Date: 2009-03-14 16:10:46 +0000 (Sat, 14 Mar 2009) Log Message: ----------- [OSX] updates to localisation neccessary for added italian help files Modified Paths: -------------- hugin/trunk/mac/localise-help.sh hugin/trunk/mac/localised.sh Modified: hugin/trunk/mac/localise-help.sh =================================================================== --- hugin/trunk/mac/localise-help.sh 2009-03-14 15:12:39 UTC (rev 3731) +++ hugin/trunk/mac/localise-help.sh 2009-03-14 16:10:46 UTC (rev 3732) @@ -8,7 +8,7 @@ mkdir -p "$resdir" -for helplang in "en_EN" "fr_FR" +for helplang in "en_EN" "fr_FR" "it_IT" do localisedresdir="$resdir/$(echo $helplang | grep -o '^[^_]*').lproj" Modified: hugin/trunk/mac/localised.sh =================================================================== --- hugin/trunk/mac/localised.sh 2009-03-14 15:12:39 UTC (rev 3731) +++ hugin/trunk/mac/localised.sh 2009-03-14 16:10:46 UTC (rev 3732) @@ -31,7 +31,7 @@ then continue else - if [ $lang != "fr" ] + if [ $lang != "fr" ] && [ $lang != "it" ] then ln -s "$resdir/en.lproj/help" "$localisedresdir/help" fi @@ -76,4 +76,4 @@ # cp "$xrcsrcdir/data/$file" $localisedresdir/`echo $file|sed s/_$lang//` # done -done \ No newline at end of file +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2009-03-29 16:08:07
|
Revision: 3765 http://hugin.svn.sourceforge.net/hugin/?rev=3765&view=rev Author: ippei Date: 2009-03-29 16:08:03 +0000 (Sun, 29 Mar 2009) Log Message: ----------- Mac: celeste model to be installed in the xrc/data dir as with other platforms Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/patch-xrc.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-03-29 16:06:12 UTC (rev 3764) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-03-29 16:08:03 UTC (rev 3765) @@ -596,6 +596,7 @@ 5769FE6D0D24D09B00A6AD01 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; 5769FE6E0D24D09B00A6AD01 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; 5769FE6F0D24D09B00A6AD01 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */; }; 576DA17B0C3CF8A5006E8D90 /* NonaImageStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */; }; 576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */; }; 576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; }; @@ -800,7 +801,6 @@ 57D50A580F595A6300CCDCB5 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; 57D50A590F595A6300CCDCB5 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; 57D50A5A0F595A6300CCDCB5 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; - 57D50AC20F596D4900CCDCB5 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; }; 57D50AC70F596D6900CCDCB5 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; 57D50ADC0F596E3D00CCDCB5 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; }; 57D50ADD0F596E3D00CCDCB5 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; }; @@ -841,7 +841,7 @@ 57D50B4A0F5971A600CCDCB5 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; 57D50B4C0F5971A600CCDCB5 /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; 57D50B4D0F5971A600CCDCB5 /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; }; - 57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libceleste.a */; }; + 57D50B5E0F59724800CCDCB5 /* libhugin_celeste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */; }; 57D50B610F59725E00CCDCB5 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; 57D50B620F59725E00CCDCB5 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; 57D50B630F59725E00CCDCB5 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; @@ -858,9 +858,6 @@ 57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; 57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; - 57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; }; - 57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; }; - 57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; 57E1225C0D2BE50700743A93 /* align_image_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5769F83B0D23A98400A6AD01 /* align_image_stack.cpp */; }; 57E346880C4A89E6006AA781 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331010C4A8859006AA781 /* AssistantPanel.cpp */; }; 57E3468A0C4A89E6006AA781 /* AutoCtrlPointCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */; }; @@ -962,31 +959,6 @@ 7358165D0ECA0D98009E94DC /* CelesteDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7358165C0ECA0D98009E94DC /* CelesteDebug.h */; }; 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; 7388EAFD0F6BFB1B001E08FA /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; }; - 7394A2020EC8A8F000DCEE85 /* celeste.model in Resources */ = {isa = PBXBuildFile; fileRef = 734FB8E80EB38B9400CD7122 /* celeste.model */; }; - 739CADC80EC86F44002FD3AF /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; }; - 739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; }; - 739CADCA0EC86F44002FD3AF /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; }; - 739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; }; - 739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; }; - 739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; }; - 739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; }; - 739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; }; - 739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; }; - 739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; }; - 739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; }; - 739CADD30EC86F44002FD3AF /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; }; - 739CADD40EC86F44002FD3AF /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; }; - 739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; }; - 739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; }; - 739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; }; - 739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; }; - 739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; }; - 739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; }; - 739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; }; - 739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; }; - 739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; }; - 739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; }; - 739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; }; 739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; }; 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; 739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; @@ -1241,6 +1213,13 @@ remoteGlobalIDString = 5769F5FF0D23825700A6AD01; remoteInfo = StitchProject; }; + 576ADD910F7FB09E003E8EE3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57D50ACA0F596DB700CCDCB5 /* celeste */; + remoteInfo = celeste; + }; 57AC37480D2BE6D80086D348 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1339,13 +1318,6 @@ remoteGlobalIDString = 5769F8460D23AA5D00A6AD01; remoteInfo = "tools hugin_hdrmerge"; }; - 57D50A6E0F595BDE00CCDCB5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 739CADA90EC86B30002FD3AF; - remoteInfo = "celeste Framework"; - }; 57D50B010F59714100CCDCB5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1360,13 +1332,6 @@ remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = configure; }; - 57D50B540F5971F600CCDCB5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 739CADA90EC86B30002FD3AF; - remoteInfo = "celeste Framework"; - }; 57D50B560F5971F600CCDCB5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1711,7 +1676,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 57DD34640F593A3C0030B958 /* HuginCleste.framework in Copy Frameworks */, 576901C40D24D7DB00A6AD01 /* HuginVigraImpex.framework in Copy Frameworks */, 576901C50D24D7DB00A6AD01 /* HuginBase.framework in Copy Frameworks */, 576901C60D24D7DB00A6AD01 /* HuginBaseWx.framework in Copy Frameworks */, @@ -2034,6 +1998,7 @@ 5769F8440D23A9F400A6AD01 /* khanSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = khanSupport.cpp; sourceTree = "<group>"; }; 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; }; 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginVigraImpex.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 576ADDB60F7FB5F2003E8EE3 /* training */ = {isa = PBXFileReference; lastKnownFileType = folder; path = training; sourceTree = "<group>"; }; 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaImageStitcher.cpp; path = algorithms/nona/NonaImageStitcher.cpp; sourceTree = "<group>"; }; 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaImageStitcher.h; path = algorithms/nona/NonaImageStitcher.h; sourceTree = "<group>"; }; 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaFileStitcher.cpp; path = algorithms/nona/NonaFileStitcher.cpp; sourceTree = "<group>"; }; @@ -2179,7 +2144,7 @@ 57D5093B0F5942F300CCDCB5 /* CPImagesComboBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPImagesComboBox.h; sourceTree = "<group>"; }; 57D50A620F595A6300CCDCB5 /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57D50A640F595A6300CCDCB5 /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; }; - 57D50ADB0F596DB700CCDCB5 /* libceleste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libceleste.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_celeste.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 4; languageSpecificationIdentifier = c.cpp; path = hugin_config_mac.h; sourceTree = "<group>"; }; @@ -2260,7 +2225,7 @@ 57E331020C4A8859006AA781 /* AssistantPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AssistantPanel.h; sourceTree = "<group>"; }; 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AutoCtrlPointCreator.cpp; sourceTree = "<group>"; }; 57E331040C4A8859006AA781 /* AutoCtrlPointCreator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AutoCtrlPointCreator.h; sourceTree = "<group>"; }; - 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPEditorPanel.cpp; sourceTree = "<group>"; }; + 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPEditorPanel.cpp; sourceTree = "<group>"; }; 57E331070C4A8859006AA781 /* CPEditorPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanel.h; sourceTree = "<group>"; }; 57E331080C4A8859006AA781 /* CPEditorPanelHandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanelHandler.h; sourceTree = "<group>"; }; 57E331090C4A8859006AA781 /* CPEditorTest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorTest.h; sourceTree = "<group>"; }; @@ -2354,10 +2319,7 @@ 734FB8DE0EB38B9400CD7122 /* Celeste.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Celeste.h; sourceTree = "<group>"; }; 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CelesteGlobals.cpp; sourceTree = "<group>"; }; 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteGlobals.h; sourceTree = "<group>"; }; - 734FB8E10EB38B9400CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; 734FB8E20EB38B9400CD7122 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; }; - 734FB8E30EB38B9400CD7122 /* Config.h.linux */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Config.h.linux; sourceTree = "<group>"; }; - 734FB8E40EB38B9400CD7122 /* Config.h.win32 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Config.h.win32; sourceTree = "<group>"; }; 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContrastFilter.cpp; sourceTree = "<group>"; }; 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContrastFilter.h; sourceTree = "<group>"; }; 734FB8E80EB38B9400CD7122 /* celeste.model */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = celeste.model; sourceTree = "<group>"; }; @@ -2379,14 +2341,6 @@ 734FB8F80EB38B9500CD7122 /* PGMImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PGMImage.h; sourceTree = "<group>"; }; 734FB8F90EB38B9500CD7122 /* svm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svm.cpp; sourceTree = "<group>"; }; 734FB8FA0EB38B9500CD7122 /* svm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svm.h; sourceTree = "<group>"; }; - 734FB8FC0EB38B9500CD7122 /* CelesteTrain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CelesteTrain.cpp; sourceTree = "<group>"; }; - 734FB8FD0EB38B9500CD7122 /* CelesteTrain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelesteTrain.h; sourceTree = "<group>"; }; - 734FB8FE0EB38B9500CD7122 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; - 734FB8FF0EB38B9500CD7122 /* create_svm_data_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = create_svm_data_10_fold.pl; sourceTree = "<group>"; }; - 734FB9000EB38B9500CD7122 /* get_flickr_clouds.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = get_flickr_clouds.pl; sourceTree = "<group>"; }; - 734FB9010EB38B9500CD7122 /* parse_results.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = parse_results.pl; sourceTree = "<group>"; }; - 734FB9020EB38B9500CD7122 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; - 734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = svm_learn_class_10_fold.pl; sourceTree = "<group>"; }; 734FB9040EB38B9500CD7122 /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utilities.cpp; sourceTree = "<group>"; }; 734FB9050EB38B9500CD7122 /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; }; 734FB9B20EB3929500CD7122 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = lib/libGLEW.a; sourceTree = "<group>"; }; @@ -2435,7 +2389,6 @@ 7388EAFC0F6BFB1B001E08FA /* ResetDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetDialog.h; sourceTree = "<group>"; }; 739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "lib/libwx_macu_gl-2.8.dylib"; sourceTree = "<group>"; }; - 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HuginCleste.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; 73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; 73EAB5260E86CF120020D514 /* libboost_thread-xgcc40-mt-1_36.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-xgcc40-mt-1_36.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-xgcc40-mt-1_36.a"; sourceTree = SOURCE_ROOT; }; @@ -2812,7 +2765,7 @@ 57D50B6A0F59725E00CCDCB5 /* libhugin_nona.a in Frameworks */, 57D50B6B0F59725E00CCDCB5 /* libhugin_algorithms.a in Frameworks */, 57D50B6C0F59725E00CCDCB5 /* libhugin_app.a in Frameworks */, - 57D50B5E0F59724800CCDCB5 /* libceleste.a in Frameworks */, + 57D50B5E0F59724800CCDCB5 /* libhugin_celeste.a in Frameworks */, 57D50B400F5971A600CCDCB5 /* libexiv2.a in Frameworks */, 57D50B410F5971A600CCDCB5 /* libpano13.dylib in Frameworks */, 57D50B420F5971A600CCDCB5 /* libboost_thread.dylib in Frameworks */, @@ -2891,10 +2844,10 @@ 576901EC0D24D95100A6AD01 /* HuginBase.framework in Frameworks */, 576901ED0D24D95100A6AD01 /* HuginBaseWx.framework in Frameworks */, 5731C7820D553C3D00605D22 /* libhugin_jhead.a in Frameworks */, - 57DD34690F593A430030B958 /* HuginCleste.framework in Frameworks */, 734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */, 739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */, 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */, + 576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2942,14 +2895,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 739CADA80EC86B30002FD3AF /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 57DD34760F593B060030B958 /* HuginVigraImpex.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 73C958F90DA2C9DB00E19110 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3006,7 +2951,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 57D50AC20F596D4900CCDCB5 /* HuginCleste.framework in Frameworks */, 73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */, 57D50AC70F596D6900CCDCB5 /* libexiv2.a in Frameworks */, 73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */, @@ -3300,7 +3244,7 @@ 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */, 576EC4990C3FC9300076A417 /* libhugin_app.a */, 57E34A5C0C4ACAA1006AA781 /* libhugin_wxbase.a */, - 57D50ADB0F596DB700CCDCB5 /* libceleste.a */, + 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */, ); name = "lib-static"; sourceTree = "<group>"; @@ -3535,7 +3479,6 @@ 5769FD140D24B3D400A6AD01 /* frameworks */ = { isa = PBXGroup; children = ( - 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */, 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */, 576900AA0D24D29300A6AD01 /* HuginBase.framework */, 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */, @@ -4000,9 +3943,9 @@ 57E331020C4A8859006AA781 /* AssistantPanel.h */, 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */, 57E331040C4A8859006AA781 /* AutoCtrlPointCreator.h */, - 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */, 57E331070C4A8859006AA781 /* CPEditorPanel.h */, 57E331080C4A8859006AA781 /* CPEditorPanelHandler.h */, + 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */, 57E331090C4A8859006AA781 /* CPEditorTest.h */, 57E34AB20C4ACC04006AA781 /* CPFineTuneFrame.cpp */, 57E34AB30C4ACC04006AA781 /* CPFineTuneFrame.h */, @@ -4197,18 +4140,15 @@ 734FB8DC0EB38B9400CD7122 /* celeste */ = { isa = PBXGroup; children = ( + 734FB8E20EB38B9400CD7122 /* Config.h */, 7358165C0ECA0D98009E94DC /* CelesteDebug.h */, + 734FB8E70EB38B9400CD7122 /* data */, 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */, 734FB8DE0EB38B9400CD7122 /* Celeste.h */, 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */, 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */, - 734FB8E10EB38B9400CD7122 /* CMakeLists.txt */, - 734FB8E20EB38B9400CD7122 /* Config.h */, - 734FB8E30EB38B9400CD7122 /* Config.h.linux */, - 734FB8E40EB38B9400CD7122 /* Config.h.win32 */, 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */, 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */, - 734FB8E70EB38B9400CD7122 /* data */, 734FB8E90EB38B9400CD7122 /* Gabor.cpp */, 734FB8EA0EB38B9400CD7122 /* Gabor.h */, 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */, @@ -4218,8 +4158,6 @@ 734FB8EF0EB38B9400CD7122 /* GaborJet.h */, 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */, 734FB8F10EB38B9400CD7122 /* ImageFile.h */, - 734FB8F20EB38B9400CD7122 /* LICENCE_GABOR */, - 734FB8F30EB38B9400CD7122 /* LICENCE_LIBSVM */, 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */, 734FB8F50EB38B9500CD7122 /* LogPolar.h */, 734FB8F60EB38B9500CD7122 /* Main.cpp */, @@ -4227,9 +4165,11 @@ 734FB8F80EB38B9500CD7122 /* PGMImage.h */, 734FB8F90EB38B9500CD7122 /* svm.cpp */, 734FB8FA0EB38B9500CD7122 /* svm.h */, - 734FB8FB0EB38B9500CD7122 /* training */, 734FB9040EB38B9500CD7122 /* Utilities.cpp */, 734FB9050EB38B9500CD7122 /* Utilities.h */, + 734FB8F20EB38B9400CD7122 /* LICENCE_GABOR */, + 734FB8F30EB38B9400CD7122 /* LICENCE_LIBSVM */, + 576ADDB60F7FB5F2003E8EE3 /* training */, ); path = celeste; sourceTree = "<group>"; @@ -4242,21 +4182,6 @@ path = data; sourceTree = "<group>"; }; - 734FB8FB0EB38B9500CD7122 /* training */ = { - isa = PBXGroup; - children = ( - 734FB8FC0EB38B9500CD7122 /* CelesteTrain.cpp */, - 734FB8FD0EB38B9500CD7122 /* CelesteTrain.h */, - 734FB8FE0EB38B9500CD7122 /* CMakeLists.txt */, - 734FB8FF0EB38B9500CD7122 /* create_svm_data_10_fold.pl */, - 734FB9000EB38B9500CD7122 /* get_flickr_clouds.pl */, - 734FB9010EB38B9500CD7122 /* parse_results.pl */, - 734FB9020EB38B9500CD7122 /* README */, - 734FB9030EB38B9500CD7122 /* svm_learn_class_10_fold.pl */, - ); - path = training; - sourceTree = "<group>"; - }; 73EAB5250E86CEA90020D514 /* repository-static */ = { isa = PBXGroup; children = ( @@ -4697,26 +4622,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 739CADA50EC86B30002FD3AF /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 739CADC80EC86F44002FD3AF /* Celeste.h in Headers */, - 739CADC90EC86F44002FD3AF /* CelesteGlobals.h in Headers */, - 739CADCA0EC86F44002FD3AF /* Config.h in Headers */, - 739CADCB0EC86F44002FD3AF /* ContrastFilter.h in Headers */, - 739CADCC0EC86F44002FD3AF /* Gabor.h in Headers */, - 739CADCD0EC86F44002FD3AF /* GaborFilter.h in Headers */, - 739CADCE0EC86F44002FD3AF /* GaborGlobal.h in Headers */, - 739CADCF0EC86F44002FD3AF /* GaborJet.h in Headers */, - 739CADD00EC86F44002FD3AF /* ImageFile.h in Headers */, - 739CADD10EC86F44002FD3AF /* LogPolar.h in Headers */, - 739CADD20EC86F44002FD3AF /* PGMImage.h in Headers */, - 739CADD30EC86F44002FD3AF /* svm.h in Headers */, - 739CADD40EC86F44002FD3AF /* Utilities.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 73EBC0CF0EC9E4A00068B821 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -5181,7 +5086,7 @@ ); name = celeste; productName = nona; - productReference = 57D50ADB0F596DB700CCDCB5 /* libceleste.a */; + productReference = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */; productType = "com.apple.product-type.library.static"; }; 57D50B380F5971A600CCDCB5 /* celeste static */ = { @@ -5229,7 +5134,7 @@ 57E3467C0C4A89B0006AA781 /* Frameworks */, 576901E60D24D93300A6AD01 /* Copy Frameworks */, 57E3467A0C4A89B0006AA781 /* Resources */, - 571D8C740E2132DE006D0305 /* Patch XRC */, + 571D8C740E2132DE006D0305 /* Patch and Copy XRC */, 57E347640C4A8F9F006AA781 /* Locale Script */, 571D8C8E0E213833006D0305 /* Localise Help */, 576902030D24DA9500A6AD01 /* Complete Bundle */, @@ -5239,7 +5144,7 @@ ); dependencies = ( 576901B80D24D61C00A6AD01 /* PBXTargetDependency */, - 57D50A6F0F595BDE00CCDCB5 /* PBXTargetDependency */, + 576ADD920F7FB09E003E8EE3 /* PBXTargetDependency */, 5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */, ); name = Hugin; @@ -5317,24 +5222,6 @@ productReference = 734BDF5B0EB8EC19007EBA09 /* PTBatcher */; productType = "com.apple.product-type.tool"; }; - 739CADA90EC86B30002FD3AF /* celeste Framework */ = { - isa = PBXNativeTarget; - buildConfigurationList = 739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */; - buildPhases = ( - 57D50AA90F59661200CCDCB5 /* Copy celeste config.h */, - 739CADA50EC86B30002FD3AF /* Headers */, - 739CADA70EC86B30002FD3AF /* Sources */, - 739CADA80EC86B30002FD3AF /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "celeste Framework"; - productName = "celeste Framework"; - productReference = 73C3C98E0ECCC9DE00A3089A /* HuginCleste.framework */; - productType = "com.apple.product-type.framework"; - }; 73C958F40DA2C9DB00E19110 /* tca_correct static */ = { isa = PBXNativeTarget; buildConfigurationList = 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */; @@ -5383,7 +5270,6 @@ dependencies = ( 737E1C200EC9EC5100BA4D9B /* PBXTargetDependency */, 57D50B570F5971F600CCDCB5 /* PBXTargetDependency */, - 57D50B550F5971F600CCDCB5 /* PBXTargetDependency */, ); name = "celeste dynamic"; productName = celeste_standalone; @@ -5440,9 +5326,9 @@ 5759DA4E0C327D680043F754 /* panodata */, 571300640C33D41F00252FE3 /* panotools */, 574092290C393E6600D16607 /* nona */, + 57D50ACA0F596DB700CCDCB5 /* celeste */, 57EA83850C3A798A00E4965E /* algorithms */, 576EC4980C3FC9300076A417 /* huginapp */, - 57D50ACA0F596DB700CCDCB5 /* celeste */, 57E34A5B0C4ACAA1006AA781 /* wxbase */, 5769FC280D24A26400A6AD01 /* frameworks */, 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */, @@ -5453,7 +5339,6 @@ 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */, 57E347300C4A8EDF006AA781 /* Apps */, 5769F5FF0D23825700A6AD01 /* StitchProject */, - 739CADA90EC86B30002FD3AF /* celeste Framework */, 57E3467D0C4A89B0006AA781 /* Hugin */, 57525A240C54BC4400BF8096 /* Nona */, 57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */, @@ -5574,7 +5459,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7394A2020EC8A8F000DCEE85 /* celeste.model in Resources */, 57E347780C4A9005006AA781 /* Hugin.icns in Resources */, 57E347790C4A9005006AA781 /* HuginFiles.icns in Resources */, 5769F8940D23AB7300A6AD01 /* HuginStitchProject.app in Resources */, @@ -5642,14 +5526,14 @@ shellPath = /bin/sh; shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localised.sh\nfi"; }; - 571D8C740E2132DE006D0305 /* Patch XRC */ = { + 571D8C740E2132DE006D0305 /* Patch and Copy XRC */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Patch XRC"; + name = "Patch and Copy XRC"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -5773,22 +5657,6 @@ shellPath = /bin/sh; shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/localise-help.sh\nfi"; }; - 57D50AA90F59661200CCDCB5 /* Copy celeste config.h */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "celeste-Config.h", - ); - name = "Copy celeste config.h"; - outputPaths = ( - ../src/celeste/Config.h, - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h"; - }; 57D50AF80F596E9600CCDCB5 /* Copy celeste config.h */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -6337,24 +6205,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 739CADA70EC86B30002FD3AF /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 739CADD50EC86F6A002FD3AF /* Celeste.cpp in Sources */, - 739CADD60EC86F6A002FD3AF /* CelesteGlobals.cpp in Sources */, - 739CADD70EC86F6A002FD3AF /* ContrastFilter.cpp in Sources */, - 739CADD80EC86F6A002FD3AF /* Gabor.cpp in Sources */, - 739CADD90EC86F6A002FD3AF /* GaborFilter.cpp in Sources */, - 739CADDA0EC86F6A002FD3AF /* GaborJet.cpp in Sources */, - 739CADDB0EC86F6A002FD3AF /* ImageFile.cpp in Sources */, - 739CADDC0EC86F6A002FD3AF /* LogPolar.cpp in Sources */, - 739CADDD0EC86F6A002FD3AF /* PGMImage.cpp in Sources */, - 739CADDE0EC86F6A002FD3AF /* svm.cpp in Sources */, - 739CADDF0EC86F6A002FD3AF /* Utilities.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 73C958F70DA2C9DB00E19110 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6497,6 +6347,11 @@ target = 5769F5FF0D23825700A6AD01 /* StitchProject */; targetProxy = 5769FDB20D24BB1D00A6AD01 /* PBXContainerItemProxy */; }; + 576ADD920F7FB09E003E8EE3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57D50ACA0F596DB700CCDCB5 /* celeste */; + targetProxy = 576ADD910F7FB09E003E8EE3 /* PBXContainerItemProxy */; + }; 57AC37490D2BE6D80086D348 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57E122570D2BE4E800743A93 /* align_image_stack static */; @@ -6567,11 +6422,6 @@ target = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */; targetProxy = 57D50A350F595A6300CCDCB5 /* PBXContainerItemProxy */; }; - 57D50A6F0F595BDE00CCDCB5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 739CADA90EC86B30002FD3AF /* celeste Framework */; - targetProxy = 57D50A6E0F595BDE00CCDCB5 /* PBXContainerItemProxy */; - }; 57D50B020F59714100CCDCB5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 576900D70D24D32C00A6AD01 /* base_wx Framework */; @@ -6582,11 +6432,6 @@ target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 57D50B3A0F5971A600CCDCB5 /* PBXContainerItemProxy */; }; - 57D50B550F5971F600CCDCB5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 739CADA90EC86B30002FD3AF /* celeste Framework */; - targetProxy = 57D50B540F5971F600CCDCB5 /* PBXContainerItemProxy */; - }; 57D50B570F5971F600CCDCB5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5769FC280D24A26400A6AD01 /* frameworks */; @@ -8220,11 +8065,13 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign, ../src/hugin_base, ../src/foreign/vigra, "$(inherited)", ); - PRODUCT_NAME = celeste; + PRODUCT_NAME = hugin_celeste; + STRIP_STYLE = debugging; }; name = Debug; }; @@ -8232,11 +8079,13 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign, ../src/hugin_base, ../src/foreign/vigra, "$(inherited)", ); - PRODUCT_NAME = celeste; + PRODUCT_NAME = hugin_celeste; + STRIP_STYLE = debugging; }; name = Development; }; @@ -8244,11 +8093,13 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign, ../src/hugin_base, ../src/foreign/vigra, "$(inherited)", ); - PRODUCT_NAME = celeste; + PRODUCT_NAME = hugin_celeste; + STRIP_STYLE = debugging; }; name = Release; }; @@ -8881,52 +8732,6 @@ }; name = Release; }; - 739CADAF0EC86B30002FD3AF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = YES; - HEADER_SEARCH_PATHS = ( - ../src/foreign, - ../src/foreign/vigra, - ../src/hugin_base, - "$(inherited)", - ); - INFOPLIST_FILE = "celeste-Info.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - PRODUCT_NAME = HuginCleste; - }; - name = Debug; - }; - 739CADB00EC86B30002FD3AF /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - HEADER_SEARCH_PATHS = ( - ../src/foreign, - ../src/foreign/vigra, - ../src/hugin_base, - "$(inherited)", - ); - INFOPLIST_FILE = "celeste-Info.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - PRODUCT_NAME = HuginCleste; - }; - name = Development; - }; - 739CADB10EC86B30002FD3AF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - HEADER_SEARCH_PATHS = ( - ../src/foreign, - ../src/foreign/vigra, - ../src/hugin_base, - "$(inherited)", - ); - INFOPLIST_FILE = "celeste-Info.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - PRODUCT_NAME = HuginCleste; - }; - name = Release; - }; 73C959100DA2C9DB00E19110 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -9541,16 +9346,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 739CADB20EC86B31002FD3AF /* Build configuration list for PBXNativeTarget "celeste Framework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 739CADAF0EC86B30002FD3AF /* Debug */, - 739CADB00EC86B30002FD3AF /* Development */, - 739CADB10EC86B30002FD3AF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 73C9590F0DA2C9DB00E19110 /* Build configuration list for PBXNativeTarget "tca_correct static" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/trunk/mac/patch-xrc.sh =================================================================== --- hugin/trunk/mac/patch-xrc.sh 2009-03-29 16:06:12 UTC (rev 3764) +++ hugin/trunk/mac/patch-xrc.sh 2009-03-29 16:08:03 UTC (rev 3765) @@ -7,11 +7,12 @@ resdir="$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources" huginsrcdir="../src/hugin1/hugin" xrcsrcdir="$huginsrcdir/xrc" +celeste_data="../src/celeste/data" rm -fR $resdir/xrc -echo copying xrc folder to $resdir/xrc +echo "copying xrc folder to $resdir/xrc" cp -R $xrcsrcdir $resdir/ -echo removing extra files from xrc folder +echo "removing extra files from xrc folder" for DIR in $resdir/xrc "$resdir/xrc/??*" "$resdir/xrc/??*/??*" do rm -fR $DIR/.svn @@ -21,12 +22,7 @@ rm -f $DIR/CMake* done -echo patching $resdir/xrc/cp_editor_panel.xrc to use wxChoice instead of wxNotebook -mv $resdir/xrc/cp_editor_panel.xrc $resdir/xrc/cp_editor_panel.xrc-bk -sed -e s/wxNotebook/wxChoice/ -e s/cp_editor_left_tab/cp_editor_left_choice/ -e s/cp_editor_right_tab/cp_editor_right_choice/ $resdir/xrc/cp_editor_panel.xrc-bk > $resdir/xrc/cp_editor_panel.xrc -rm $resdir/xrc/cp_editor_panel.xrc-bk - -echo patching $resdir/xrc/main_frame.xrc to have no border around the tab control. +echo "patching $resdir/xrc/main_frame.xrc to have no border around the tab control." mv $resdir/xrc/main_frame.xrc $resdir/xrc/main_frame.xrc-bk sed -e s/wxALL// $resdir/xrc/main_frame.xrc-bk > $resdir/xrc/main_frame.xrc rm $resdir/xrc/main_frame.xrc-bk @@ -36,3 +32,6 @@ -e "s/\${HUGIN_BUILDER}/$huginBuilder/g" \ $resdir/xrc/data/about.htm.in > $resdir/xrc/data/about.htm rm $resdir/xrc/data/about.htm.in + +echo "copying celeste data" +cp -f $celeste_data/* $resdir/xrc/data/ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2009-05-22 21:15:00
|
Revision: 3875 http://hugin.svn.sourceforge.net/hugin/?rev=3875&view=rev Author: harryvanderwolf Date: 2009-05-22 21:14:54 +0000 (Fri, 22 May 2009) Log Message: ----------- [OSX] Add PTBatcherGUI hack, only works on Leopard unfortunately; Add corrected XCode project (for hack) Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/trunk/mac/PTBatcherGUI_hack/ hugin/trunk/mac/PTBatcherGUI_hack/Contents/ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/ hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/PTBatcherGui hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/appIcon.icns hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-05-22 17:04:32 UTC (rev 3874) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-05-22 21:14:54 UTC (rev 3875) @@ -4994,6 +4994,7 @@ 57D50A720F595D0E00CCDCB5 /* Patch XRC */, 57D50A940F59631C00CCDCB5 /* Localise Help */, 57D50A5D0F595A6300CCDCB5 /* Complete Bundle */, + 730C9D220FC7389200BD61C0 /* PTBatcherGUI_hack */, ); buildRules = ( ); @@ -5668,6 +5669,20 @@ shellPath = /bin/sh; shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; }; + 730C9D220FC7389200BD61C0 /* PTBatcherGUI_hack */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = PTBatcherGUI_hack; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh\nfi"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist =================================================================== --- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist (rev 0) +++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Info.plist 2009-05-22 21:14:54 UTC (rev 3875) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleDisplayName</key> + <string>PTBatcherGui</string> + <key>CFBundleExecutable</key> + <string>PTBatcherGui</string> + <key>CFBundleGetInfoString</key> + <string>PTBatcherGui 1.0 Copyright 2009 Pablo d'Angelo et al.</string> + <key>CFBundleIconFile</key> + <string>appIcon.icns</string> + <key>CFBundleIdentifier</key> + <string>PTBatcherGui.Hugin.sourceforge.net</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>PTBatcherGui</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CFBundleSignature</key> + <string>PTBG</string> + <key>LSEnvironment</key> + <dict/> + <key>LSHasLocalizedDisplayName</key> + <false/> + <key>LSMinimumSystemVersion</key> + <string>10.4</string> + <key>LSUIElement</key> + <false/> + <key>NSAppleScriptEnabled</key> + <false/> + <key>NSHumanReadableCopyright</key> + <string>PTBatcherGui 1.0 Copyright 2009 Pablo d'Angelo et al.</string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> +</dict> +</plist> Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/PTBatcherGui =================================================================== (Binary files differ) Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/Contents/MacOS/PTBatcherGui ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist =================================================================== --- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist (rev 0) +++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/AppSettings.plist 2009-05-22 21:14:54 UTC (rev 3875) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>AppPathAsFirstArg</key> + <false/> + <key>Creator</key> + <string>Platypus-4.2</string> + <key>InterpreterParams</key> + <array/> + <key>IsDroppable</key> + <false/> + <key>OutputType</key> + <string>None</string> + <key>RemainRunningAfterCompletion</key> + <false/> + <key>RequiresAdminPrivileges</key> + <false/> + <key>ScriptInterpreter</key> + <string>/bin/sh</string> + <key>Secure</key> + <false/> + <key>TextBackground</key> + <string>#ffffff</string> + <key>TextEncoding</key> + <integer>1</integer> + <key>TextFont</key> + <string>Monaco</string> + <key>TextForeground</key> + <string>#000000</string> + <key>TextSize</key> + <real>10</real> +</dict> +</plist> Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings =================================================================== --- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings (rev 0) +++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/InfoPlist.strings 2009-05-22 21:14:54 UTC (rev 3875) @@ -0,0 +1,4 @@ +CFBundleName = "PTBatcherGui"; +CFBundleShortVersionString = "1.0"; +CFBundleGetInfoString = "PTBatcherGui version 1.0 Copyright 2009 Pablo d'Angelo et al."; +NSHumanReadableCopyright = "Copyright 2009 Pablo d'Angelo et al.."; \ No newline at end of file Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib =================================================================== (Binary files differ) Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/appIcon.icns =================================================================== (Binary files differ) Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/appIcon.icns ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script =================================================================== --- hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script (rev 0) +++ hugin/trunk/mac/PTBatcherGUI_hack/Contents/Resources/script 2009-05-22 21:14:54 UTC (rev 3875) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Original author: Aaron Voisine <aa...@vo...> +# pvQT modifications: Harry van der Wolf <har...@ho...> + +CWD="`dirname \"$0\"`" +BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`" +cd "$BASE" + +CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo $PWD)`" + +export DYLD_FRAMEWORK_PATH="$CWD/../Frameworks" +export PATH="$CWD:$CWD/../MacOS:$PATH" + + +# TODO: Have to add ".UTF-8" to the LANG since ommiting causes avidemux +# to crash on startup in locale_from_utf8(). +export LANG="`grep \"\`defaults read .GlobalPreferences AppleCollationOrder \ + 2>&1\`_\" /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | \ + awk '{print $2}'`.UTF-8" + +if [ $# -lt 2 ]; +then + $CWD/../MacOS/PTBG +else + $CWD/../MacOS/PTBG "$@" +fi + Added: hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh =================================================================== --- hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh (rev 0) +++ hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh 2009-05-22 21:14:54 UTC (rev 3875) @@ -0,0 +1,28 @@ +#PTBatcherGUI hack 2009-05-22 Harry van der Wolf + +contentsdir="$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents" +resdir="$contentsdir/Resources" +PTBG_hackdir="PTBatcherGUI_hack" + +# First copy neccessary files to PTBatcherGUI.app +cp $PTBG_hackdir/Contents/Info.plist $contentsdir +cp $PTBG_hackdir/Contents/Resources/appIcon.icns $contentsdir/Resources +cp $PTBG_hackdir/Contents/Resources/AppSettings.plist $contentsdir/Resources +cp $PTBG_hackdir/Contents/Resources/script $contentsdir/Resources + +# rename current PTBatcherGUI and copy platypus version +mv $contentsdir/MacOS/PTBatcherGui $contentsdir/MacOS/PTBG +cp $PTBG_hackdir/Contents/MacOS/PTBatcherGui $contentsdir/MacOS + +# Copy project files +cp -Rf $PTBG_hackdir/Contents/Resources/English.lproj/* "$resdir/en.lproj" + +if [ $lang = "en" ] + then + continue + else + ln -s "$resdir/en.lproj/InfoPlist.strings" "$localisedresdir/InfoPlist.strings" + ln -s "$resdir/en.lproj/MainMenu.nib" "$localisedresdir/MainMenu.nib" + fi + + Property changes on: hugin/trunk/mac/PTBatcherGUI_hack/PTBatcherGUI_hack.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2009-07-20 02:53:36
|
Revision: 4071 http://hugin.svn.sourceforge.net/hugin/?rev=4071&view=rev Author: ippei Date: 2009-07-20 02:53:23 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Mac: updated external program versions. Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/ExternalPrograms/readme.txt hugin/trunk/mac/ExternalPrograms/scripts/boost.sh hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2009-07-20 02:52:30 UTC (rev 4070) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2009-07-20 02:53:23 UTC (rev 4071) @@ -31,11 +31,11 @@ // wxWidgets WX_MAJOR_VERSION = 2.8 -WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.8/locale +WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.10/locale // ExifTool -EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.34 +EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.84 // Boost Thread -BOOST_VER = 1_36 +BOOST_VER = 1_39 BOOST_THREAD_LIB = libboost_thread Modified: hugin/trunk/mac/ExternalPrograms/readme.txt =================================================================== --- hugin/trunk/mac/ExternalPrograms/readme.txt 2009-07-20 02:52:30 UTC (rev 4070) +++ hugin/trunk/mac/ExternalPrograms/readme.txt 2009-07-20 02:53:23 UTC (rev 4071) @@ -3,7 +3,7 @@ HOWTO: -1. Download the source. You typically want to place it in the "ExternalPrograms" folder. +1. Download the source package of the external programs. You typically want to place it in the "ExternalPrograms" folder. 2. Edit ExternalPrograms/scripts/SetEnv-*.txt file appropriately, especially the myREPOSITORYDIR variable. 3. Open a Terminal window (bash is preferred). 5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b') @@ -15,25 +15,25 @@ The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw). -TIPS: +USAGE: When compiling programs from source specifying the above directory as prefix. You probably have to specify the correct SDK (-isysroot) and MacOS target version (-mmacosx-version-min) as well. You can make multiple 'repositories' as well. For example, you can make one for statically and one for dynamically linked product, or ones with different target architecture/OS versions. -LIBRARIES: +PROGRAMS: The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. -[Dynamic Build for distributable Hugin.app] -boost (1.38) +[Dynamic Build for distributable Hugin.app and PTBatcherGUI.app] +boost (1.39) libexpat (2.0.1) libjpeg (6b) -libpng (1.2.35) +libpng (1.2.38) libtiff (3.8.2) ilmbase (1.0.1) openexr16 (1.6.1) -pano13 (2.9.14-beta1) -wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693) -static/libexiv2 (0.18) +pano13 (2.9.14) +wxmac28 (2.8.10) +static/libexiv2 (0.18.2) static/lcms (1.17) static/libxmi (1.2) static/libglew (1.5.1) @@ -41,16 +41,16 @@ enblend (3.2) [Static Build for distributable command-line tools] -static/boost (1.38) +static/boost (1.39) static/libexpat (2.0.1) static/libjpeg (6b) -static/libpng (1.2.35) +static/libpng (1.2.38) static/libtiff (3.8.2) static/ilmbase (1.0.1) static/openexr16 (1.6.1) -static/pano13 (2.9.14-beta1) -static/wxmac28 (2.8.8, patch http://trac.wxwidgets.org/ticket/9693) -static/libexiv2 (0.18) +static/pano13 (2.9.14) +static/wxmac28 (2.8.10) +static/libexiv2 (0.18.2) static/lcms (1.17) static/libxmi (1.2) static/libglew (1.5.1) Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-07-20 02:52:30 UTC (rev 4070) +++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2009-07-20 02:53:23 UTC (rev 4071) @@ -19,7 +19,7 @@ # OTHERARGs=""; -BOOST_VER="1_38" +BOOST_VER="1_39" # install headers Modified: hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-07-20 02:52:30 UTC (rev 4070) +++ hugin/trunk/mac/ExternalPrograms/scripts/libpng.sh 2009-07-20 02:53:23 UTC (rev 4071) @@ -20,7 +20,7 @@ -PNGVER="1.2.35" +PNGVER="1.2.38" # init Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-07-20 02:52:30 UTC (rev 4070) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-07-20 02:53:23 UTC (rev 4071) @@ -660,6 +660,7 @@ 5785A3A20C3BED7F00DD8BD8 /* FitPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */; }; 578ED0000A8D0C160028A7FB /* hdr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFC0A8D0C150028A7FB /* hdr.cxx */; }; 578ED0010A8D0C160028A7FB /* rgbe.c in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFE0A8D0C160028A7FB /* rgbe.c */; }; + 578F27B21013825A005D8080 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4910D5532D400605D22 /* libexiv2.a */; }; 5796FA810C4395CC006B7C6E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 5796FA820C4395CC006B7C6E /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; 5796FA830C4395CC006B7C6E /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; @@ -2813,6 +2814,7 @@ 739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */, 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */, 576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */, + 578F27B21013825A005D8080 /* libexiv2.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8161,7 +8163,9 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Hugin; }; name = Debug; @@ -8196,7 +8200,9 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Hugin; }; name = Development; @@ -8231,7 +8237,9 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; OTHER_LDFLAGS = ""; PRODUCT_NAME = Hugin; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2009-09-26 14:52:04
|
Revision: 4495 http://hugin.svn.sourceforge.net/hugin/?rev=4495&view=rev Author: harryvanderwolf Date: 2009-09-26 14:51:53 +0000 (Sat, 26 Sep 2009) Log Message: ----------- [OSX] correct stupid mistake w.r.t. internal bundle linking to english help file for languages without help file. This should now function correctly Modified Paths: -------------- hugin/trunk/mac/localise-help.sh hugin/trunk/mac/localised.sh Modified: hugin/trunk/mac/localise-help.sh =================================================================== --- hugin/trunk/mac/localise-help.sh 2009-09-26 13:25:07 UTC (rev 4494) +++ hugin/trunk/mac/localise-help.sh 2009-09-26 14:51:53 UTC (rev 4495) @@ -5,7 +5,9 @@ resdir="$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources" huginsrcdir="../src/hugin1/hugin" xrcsrcdir="$huginsrcdir/xrc" +translationsdir="../src/translations" + mkdir -p "$resdir" for helplang in "en_EN" "fr_FR" "it_IT" @@ -25,4 +27,14 @@ done fi +done + +# Create softlinks to existing english help file in case a locale translation exist but no help files +for lang in "en" $(ls $translationsdir/*.po | sed -e "s/^.*\///g" -e "s/\.po//g") +do + if [ $lang != "fr" ] && [ $lang != "it" ] && [ $lang != "en" ] + then + cd "$resdir/$lang.lproj" + ln -s "../en.lproj/help" "help" + fi done \ No newline at end of file Modified: hugin/trunk/mac/localised.sh =================================================================== --- hugin/trunk/mac/localised.sh 2009-09-26 13:25:07 UTC (rev 4494) +++ hugin/trunk/mac/localised.sh 2009-09-26 14:51:53 UTC (rev 4495) @@ -10,6 +10,11 @@ mkdir -p "$resdir" +# The first thing to do is create a fake en.lproj and en.lproj/help folder +# If these do not exist the proper links can't be created +#mkdir -p "$resdir/en.lproj" +#mkdir -p "$resdir/en.lproj/help" + for lang in "en" $(ls $translationsdir/*.po | sed -e "s/^.*\///g" -e "s/\.po//g") do @@ -30,27 +35,28 @@ if [ $lang = "en" ] then continue - else - if [ $lang != "fr" ] && [ $lang != "it" ] - then - ln -s "$resdir/en.lproj/help" "$localisedresdir/help" - fi +# else +# if [ $lang != "fr" ] && [ $lang != "it" ] +# then +# ln -sf "$resdir/en.lproj/help" "../$lang.lproj/help" +# fi fi echo "$lang/hugin.mo from $lang.po" - msgfmt -v -o "$localedir/hugin.mo" "$translationsdir/$lang.po" + /opt/local/bin/msgfmt -v -o "$localedir/hugin.mo" "$translationsdir/$lang.po" echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$lang.po" if [ -f "$wxWidgetsLocaleDir/$lang.po" ] then - msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$lang.po" + /opt/local/bin/msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$lang.po" + # hack to get link to help file else echo "$lang.po not found;" parentLang=`echo $lang|sed s/_.*//` echo "$lang/wxstd.mo from $wxWidgetsLocaleDir/$parentLang.po" if [ -f "$wxWidgetsLocaleDir/$parentLang.po" ] then - msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$parentLang.po" + /opt/local/bin/msgfmt -v -o "$localedir/wxstd.mo" "$wxWidgetsLocaleDir/$parentLang.po" else echo "$parentLang.po not found;" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ski...@us...> - 2009-12-08 03:46:05
|
Revision: 4755 http://hugin.svn.sourceforge.net/hugin/?rev=4755&view=rev Author: skipgaede Date: 2009-12-08 03:45:56 +0000 (Tue, 08 Dec 2009) Log Message: ----------- [OSX] Add additional libraries needed for text translation Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/complete-bundle.sh Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2009-12-08 02:35:20 UTC (rev 4754) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2009-12-08 03:45:56 UTC (rev 4755) @@ -4,28 +4,35 @@ REPOSITORY_ABSOLUTE_PATH = /PATH/TO/HUGIN/SOURCE/mac/ExternalPrograms/repository REPOSITORY_DIR = ./ExternalPrograms/repository -// GCC version can be 4.2 with Xcode 3.1 -//GCC_VERSION = 4.2 - // release architectures: RELEASE_ARCHS_32 = ppc i386 +// If doing a 4-way build on Leopard or Snow Leopard, Uncomment the following line //RELEASE_ARCHS_64 = ppc64 x86_64 +GCC_VERSION_i386 = 4.0 +GCC_VERSION_ppc = 4.0 +// If building on Leopard or Snow Leopard, Uncomment the following 2 lines: +//GCC_VERSION_x86_64 = 4.2 +//GCC_VERSION_ppc64 = 4.2 + // SDK target SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk +// If doing 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines: //SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk //SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk // deployment target MACOSX_DEPLOYMENT_TARGET_ppc = 10.4 MACOSX_DEPLOYMENT_TARGET_i386 = 10.4 +// If doing 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines: //MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5 //MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5 // special optimization PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4 PER_ARCH_CFLAGS_i386 = -march=prescott -mtune=pentium-m -ftree-vectorize +// If doing 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines: //PER_ARCH_CFLAGS_ppc64 = -mcpu=G5 -mtune=G5 -ftree-vectorize //PER_ARCH_CFLAGS_x86_64 = -march=core2 -mtune=core2 -ftree-vectorize @@ -33,9 +40,12 @@ WX_MAJOR_VERSION = 2.8 WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.10/locale -// ExifTool -EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.84 +// gettext +GETTEXT_VERSION = 0.17 +/// ExifTool +EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.96 + // Boost Thread BOOST_VER = 1_40 BOOST_THREAD_LIB = libboost_thread Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2009-12-08 02:35:20 UTC (rev 4754) +++ hugin/trunk/mac/complete-bundle.sh 2009-12-08 03:45:56 UTC (rev 4755) @@ -10,7 +10,7 @@ App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat" +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf" binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ski...@us...> - 2009-12-08 22:33:46
|
Revision: 4759 http://hugin.svn.sourceforge.net/hugin/?rev=4759&view=rev Author: skipgaede Date: 2009-12-08 22:33:39 +0000 (Tue, 08 Dec 2009) Log Message: ----------- [OSX] added support for gettext libraries in BuildConfig.xcconfig.orig & Hugin.xcodeproj Modified Paths: -------------- hugin/trunk/mac/BuildConfig.xcconfig.orig hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig =================================================================== --- hugin/trunk/mac/BuildConfig.xcconfig.orig 2009-12-08 17:33:26 UTC (rev 4758) +++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2009-12-08 22:33:39 UTC (rev 4759) @@ -1,6 +1,16 @@ #include "../mac/Version.xcconfig" +//---------------------------------- +// 20091208.0 sg Added gettext version, needed for libraries with embedded hyphen in name +// Added documentation about when absolute pathspecs are needed +//---------------------------------- + // where external libraries are installed +// Note: the repository directory can either be located within the source code tree, +// or external to the source code tree. If the directory is located within the tree, +// the path to it can be stated relative to the location of the "mac" directory as shown below. +// If the repository directory is external, give the fully qualified path to the repository +// for the value of REPOSITORY_DIR REPOSITORY_ABSOLUTE_PATH = /PATH/TO/HUGIN/SOURCE/mac/ExternalPrograms/repository REPOSITORY_DIR = ./ExternalPrograms/repository @@ -11,7 +21,7 @@ GCC_VERSION_i386 = 4.0 GCC_VERSION_ppc = 4.0 -// If building on Leopard or Snow Leopard, Uncomment the following 2 lines: +// If doing a 4-way build on Leopard or Snow Leopard, Uncomment the following 2 lines: //GCC_VERSION_x86_64 = 4.2 //GCC_VERSION_ppc64 = 4.2 @@ -38,12 +48,14 @@ // wxWidgets WX_MAJOR_VERSION = 2.8 +// See comments above for REPOSITORY_DIR. This may need to be a fully qualified path. WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.10/locale // gettext GETTEXT_VERSION = 0.17 /// ExifTool +// See comments above for REPOSITORY_DIR. This may need to be a fully qualified path. EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.96 // Boost Thread Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-12-08 17:33:26 UTC (rev 4758) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2009-12-08 22:33:39 UTC (rev 4759) @@ -928,7 +928,7 @@ 7332AEC40D8D4C45002BF5FF /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; }; 73411F151077B205001831AF /* HDRMergeOptionDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73411F131077B205001831AF /* HDRMergeOptionDialog.cpp */; }; 73437AC410BD9C7D0014F41D /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; - 73482F5C0FD97B3900B6088C /* libboost_thread-1_38.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73482F5B0FD97B3900B6088C /* libboost_thread-1_38.a */; }; + 73482F5C0FD97B3900B6088C /* libboost_thread-1_40.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73482F5B0FD97B3900B6088C /* libboost_thread-1_40.a */; }; 734FB9B40EB3929500CD7122 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 734FB9B20EB3929500CD7122 /* libGLEW.a */; }; 734FBA5B0EB3A20500CD7122 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */; }; 734FBA5C0EB3A20500CD7122 /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */; }; @@ -1134,6 +1134,8 @@ 73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; 73EBC0AC0EC9E3540068B821 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; 73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + E864E2C610CE8437007AC6E4 /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E864E2C510CE8437007AC6E4 /* liblcms.dylib */; }; + E864E2C710CE8437007AC6E4 /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E864E2C510CE8437007AC6E4 /* liblcms.dylib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -2456,8 +2458,8 @@ 7332AEAE0D8D4986002BF5FF /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; }; 73411F131077B205001831AF /* HDRMergeOptionDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDRMergeOptionDialog.cpp; sourceTree = "<group>"; }; 73411F141077B205001831AF /* HDRMergeOptionDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRMergeOptionDialog.h; sourceTree = "<group>"; }; - 73482F5B0FD97B3900B6088C /* libboost_thread-1_38.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-1_38.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_thread-1_38.a"; sourceTree = SOURCE_ROOT; }; - 73482F5D0FD97B7200B6088C /* libboost_filesystem-xgcc40-mt-1_38.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_filesystem-xgcc40-mt-1_38.a"; path = "../../ExternalPrograms/repository/lib-static/libboost_filesystem-xgcc40-mt-1_38.a"; sourceTree = SOURCE_ROOT; }; + 73482F5B0FD97B3900B6088C /* libboost_thread-1_40.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-1_40.a"; path = "ExternalPrograms/repository/lib/libboost_thread-1_40.a"; sourceTree = SOURCE_ROOT; }; + 73482F5D0FD97B7200B6088C /* libboost_filesystem-1_40.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_filesystem-1_40.a"; path = "ExternalPrograms/repository/lib/libboost_filesystem-1_40.a"; sourceTree = SOURCE_ROOT; }; 734BDF5B0EB8EC19007EBA09 /* PTBatcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = PTBatcher; sourceTree = BUILT_PRODUCTS_DIR; }; 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Celeste.cpp; sourceTree = "<group>"; }; 734FB8DE0EB38B9400CD7122 /* Celeste.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Celeste.h; sourceTree = "<group>"; }; @@ -2537,11 +2539,11 @@ 736421C710763D0C000121C5 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; 736421C810763D0C000121C5 /* algtinyvector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = algtinyvector.h; sourceTree = "<group>"; }; 736421DF10763FCD000121C5 /* hugin_hdrmerge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hugin_hdrmerge.cpp; sourceTree = "<group>"; }; - 7368E40A1083930D00519ED0 /* libintl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.dylib; path = ../../ExternalPrograms/repository/lib/libintl.dylib; sourceTree = SOURCE_ROOT; }; - 7368E40B1083930D00519ED0 /* libgettextsrc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextsrc.dylib; path = ../../ExternalPrograms/repository/lib/libgettextsrc.dylib; sourceTree = SOURCE_ROOT; }; - 7368E40C1083930D00519ED0 /* libgettextpo.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextpo.dylib; path = ../../ExternalPrograms/repository/lib/libgettextpo.dylib; sourceTree = SOURCE_ROOT; }; - 7368E40D1083930D00519ED0 /* libgettextlib.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextlib.dylib; path = ../../ExternalPrograms/repository/lib/libgettextlib.dylib; sourceTree = SOURCE_ROOT; }; - 7368E40E1083930D00519ED0 /* libasprintf.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libasprintf.dylib; path = ../../ExternalPrograms/repository/lib/libasprintf.dylib; sourceTree = SOURCE_ROOT; }; + 7368E40A1083930D00519ED0 /* libintl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.dylib; path = lib/libintl.dylib; sourceTree = "<group>"; }; + 7368E40B1083930D00519ED0 /* libgettextsrc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextsrc.dylib; path = lib/libgettextsrc.dylib; sourceTree = "<group>"; }; + 7368E40C1083930D00519ED0 /* libgettextpo.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextpo.dylib; path = lib/libgettextpo.dylib; sourceTree = "<group>"; }; + 7368E40D1083930D00519ED0 /* libgettextlib.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgettextlib.dylib; path = lib/libgettextlib.dylib; sourceTree = "<group>"; }; + 7368E40E1083930D00519ED0 /* libasprintf.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libasprintf.dylib; path = lib/libasprintf.dylib; sourceTree = "<group>"; }; 7368E4621083ABF200519ED0 /* NumTransDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumTransDialog.h; sourceTree = "<group>"; }; 7368E4631083ABF200519ED0 /* NumTransDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumTransDialog.cpp; sourceTree = "<group>"; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; @@ -2559,7 +2561,7 @@ 73C0DAD71046E9B000CB55B7 /* ImageTransformsGPU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageTransformsGPU.cpp; sourceTree = "<group>"; }; 73C0DAD81046E9B000CB55B7 /* ImageTransformsGPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageTransformsGPU.h; sourceTree = "<group>"; }; 73C0DBA51046EAC700CB55B7 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; - 73C0DC001047011C00CB55B7 /* glew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glew.h; path = ../../ExternalPrograms/repository/include/GL/glew.h; sourceTree = SOURCE_ROOT; }; + 73C0DC001047011C00CB55B7 /* glew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glew.h; path = GL/glew.h; sourceTree = "<group>"; }; 73C0DC6B104715E500CB55B7 /* PreviewControlPointTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewControlPointTool.cpp; sourceTree = "<group>"; }; 73C0DC6C104715E500CB55B7 /* PreviewControlPointTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewControlPointTool.h; sourceTree = "<group>"; }; 73C0DC6D104715E500CB55B7 /* GreatCircles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GreatCircles.h; sourceTree = "<group>"; }; @@ -2591,27 +2593,28 @@ 73D24BB11061592C00B8A25D /* CleanCP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CleanCP.cpp; sourceTree = "<group>"; }; 73D24BB21061592C00B8A25D /* CleanCP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CleanCP.h; sourceTree = "<group>"; }; 73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; - 73EAB5280E86CF120020D514 /* libboost_thread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_thread.a; path = "../../ExternalPrograms/repository/lib-static/libboost_thread.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5290E86CF120020D514 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexiv2.a; path = "../../ExternalPrograms/repository/lib-static/libexiv2.a"; sourceTree = SOURCE_ROOT; }; - 73EAB52A0E86CF120020D514 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "../../ExternalPrograms/repository/lib-static/libexpat.a"; sourceTree = SOURCE_ROOT; }; - 73EAB52B0E86CF120020D514 /* libHalf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libHalf.a; path = "../../ExternalPrograms/repository/lib-static/libHalf.a"; sourceTree = SOURCE_ROOT; }; - 73EAB52C0E86CF120020D514 /* libIex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIex.a; path = "../../ExternalPrograms/repository/lib-static/libIex.a"; sourceTree = SOURCE_ROOT; }; - 73EAB52D0E86CF120020D514 /* libIlmImf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmImf.a; path = "../../ExternalPrograms/repository/lib-static/libIlmImf.a"; sourceTree = SOURCE_ROOT; }; - 73EAB52E0E86CF120020D514 /* libIlmThread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmThread.a; path = "../../ExternalPrograms/repository/lib-static/libIlmThread.a"; sourceTree = SOURCE_ROOT; }; - 73EAB52F0E86CF120020D514 /* libImath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libImath.a; path = "../../ExternalPrograms/repository/lib-static/libImath.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5300E86CF120020D514 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../ExternalPrograms/repository/lib-static/libjpeg.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5310E86CF120020D514 /* liblcms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblcms.a; path = "../../ExternalPrograms/repository/lib-static/liblcms.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5320E86CF120020D514 /* libpano13.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano13.a; path = "../../ExternalPrograms/repository/lib-static/libpano13.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5330E86CF120020D514 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../ExternalPrograms/repository/lib-static/libpng.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5340E86CF120020D514 /* libpng12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng12.a; path = "../../ExternalPrograms/repository/lib-static/libpng12.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5350E86CF120020D514 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = "../../ExternalPrograms/repository/lib-static/libtiff.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5360E86CF120020D514 /* libtiffxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiffxx.a; path = "../../ExternalPrograms/repository/lib-static/libtiffxx.a"; sourceTree = SOURCE_ROOT; }; - 73EAB5370E86CF120020D514 /* libxmi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxmi.a; path = "../../ExternalPrograms/repository/lib-static/libxmi.a"; sourceTree = SOURCE_ROOT; }; + 73EAB5280E86CF120020D514 /* libboost_thread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_thread.a; path = ExternalPrograms/repository/lib/libboost_thread.a; sourceTree = SOURCE_ROOT; }; + 73EAB5290E86CF120020D514 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexiv2.a; path = lib/libexiv2.a; sourceTree = "<group>"; }; + 73EAB52A0E86CF120020D514 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = lib/libexpat.a; sourceTree = "<group>"; }; + 73EAB52B0E86CF120020D514 /* libHalf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libHalf.a; path = lib/libHalf.a; sourceTree = "<group>"; }; + 73EAB52C0E86CF120020D514 /* libIex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIex.a; path = lib/libIex.a; sourceTree = "<group>"; }; + 73EAB52D0E86CF120020D514 /* libIlmImf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmImf.a; path = lib/libIlmImf.a; sourceTree = "<group>"; }; + 73EAB52E0E86CF120020D514 /* libIlmThread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmThread.a; path = lib/libIlmThread.a; sourceTree = "<group>"; }; + 73EAB52F0E86CF120020D514 /* libImath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libImath.a; path = lib/libImath.a; sourceTree = "<group>"; }; + 73EAB5300E86CF120020D514 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = lib/libjpeg.a; sourceTree = "<group>"; }; + 73EAB5310E86CF120020D514 /* liblcms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblcms.a; path = lib/liblcms.a; sourceTree = "<group>"; }; + 73EAB5320E86CF120020D514 /* libpano13.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano13.a; path = lib/libpano13.a; sourceTree = "<group>"; }; + 73EAB5330E86CF120020D514 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = lib/libpng.a; sourceTree = "<group>"; }; + 73EAB5340E86CF120020D514 /* libpng12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng12.a; path = lib/libpng12.a; sourceTree = "<group>"; }; + 73EAB5350E86CF120020D514 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = lib/libtiff.a; sourceTree = "<group>"; }; + 73EAB5360E86CF120020D514 /* libtiffxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiffxx.a; path = lib/libtiffxx.a; sourceTree = "<group>"; }; + 73EAB5370E86CF120020D514 /* libxmi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxmi.a; path = lib/libxmi.a; sourceTree = "<group>"; }; 73EAB5390E86CF130020D514 /* exiv2.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = exiv2.pc; sourceTree = "<group>"; }; 73EAB53A0E86CF130020D514 /* IlmBase.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IlmBase.pc; sourceTree = "<group>"; }; 73EAB53B0E86CF130020D514 /* OpenEXR.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenEXR.pc; sourceTree = "<group>"; }; 73EAB5400E86CF130020D514 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; }; 73EBC0900EC9E0B20068B821 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; }; + E864E2C510CE8437007AC6E4 /* liblcms.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblcms.dylib; path = lib/liblcms.dylib; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2751,6 +2754,7 @@ 5731C4BD0D55358A00605D22 /* libexiv2.a in Frameworks */, 5731C4C10D5536C000605D22 /* libexpat.dylib in Frameworks */, 5731C4C90D55372000605D22 /* libz.dylib in Frameworks */, + E864E2C610CE8437007AC6E4 /* liblcms.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3014,7 +3018,7 @@ 73EAB5500E86CF130020D514 /* libtiff.a in Frameworks */, 73EAB5510E86CF130020D514 /* libtiffxx.a in Frameworks */, 73EAB5520E86CF130020D514 /* libxmi.a in Frameworks */, - 73482F5C0FD97B3900B6088C /* libboost_thread-1_38.a in Frameworks */, + 73482F5C0FD97B3900B6088C /* libboost_thread-1_40.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3048,6 +3052,7 @@ 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */, 576ADDA60F7FB324003E8EE3 /* libhugin_celeste.a in Frameworks */, 578F27B21013825A005D8080 /* libexiv2.a in Frameworks */, + E864E2C710CE8437007AC6E4 /* liblcms.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3571,11 +3576,6 @@ 5745FBE5094E1C4700E6B672 /* repository */ = { isa = PBXGroup; children = ( - 7368E40A1083930D00519ED0 /* libintl.dylib */, - 7368E40B1083930D00519ED0 /* libgettextsrc.dylib */, - 7368E40C1083930D00519ED0 /* libgettextpo.dylib */, - 7368E40D1083930D00519ED0 /* libgettextlib.dylib */, - 7368E40E1083930D00519ED0 /* libasprintf.dylib */, 570898E30D4CB635008949E7 /* gnumake */, 5769F7A10D239D6A00A6AD01 /* PTmender */, 5769F79F0D239D6A00A6AD01 /* PTblender */, @@ -3583,6 +3583,12 @@ 5769F7A20D239D6A00A6AD01 /* PTroller */, 570D581A082A9ED50030E768 /* enblend */, 5769F79E0D239D6A00A6AD01 /* enfuse */, + E864E2C510CE8437007AC6E4 /* liblcms.dylib */, + 7368E40A1083930D00519ED0 /* libintl.dylib */, + 7368E40B1083930D00519ED0 /* libgettextsrc.dylib */, + 7368E40C1083930D00519ED0 /* libgettextpo.dylib */, + 7368E40D1083930D00519ED0 /* libgettextlib.dylib */, + 7368E40E1083930D00519ED0 /* libasprintf.dylib */, 57565A640D088DAD00344F55 /* libboost_thread.dylib */, 734FB9B20EB3929500CD7122 /* libGLEW.a */, 573B8F85067BAAB900B7B355 /* libpano13.dylib */, @@ -4518,8 +4524,8 @@ 73EAB5250E86CEA90020D514 /* repository-static */ = { isa = PBXGroup; children = ( - 73482F5D0FD97B7200B6088C /* libboost_filesystem-xgcc40-mt-1_38.a */, - 73482F5B0FD97B3900B6088C /* libboost_thread-1_38.a */, + 73482F5D0FD97B7200B6088C /* libboost_filesystem-1_40.a */, + 73482F5B0FD97B3900B6088C /* libboost_thread-1_40.a */, 73EAB5280E86CF120020D514 /* libboost_thread.a */, 73EAB5290E86CF120020D514 /* libexiv2.a */, 73EAB52A0E86CF120020D514 /* libexpat.a */, @@ -4551,8 +4557,8 @@ 73EAB53B0E86CF130020D514 /* OpenEXR.pc */, ); name = pkgconfig; - path = "../../ExternalPrograms/repository/lib-static/pkgconfig"; - sourceTree = SOURCE_ROOT; + path = lib/pkgconfig; + sourceTree = "<group>"; }; 73EAB53C0E86CF130020D514 /* wx */ = { isa = PBXGroup; @@ -4560,8 +4566,8 @@ 73EAB53D0E86CF130020D514 /* include */, ); name = wx; - path = "../../ExternalPrograms/repository/lib-static/wx"; - sourceTree = SOURCE_ROOT; + path = lib/wx; + sourceTree = "<group>"; }; 73EAB53D0E86CF130020D514 /* include */ = { isa = PBXGroup; @@ -5665,7 +5671,7 @@ attributes = { BuildIndependentTargetsInParallel = NO; }; - buildConfigurationList = 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin" */; + buildConfigurationList = 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin-test" */; compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; knownRegions = ( @@ -7639,8 +7645,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = HuginBase; }; name = Debug; @@ -7659,8 +7667,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = HuginBase; }; name = Development; @@ -7680,7 +7690,9 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(REPOSITORY_DIR)/lib", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = HuginBase; }; name = Release; @@ -8741,9 +8753,11 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Hugin; }; name = Debug; @@ -8780,9 +8794,11 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Hugin; }; name = Development; @@ -8819,9 +8835,11 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; OTHER_LDFLAGS = ""; PRODUCT_NAME = Hugin; }; @@ -9723,7 +9741,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin" */ = { + 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin-test" */ = { isa = XCConfigurationList; buildConfigurations = ( 5745FC2A094E1E6400E6B672 /* Debug */, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-01-10 21:28:38
|
Revision: 4867 http://hugin.svn.sourceforge.net/hugin/?rev=4867&view=rev Author: harryvanderwolf Date: 2010-01-10 21:28:27 +0000 (Sun, 10 Jan 2010) Log Message: ----------- [OSX] Add new target and files to make a "Hugin_tools" package that can be distributed. This package would contain all command line tools from the Hugin project from which only a few are delivered with the Hugin bundle. Build state at 90% Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/trunk/mac/Hugin_tools/ hugin/trunk/mac/Hugin_tools/Readme.txt hugin/trunk/mac/Hugin_tools/set_environment.txt hugin/trunk/mac/complete-tools-package.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-01-10 16:06:27 UTC (rev 4866) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-01-10 21:28:27 UTC (rev 4867) @@ -53,11 +53,16 @@ ); dependencies = ( 57D382CB0E2369D600445A37 /* PBXTargetDependency */, + 739A0C7E10FA54FC00D8E4C7 /* PBXTargetDependency */, 73C154511052F40A00AE93C1 /* PBXTargetDependency */, + 739A0BEE10FA4A5600D8E4C7 /* PBXTargetDependency */, 733E94F81067EA3B0013CDB9 /* PBXTargetDependency */, 736421F8107640F7000121C5 /* PBXTargetDependency */, + 739A0C7C10FA54FC00D8E4C7 /* PBXTargetDependency */, 57D382CD0E2369D600445A37 /* PBXTargetDependency */, - 73C1544D1052F40300AE93C1 /* PBXTargetDependency */, + 739A0BF010FA4A5600D8E4C7 /* PBXTargetDependency */, + 739A0D1E10FA57B600D8E4C7 /* PBXTargetDependency */, + 739A0D2010FA57B600D8E4C7 /* PBXTargetDependency */, ); name = "tools - other dynamic"; productName = "tools - other dynamic"; @@ -149,6 +154,19 @@ name = "configure hugin_version.h"; productName = "configure hugin_version.h"; }; + 739A0C0010FA510300D8E4C7 /* Separate tools package */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 739A0C0610FA513500D8E4C7 /* Build configuration list for PBXAggregateTarget "Separate tools package" */; + buildPhases = ( + 739A0D4A10FA59E000D8E4C7 /* Complete tools package */, + ); + dependencies = ( + 739A0C0510FA511600D8E4C7 /* PBXTargetDependency */, + 739A0C0810FA515F00D8E4C7 /* PBXTargetDependency */, + ); + name = "Separate tools package"; + productName = "Separate tools package"; + }; 73E6769410F8BE4E001807AB /* lib static monolithic */ = { isa = PBXAggregateTarget; buildConfigurationList = 73E6769A10F8BE67001807AB /* Build configuration list for PBXAggregateTarget "lib static monolithic" */; @@ -956,6 +974,96 @@ 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; 7388EAFD0F6BFB1B001E08FA /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; }; 738C044B10A0A5D90061D144 /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738C044910A0A5D90061D144 /* AboutDialog.cpp */; }; + 739A0C1210FA524E00D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 739A0C1310FA524E00D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 739A0C1410FA524E00D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 739A0C1510FA524E00D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 739A0C1610FA524E00D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 739A0C1710FA524E00D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 739A0C1810FA524E00D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 739A0C1910FA524E00D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 739A0C1A10FA524E00D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 739A0C1B10FA524E00D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 739A0C1C10FA524E00D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 739A0C1D10FA524E00D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 739A0C1E10FA524E00D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739A0C1F10FA524E00D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739A0C3310FA52FC00D8E4C7 /* fulla.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576482E80C469093003AFC2F /* fulla.cpp */; }; + 739A0C5110FA539B00D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 739A0C5210FA539B00D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 739A0C5310FA539B00D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 739A0C5410FA539B00D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 739A0C5510FA539B00D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 739A0C5610FA539B00D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 739A0C5710FA539B00D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 739A0C5810FA539B00D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 739A0C5910FA539B00D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 739A0C5A10FA539B00D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 739A0C5B10FA539B00D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 739A0C5C10FA539B00D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 739A0C5D10FA539B00D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739A0C5E10FA539B00D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739A0C6E10FA53FB00D8E4C7 /* autooptimiser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */; }; + 739A0C8610FA557300D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; }; + 739A0C8710FA557500D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; }; + 739A0C9110FA55B800D8E4C7 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; + 739A0C9210FA55C000D8E4C7 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; + 739A0C9710FA560500D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 739A0C9810FA560600D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 739A0CA810FA567700D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 739A0CA910FA567700D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 739A0CAA10FA567700D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 739A0CAB10FA567700D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 739A0CAC10FA567700D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 739A0CAD10FA567700D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 739A0CAE10FA567700D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 739A0CAF10FA567700D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 739A0CB010FA567700D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 739A0CB110FA567700D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 739A0CB210FA567700D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 739A0CB310FA567700D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 739A0CB410FA567700D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739A0CB510FA567700D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739A0CB610FA567700D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; }; + 739A0CB710FA567700D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 739A0CF510FA56D300D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 739A0CF610FA56D300D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 739A0CF710FA56D300D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 739A0CF810FA56D300D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 739A0CF910FA56D300D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 739A0CFA10FA56D300D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 739A0CFB10FA56D300D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 739A0CFC10FA56D300D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 739A0CFD10FA56D300D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 739A0CFE10FA56D300D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 739A0CFF10FA56D300D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 739A0D0010FA56D300D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 739A0D0110FA56D300D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739A0D0210FA56D300D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739A0D0310FA56D300D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; }; + 739A0D0410FA56D300D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 739A0D1310FA573A00D8E4C7 /* tca_correct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */; }; + 739A0D1910FA579200D8E4C7 /* vig_optimize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576482E90C469093003AFC2F /* vig_optimize.cpp */; }; + 739A0D2B10FA584700D8E4C7 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; + 739A0D3410FA588800D8E4C7 /* hugin_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E122480D2BE45700743A93 /* hugin_version.h */; }; + 739A0DC410FA5FB700D8E4C7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 739A0DC510FA5FB700D8E4C7 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; }; + 739A0DC610FA5FB700D8E4C7 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; + 739A0DC710FA5FB700D8E4C7 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; }; + 739A0DC810FA5FB700D8E4C7 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; }; + 739A0DC910FA5FB700D8E4C7 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; }; + 739A0DCA10FA5FB700D8E4C7 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; }; + 739A0DCB10FA5FB700D8E4C7 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; }; + 739A0DCC10FA5FB700D8E4C7 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; }; + 739A0DCD10FA5FB700D8E4C7 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 739A0DCE10FA5FB700D8E4C7 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; }; + 739A0DCF10FA5FB700D8E4C7 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; }; + 739A0DD010FA5FB700D8E4C7 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 739A0DD110FA5FB700D8E4C7 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 739A0DD210FA5FB700D8E4C7 /* libexiv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB5290E86CF120020D514 /* libexiv2.a */; }; + 739A0DD310FA5FB700D8E4C7 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 739A0DED10FA605300D8E4C7 /* pto2mk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 739A0DE710FA602200D8E4C7 /* pto2mk.cpp */; }; + 739A0E7610FA667600D8E4C7 /* PTLensDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F83B0C3026D200736343 /* PTLensDB.h */; }; 739F846C0EC75403004771D6 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; }; 739F84790EC754CC004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; 739F84D00EC77E9A004771D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; @@ -1956,6 +2064,139 @@ remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = configure; }; + 739A0BED10FA4A5600D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 73EBC08F0EC9E0B20068B821; + remoteInfo = "celeste dynamic"; + }; + 739A0BEF10FA4A5600D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 73573E2B10F9EEA300CF0ECD; + remoteInfo = pano_trafo; + }; + 739A0C0410FA511600D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571046810D25F698006A3C69; + remoteInfo = "bundled tools"; + }; + 739A0C0710FA515F00D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57D382C50E2369D000445A37; + remoteInfo = "tools - other dynamic"; + }; + 739A0C0B10FA524E00D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 739A0C0D10FA524E00D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; + 739A0C3B10FA531900D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F8140C30268F00736343; + remoteInfo = PTLensDB; + }; + 739A0C4B10FA539B00D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 739A0C4D10FA539B00D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; + 739A0C7B10FA54FC00D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 739A0C0910FA524E00D8E4C7; + remoteInfo = "fulla dynamic"; + }; + 739A0C7D10FA54FC00D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 739A0C4710FA539B00D8E4C7; + remoteInfo = "autooptimiser dynamic"; + }; + 739A0CA210FA567700D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 739A0CA410FA567700D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; + 739A0CEF10FA56D300D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 739A0CF110FA56D300D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; + 739A0D1D10FA57B600D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 739A0CED10FA56D300D8E4C7; + remoteInfo = "tca_correct dynamic"; + }; + 739A0D1F10FA57B600D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 739A0CA010FA567700D8E4C7; + remoteInfo = "vig_optimize dynamic"; + }; + 739A0DBE10FA5FB700D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FE370D24CFEC00A6AD01; + remoteInfo = "vigra_impex Framework"; + }; + 739A0DC010FA5FB700D8E4C7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576900A90D24D29300A6AD01; + remoteInfo = "hugin_base Framework"; + }; 739F84FD0EC7803F004771D6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1977,13 +2218,6 @@ remoteGlobalIDString = 5769FC280D24A26400A6AD01; remoteInfo = frameworks; }; - 73C1544C1052F40300AE93C1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 734BDF5A0EB8EC19007EBA09; - remoteInfo = "PTBatcher dynamic"; - }; 73C154501052F40A00AE93C1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -2800,11 +3034,21 @@ 7368E4621083ABF200519ED0 /* NumTransDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumTransDialog.h; sourceTree = "<group>"; }; 7368E4631083ABF200519ED0 /* NumTransDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumTransDialog.cpp; sourceTree = "<group>"; }; 736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; }; + 73704DA310FA30520012F4C1 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; 737E1C180EC9EC0300BA4D9B /* hugin_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_config.h; sourceTree = "<group>"; }; 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResetDialog.cpp; sourceTree = "<group>"; }; 7388EAFC0F6BFB1B001E08FA /* ResetDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetDialog.h; sourceTree = "<group>"; }; 738C044910A0A5D90061D144 /* AboutDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AboutDialog.cpp; sourceTree = "<group>"; }; 738C044A10A0A5D90061D144 /* AboutDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutDialog.h; sourceTree = "<group>"; }; + 739A0C2410FA524E00D8E4C7 /* fulla */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fulla; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0C6310FA539B00D8E4C7 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0CBC10FA567700D8E4C7 /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0D0910FA56D300D8E4C7 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "complete-tools-package.sh"; sourceTree = "<group>"; }; + 739A0DD810FA5FB700D8E4C7 /* pto2mk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto2mk; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0DE710FA602200D8E4C7 /* pto2mk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pto2mk.cpp; sourceTree = "<group>"; }; + 739A0EA410FA7A3100D8E4C7 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = "<group>"; }; + 739A0EA510FA7A3100D8E4C7 /* set_environment.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set_environment.txt; sourceTree = "<group>"; }; 739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "lib/libwx_macu_gl-2.8.dylib"; sourceTree = "<group>"; }; 73BB09320FACC59E00B04997 /* PanoToolsUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PanoToolsUtils.h; sourceTree = "<group>"; }; @@ -3423,6 +3667,122 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739A0C1110FA524E00D8E4C7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0C1210FA524E00D8E4C7 /* libz.dylib in Frameworks */, + 739A0C1310FA524E00D8E4C7 /* libpng.dylib in Frameworks */, + 739A0C1410FA524E00D8E4C7 /* libtiff.dylib in Frameworks */, + 739A0C1510FA524E00D8E4C7 /* libjpeg.dylib in Frameworks */, + 739A0C1610FA524E00D8E4C7 /* libIex.dylib in Frameworks */, + 739A0C1710FA524E00D8E4C7 /* libIlmThread.dylib in Frameworks */, + 739A0C1810FA524E00D8E4C7 /* libIlmImf.dylib in Frameworks */, + 739A0C1910FA524E00D8E4C7 /* libImath.dylib in Frameworks */, + 739A0C1A10FA524E00D8E4C7 /* libHalf.dylib in Frameworks */, + 739A0C1B10FA524E00D8E4C7 /* libpano13.dylib in Frameworks */, + 739A0C1C10FA524E00D8E4C7 /* libboost_thread.dylib in Frameworks */, + 739A0C1D10FA524E00D8E4C7 /* libexpat.dylib in Frameworks */, + 739A0C1E10FA524E00D8E4C7 /* HuginVigraImpex.framework in Frameworks */, + 739A0C1F10FA524E00D8E4C7 /* HuginBase.framework in Frameworks */, + 739A0C8610FA557300D8E4C7 /* libexiv2.a in Frameworks */, + 739A0C9110FA55B800D8E4C7 /* libintl.dylib in Frameworks */, + 739A0C9810FA560600D8E4C7 /* libiconv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0C5010FA539B00D8E4C7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0C5110FA539B00D8E4C7 /* libz.dylib in Frameworks */, + 739A0C5210FA539B00D8E4C7 /* libpng.dylib in Frameworks */, + 739A0C5310FA539B00D8E4C7 /* libtiff.dylib in Frameworks */, + 739A0C5410FA539B00D8E4C7 /* libjpeg.dylib in Frameworks */, + 739A0C5510FA539B00D8E4C7 /* libIex.dylib in Frameworks */, + 739A0C5610FA539B00D8E4C7 /* libIlmThread.dylib in Frameworks */, + 739A0C5710FA539B00D8E4C7 /* libIlmImf.dylib in Frameworks */, + 739A0C5810FA539B00D8E4C7 /* libImath.dylib in Frameworks */, + 739A0C5910FA539B00D8E4C7 /* libHalf.dylib in Frameworks */, + 739A0C5A10FA539B00D8E4C7 /* libpano13.dylib in Frameworks */, + 739A0C5B10FA539B00D8E4C7 /* libboost_thread.dylib in Frameworks */, + 739A0C5C10FA539B00D8E4C7 /* libexpat.dylib in Frameworks */, + 739A0C5D10FA539B00D8E4C7 /* HuginVigraImpex.framework in Frameworks */, + 739A0C5E10FA539B00D8E4C7 /* HuginBase.framework in Frameworks */, + 739A0C8710FA557500D8E4C7 /* libexiv2.a in Frameworks */, + 739A0C9710FA560500D8E4C7 /* libiconv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0CA710FA567700D8E4C7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0CA810FA567700D8E4C7 /* libz.dylib in Frameworks */, + 739A0CA910FA567700D8E4C7 /* libpng.dylib in Frameworks */, + 739A0CAA10FA567700D8E4C7 /* libtiff.dylib in Frameworks */, + 739A0CAB10FA567700D8E4C7 /* libjpeg.dylib in Frameworks */, + 739A0CAC10FA567700D8E4C7 /* libIex.dylib in Frameworks */, + 739A0CAD10FA567700D8E4C7 /* libIlmThread.dylib in Frameworks */, + 739A0CAE10FA567700D8E4C7 /* libIlmImf.dylib in Frameworks */, + 739A0CAF10FA567700D8E4C7 /* libImath.dylib in Frameworks */, + 739A0CB010FA567700D8E4C7 /* libHalf.dylib in Frameworks */, + 739A0CB110FA567700D8E4C7 /* libpano13.dylib in Frameworks */, + 739A0CB210FA567700D8E4C7 /* libboost_thread.dylib in Frameworks */, + 739A0CB310FA567700D8E4C7 /* libexpat.dylib in Frameworks */, + 739A0CB410FA567700D8E4C7 /* HuginVigraImpex.framework in Frameworks */, + 739A0CB510FA567700D8E4C7 /* HuginBase.framework in Frameworks */, + 739A0CB610FA567700D8E4C7 /* libexiv2.a in Frameworks */, + 739A0CB710FA567700D8E4C7 /* libiconv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0CF410FA56D300D8E4C7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0CF510FA56D300D8E4C7 /* libz.dylib in Frameworks */, + 739A0CF610FA56D300D8E4C7 /* libpng.dylib in Frameworks */, + 739A0CF710FA56D300D8E4C7 /* libtiff.dylib in Frameworks */, + 739A0CF810FA56D300D8E4C7 /* libjpeg.dylib in Frameworks */, + 739A0CF910FA56D300D8E4C7 /* libIex.dylib in Frameworks */, + 739A0CFA10FA56D300D8E4C7 /* libIlmThread.dylib in Frameworks */, + 739A0CFB10FA56D300D8E4C7 /* libIlmImf.dylib in Frameworks */, + 739A0CFC10FA56D300D8E4C7 /* libImath.dylib in Frameworks */, + 739A0CFD10FA56D300D8E4C7 /* libHalf.dylib in Frameworks */, + 739A0CFE10FA56D300D8E4C7 /* libpano13.dylib in Frameworks */, + 739A0CFF10FA56D300D8E4C7 /* libboost_thread.dylib in Frameworks */, + 739A0D0010FA56D300D8E4C7 /* libexpat.dylib in Frameworks */, + 739A0D0110FA56D300D8E4C7 /* HuginVigraImpex.framework in Frameworks */, + 739A0D0210FA56D300D8E4C7 /* HuginBase.framework in Frameworks */, + 739A0D0310FA56D300D8E4C7 /* libexiv2.a in Frameworks */, + 739A0D0410FA56D300D8E4C7 /* libiconv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0DC310FA5FB700D8E4C7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0DC410FA5FB700D8E4C7 /* libz.dylib in Frameworks */, + 739A0DC510FA5FB700D8E4C7 /* libpng.dylib in Frameworks */, + 739A0DC610FA5FB700D8E4C7 /* libtiff.dylib in Frameworks */, + 739A0DC710FA5FB700D8E4C7 /* libjpeg.dylib in Frameworks */, + 739A0DC810FA5FB700D8E4C7 /* libIex.dylib in Frameworks */, + 739A0DC910FA5FB700D8E4C7 /* libIlmThread.dylib in Frameworks */, + 739A0DCA10FA5FB700D8E4C7 /* libIlmImf.dylib in Frameworks */, + 739A0DCB10FA5FB700D8E4C7 /* libImath.dylib in Frameworks */, + 739A0DCC10FA5FB700D8E4C7 /* libHalf.dylib in Frameworks */, + 739A0DCD10FA5FB700D8E4C7 /* libpano13.dylib in Frameworks */, + 739A0DCE10FA5FB700D8E4C7 /* libboost_thread.dylib in Frameworks */, + 739A0DCF10FA5FB700D8E4C7 /* libexpat.dylib in Frameworks */, + 739A0DD010FA5FB700D8E4C7 /* HuginVigraImpex.framework in Frameworks */, + 739A0DD110FA5FB700D8E4C7 /* HuginBase.framework in Frameworks */, + 739A0DD210FA5FB700D8E4C7 /* libexiv2.a in Frameworks */, + 739A0DD310FA5FB700D8E4C7 /* libiconv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C153661052E6DE00AE93C1 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3445,6 +3805,7 @@ 73C153811052E76600AE93C1 /* libtiff.dylib in Frameworks */, 73C153821052E76600AE93C1 /* libz.dylib in Frameworks */, E8A7C02C10F79A8200839DF3 /* libGLEW.a in Frameworks */, + 739A0D2B10FA584700D8E4C7 /* libintl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3521,6 +3882,7 @@ 73E79F370D674F4600C07126 /* HuginVigraImpex.framework in Frameworks */, 73E79F1F0D674EAC00C07126 /* libexpat.dylib in Frameworks */, E8A7C03510F79ADB00839DF3 /* libexiv2.a in Frameworks */, + 739A0C9210FA55C000D8E4C7 /* libintl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3557,6 +3919,7 @@ 57114E9E06BC2301004F4FA7 /* mac */ = { isa = PBXGroup; children = ( + 739A0EA310FA7A3100D8E4C7 /* Hugin_tools */, 5751D8600939F1C0001477EA /* Hugin.xcodeproj */, 57D18D8E0E13BD340054A523 /* Version.xcconfig */, 57AB3D760E1E976300EFD03F /* BuildConfig.xcconfig.orig */, @@ -3573,6 +3936,7 @@ 571D8C700E213216006D0305 /* patch-xrc.sh */, 57A2BC2E0D45422800E9FFEC /* copyExifTool.sh */, 576902090D24DBA100A6AD01 /* complete-bundle.sh */, + 739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */, 57810AAB0D32D79400F48296 /* complete-embed.sh */, 573E2E440B76AC5100E86281 /* ExternalPrograms */, 573E2E5E0B76AD0100E86281 /* Documents */, @@ -3917,6 +4281,7 @@ 57460AB30C4E7BD5004507F7 /* tools */ = { isa = PBXGroup; children = ( + 739A0DE710FA602200D8E4C7 /* pto2mk.cpp */, 73573E5110F9EEF400CF0ECD /* pano_trafo.cpp */, 736421DF10763FCD000121C5 /* hugin_hdrmerge.cpp */, 73D24B9A1061566B00B8A25D /* cpclean.cpp */, @@ -4688,6 +5053,12 @@ 7364217010763A22000121C5 /* deghosting_mask */, 73E6770010F8BF18001807AB /* libhugin_base.a */, 73573E4710F9EEA300CF0ECD /* pano_trafo */, + 73704DA310FA30520012F4C1 /* Carbon.framework */, + 739A0C2410FA524E00D8E4C7 /* fulla */, + 739A0C6310FA539B00D8E4C7 /* autooptimiser */, + 739A0CBC10FA567700D8E4C7 /* vig_optimize */, + 739A0D0910FA56D300D8E4C7 /* tca_correct */, + 739A0DD810FA5FB700D8E4C7 /* pto2mk */, ); sourceTree = "<group>"; }; @@ -4796,6 +5167,15 @@ path = data; sourceTree = "<group>"; }; + 739A0EA310FA7A3100D8E4C7 /* Hugin_tools */ = { + isa = PBXGroup; + children = ( + 739A0EA410FA7A3100D8E4C7 /* Readme.txt */, + 739A0EA510FA7A3100D8E4C7 /* set_environment.txt */, + ); + path = Hugin_tools; + sourceTree = "<group>"; + }; 73C153851052E7BA00AE93C1 /* lens_calibrate */ = { isa = PBXGroup; children = ( @@ -5280,6 +5660,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739A0E7C10FA66B100D8E4C7 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0E7610FA667600D8E4C7 /* PTLensDB.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C153F31052EADD00AE93C1 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -5386,6 +5774,7 @@ buildActionMask = 2147483647; files = ( 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */, + 739A0D3410FA588800D8E4C7 /* hugin_version.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6001,6 +6390,98 @@ productReference = 7364217010763A22000121C5 /* deghosting_mask */; productType = "com.apple.product-type.tool"; }; + 739A0C0910FA524E00D8E4C7 /* fulla dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = 739A0C2010FA524E00D8E4C7 /* Build configuration list for PBXNativeTarget "fulla dynamic" */; + buildPhases = ( + 739A0C0E10FA524E00D8E4C7 /* Sources */, + 739A0C1110FA524E00D8E4C7 /* Frameworks */, + 739A0E7C10FA66B100D8E4C7 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + 739A0C3C10FA531900D8E4C7 /* PBXTargetDependency */, + 739A0C0A10FA524E00D8E4C7 /* PBXTargetDependency */, + 739A0C0C10FA524E00D8E4C7 /* PBXTargetDependency */, + ); + name = "fulla dynamic"; + productName = "sample open_close"; + productReference = 739A0C2410FA524E00D8E4C7 /* fulla */; + productType = "com.apple.product-type.tool"; + }; + 739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = 739A0C5F10FA539B00D8E4C7 /* Build configuration list for PBXNativeTarget "autooptimiser dynamic" */; + buildPhases = ( + 739A0C4E10FA539B00D8E4C7 /* Sources */, + 739A0C5010FA539B00D8E4C7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 739A0C4A10FA539B00D8E4C7 /* PBXTargetDependency */, + 739A0C4C10FA539B00D8E4C7 /* PBXTargetDependency */, + ); + name = "autooptimiser dynamic"; + productName = "sample open_close"; + productReference = 739A0C6310FA539B00D8E4C7 /* autooptimiser */; + productType = "com.apple.product-type.tool"; + }; + 739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = 739A0CB810FA567700D8E4C7 /* Build configuration list for PBXNativeTarget "vig_optimize dynamic" */; + buildPhases = ( + 739A0CA510FA567700D8E4C7 /* Sources */, + 739A0CA710FA567700D8E4C7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 739A0CA110FA567700D8E4C7 /* PBXTargetDependency */, + 739A0CA310FA567700D8E4C7 /* PBXTargetDependency */, + ); + name = "vig_optimize dynamic"; + productName = "sample open_close"; + productReference = 739A0CBC10FA567700D8E4C7 /* vig_optimize */; + productType = "com.apple.product-type.tool"; + }; + 739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = 739A0D0510FA56D300D8E4C7 /* Build configuration list for PBXNativeTarget "tca_correct dynamic" */; + buildPhases = ( + 739A0CF210FA56D300D8E4C7 /* Sources */, + 739A0CF410FA56D300D8E4C7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 739A0CEE10FA56D300D8E4C7 /* PBXTargetDependency */, + 739A0CF010FA56D300D8E4C7 /* PBXTargetDependency */, + ); + name = "tca_correct dynamic"; + productName = "sample open_close"; + productReference = 739A0D0910FA56D300D8E4C7 /* tca_correct */; + productType = "com.apple.product-type.tool"; + }; + 739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = 739A0DD410FA5FB700D8E4C7 /* Build configuration list for PBXNativeTarget "pto2mk dynamic" */; + buildPhases = ( + 739A0DC110FA5FB700D8E4C7 /* Sources */, + 739A0DC310FA5FB700D8E4C7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 739A0DBD10FA5FB700D8E4C7 /* PBXTargetDependency */, + 739A0DBF10FA5FB700D8E4C7 /* PBXTargetDependency */, + ); + name = "pto2mk dynamic"; + productName = "sample open_close"; + productReference = 739A0DD810FA5FB700D8E4C7 /* pto2mk */; + productType = "com.apple.product-type.tool"; + }; 73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */ = { isa = PBXNativeTarget; buildConfigurationList = 73C153711052E70C00AE93C1 /* Build configuration list for PBXNativeTarget "calibrate_lens dynamic" */; @@ -6186,13 +6667,19 @@ 57D50B380F5971A600CCDCB5 /* celeste static */, 57D382C50E2369D000445A37 /* tools - other dynamic */, 73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */, - 7332AE910D8D4986002BF5FF /* matchpoint dynamic */, - 734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */, + 739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */, + 73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */, 73EBC08F0EC9E0B20068B821 /* celeste dynamic */, - 73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */, 73D24B4D106152CD00B8A25D /* cpclean */, 7364216F10763A22000121C5 /* deghosting_mask */, + 739A0C0910FA524E00D8E4C7 /* fulla dynamic */, + 7332AE910D8D4986002BF5FF /* matchpoint dynamic */, 73573E2B10F9EEA300CF0ECD /* pano_trafo */, + 734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */, + 739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */, + 739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */, + 739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */, + 739A0C0010FA510300D8E4C7 /* Separate tools package */, ); }; /* End PBXProject section */ @@ -6571,6 +7058,20 @@ shellPath = /bin/sh; shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/\\${DISPLAY_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n -e \"s/\\${HUGIN_BUILDER}/$HUGIN_BUILDER/\" \\\n -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\" >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\" >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\" >> ../src/hugin_version.h\nfi"; }; + 739A0D4A10FA59E000D8E4C7 /* Complete tools package */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete tools package"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-tools-package.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME/Libraries/*.dylib\nfi"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -7069,6 +7570,46 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 739A0C0E10FA524E00D8E4C7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0C3310FA52FC00D8E4C7 /* fulla.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0C4E10FA539B00D8E4C7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0C6E10FA53FB00D8E4C7 /* autooptimiser.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0CA510FA567700D8E4C7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0D1910FA579200D8E4C7 /* vig_optimize.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0CF210FA56D300D8E4C7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0D1310FA573A00D8E4C7 /* tca_correct.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 739A0DC110FA5FB700D8E4C7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 739A0DED10FA605300D8E4C7 /* pto2mk.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 73C153651052E6DE00AE93C1 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -7555,6 +8096,101 @@ target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 737E1C1F0EC9EC5100BA4D9B /* PBXContainerItemProxy */; }; + 739A0BEE10FA4A5600D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 73EBC08F0EC9E0B20068B821 /* celeste dynamic */; + targetProxy = 739A0BED10FA4A5600D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0BF010FA4A5600D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 73573E2B10F9EEA300CF0ECD /* pano_trafo */; + targetProxy = 739A0BEF10FA4A5600D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C0510FA511600D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571046810D25F698006A3C69 /* bundled tools */; + targetProxy = 739A0C0410FA511600D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C0810FA515F00D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57D382C50E2369D000445A37 /* tools - other dynamic */; + targetProxy = 739A0C0710FA515F00D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C0A10FA524E00D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 739A0C0B10FA524E00D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C0C10FA524E00D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 739A0C0D10FA524E00D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C3C10FA531900D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F8140C30268F00736343 /* PTLensDB */; + targetProxy = 739A0C3B10FA531900D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C4A10FA539B00D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 739A0C4B10FA539B00D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C4C10FA539B00D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 739A0C4D10FA539B00D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C7C10FA54FC00D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 739A0C0910FA524E00D8E4C7 /* fulla dynamic */; + targetProxy = 739A0C7B10FA54FC00D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0C7E10FA54FC00D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */; + targetProxy = 739A0C7D10FA54FC00D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0CA110FA567700D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 739A0CA210FA567700D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0CA310FA567700D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 739A0CA410FA567700D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0CEE10FA56D300D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 739A0CEF10FA56D300D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0CF010FA56D300D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 739A0CF110FA56D300D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0D1E10FA57B600D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */; + targetProxy = 739A0D1D10FA57B600D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0D2010FA57B600D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */; + targetProxy = 739A0D1F10FA57B600D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0DBD10FA5FB700D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; + targetProxy = 739A0DBE10FA5FB700D8E4C7 /* PBXContainerItemProxy */; + }; + 739A0DBF10FA5FB700D8E4C7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576900A90D24D29300A6AD01 /* hugin_base Framework */; + targetProxy = 739A0DC010FA5FB700D8E4C7 /* PBXContainerItemProxy */; + }; 739F84FE0EC7803F004771D6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; @@ -7570,11 +8206,6 @@ target = 5769FC280D24A26400A6AD01 /* frameworks */; targetProxy = 73C153CA1052E90E00AE93C1 /* PBXContainerItemProxy */; }; - 73C1544D1052F40300AE93C1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */; - targetProxy = 73C1544C1052F40300AE93C1 /* PBXContainerItemProxy */; - }; 73C154511052F40A00AE93C1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */; @@ -9282,6 +9913,11 @@ ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib-static\""; + OTHER_LDFLAGS = ( + "-search_paths_first", + "-Wl", + "-v", + ); PRODUCT_NAME = celeste; }; name = Release; @@ -10087,6 +10723,329 @@ }; name = Release; }; + 739A0C0110FA510400D8E4C7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "Separate tools package"; + }; + name = Debug; + }; + 739A0C0210FA510400D8E4C7 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "Separate tools package"; + }; + name = Development; + }; + 739A0C0310FA510400D8E4C7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = "Separate tools package"; + ZERO_LINK = NO; + }; + name = Release; + }; + 739A0C2110FA524E00D8E4C7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Debug; + }; + 739A0C2210FA524E00D8E4C7 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Development; + }; + 739A0C2310FA524E00D8E4C7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/lensdb, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = fulla; + }; + name = Release; + }; + 739A0C6010FA539B00D8E4C7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Debug; + }; + 739A0C6110FA539B00D8E4C7 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Development; + }; + 739A0C6210FA539B00D8E4C7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = autooptimiser; + }; + name = Release; + }; + 739A0CB910FA567700D8E4C7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Debug; + }; + 739A0CBA10FA567700D8E4C7 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Development; + }; + 739A0CBB10FA567700D8E4C7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = vig_optimize; + }; + name = Release; + }; + 739A0D0610FA56D300D8E4C7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Debug; + }; + 739A0D0710FA56D300D8E4C7 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Development; + }; + 739A0D0810FA56D300D8E4C7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = tca_correct; + }; + name = Release; + }; + 739A0DD510FA5FB700D8E4C7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Debug; + }; + 739A0DD610FA5FB700D8E4C7 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = hugin_hdrmerge; + }; + name = Development; + }; + 739A0DD710FA5FB700D8E4C7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\""; + PRODUCT_NAME = pto2mk; + }; + name = Release; + }; 73C153... [truncated message content] |
From: <har...@us...> - 2010-01-11 07:43:28
|
Revision: 4873 http://hugin.svn.sourceforge.net/hugin/?rev=4873&view=rev Author: harryvanderwolf Date: 2010-01-11 07:43:17 +0000 (Mon, 11 Jan 2010) Log Message: ----------- [OSX] next 5% of OSX "Hugin_tools" package incl. minor bugfixes Modified Paths: -------------- hugin/trunk/mac/Hugin_tools/Readme.txt hugin/trunk/mac/complete-tools-package.sh Modified: hugin/trunk/mac/Hugin_tools/Readme.txt =================================================================== --- hugin/trunk/mac/Hugin_tools/Readme.txt 2010-01-11 06:50:53 UTC (rev 4872) +++ hugin/trunk/mac/Hugin_tools/Readme.txt 2010-01-11 07:43:17 UTC (rev 4873) @@ -1,5 +1,5 @@ Readme.txt for Hugin_tools package -version 0.1, 10 January 2010, Harry van der Wolf +version 0.2, 11 January 2010, Harry van der Wolf == How to "install" this package == @@ -7,13 +7,16 @@ == How to use the tools inside the Hugin_tools directory == -- Open a terminal -- cd into the Hugin_tools directory -- issue the command "source ./set_environment.txt" (without the double quotes) +1. Open a terminal +2. cd into the Hugin_tools directory +3. issue the command "source ./set_environment.txt" (without the double quotes) -Now the tools inside this directory are set as first entries in your PATH statement. -Note: This is not a permanent change but only in this terminal session. +The tools reside inside the bin directory but are system wide available due to the command +issued in (3.).The bin directory inside this Hugin_tools directory is set as first entry +in your PATH statement. It means that you can execute the tools without needing to use paths. +Note: This addition is not a permanent change but only in this terminal session. +Note2: due to license restrictions autopano-sift-c and panomatic are not part of this package. =================================================================================================================== License Agreements @@ -21,4 +24,6 @@ The programs included in this package are released under the GNU General Public License version 2. If you do not agree with the GPL vs. 2 license agreement, please delete this package and it's contents immediately. -This package is completely based on the Hugin project and the tools it contains. Hugin can be downloaded from http:/hugin.sourceforge.net. +This package is completely based on the Hugin project and the tools it contains. Hugin can be downloaded from http://hugin.sourceforge.net. +Next to the Hugin tools also enblend, enfuse and the PT* binaries from panotools are included. + Modified: hugin/trunk/mac/complete-tools-package.sh =================================================================== --- hugin/trunk/mac/complete-tools-package.sh 2010-01-11 06:50:53 UTC (rev 4872) +++ hugin/trunk/mac/complete-tools-package.sh 2010-01-11 07:43:17 UTC (rev 4873) @@ -11,8 +11,11 @@ archs="ppc i386 ppc64 x86_64" libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf" -#frameworks="HuginBaseWx.framework HuginBase.framework" -bins="align_image_stack autooptimiser calibrate_lens celeste cpclean deghosting_mask fulla matchpoint pano_trafo pto2mk tca_correct vig_optimize" +# these are the "internal" Hugin tools +bins="align_image_stack autooptimiser calibrate_lens celeste cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize" +# these are the external tools. Note: due to license restrictions autopano-sift-c and panomatic are not copied in +ext_bins="enblend enfuse PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop" + binaries="$Package/$dylib_install_loc/*.dylib $Package/bin/* $Package/Frameworks/Hugin*.framework/Hugin*" #------------------------------------------------ @@ -20,12 +23,15 @@ rm -Rf $Package mkdir -p $Package cp -Rf ../mac/Hugin_tools/* $Package -#rm -Rf "$Package/$dylib_install_loc" "$Package/Frameworks" "$Package/bin" mkdir -p "$Package/$dylib_install_loc" "$Package/Frameworks" "$Package/bin" for bin in $bins do cp $TARGET_BUILD_DIR/$bin "$Package/bin/" done +for ext_bin in $ext_bins +do + cp $REPOSITORY_DIR/bin/$ext_bin "$Package/bin/" +done cp -Rf $TARGET_BUILD_DIR/Hugin*.framework "$Package/Frameworks" for dylib in $libs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-01-11 08:43:28
|
Revision: 4875 http://hugin.svn.sourceforge.net/hugin/?rev=4875&view=rev Author: harryvanderwolf Date: 2010-01-11 08:43:20 +0000 (Mon, 11 Jan 2010) Log Message: ----------- [OSX] final 5% of "Hugin_tools" package Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/complete-tools-package.sh Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-01-11 08:27:48 UTC (rev 4874) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-01-11 08:43:20 UTC (rev 4875) @@ -1083,6 +1083,7 @@ 739F84DF0EC77EB6004771D6 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; }; 739F84F30EC77F57004771D6 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; 739F84F40EC77F57004771D6 /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; }; + 73A1602A10FB1A0100931D10 /* libPTLensDB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F8150C30268F00736343 /* libPTLensDB.a */; }; 73BB093D0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; }; 73BB093E0FACC71200B04997 /* PanoToolsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BB093C0FACC71200B04997 /* PanoToolsUtils.h */; }; 73BB093F0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; }; @@ -2771,7 +2772,7 @@ 57D50A620F595A6300CCDCB5 /* PTBatcherGUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PTBatcherGUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57D50A640F595A6300CCDCB5 /* PTBatcherGUI-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info.plist"; sourceTree = "<group>"; }; 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_celeste.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 57D50B520F5971A600CCDCB5 /* celeste_standalone */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste_standalone; sourceTree = BUILT_PRODUCTS_DIR; }; + 57D50B520F5971A600CCDCB5 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 4; languageSpecificationIdentifier = c.cpp; path = hugin_config_mac.h; sourceTree = "<group>"; }; 57DD345E0F5939D80030B958 /* celeste-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "celeste-Info.plist"; sourceTree = "<group>"; }; @@ -3025,7 +3026,7 @@ 734FBA5A0EB3A20500CD7122 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonaOptionsDialog.cpp; sourceTree = "<group>"; }; 734FBA840EB3A40300CD7122 /* NonaOptionsDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonaOptionsDialog.h; sourceTree = "<group>"; }; - 73573E4710F9EEA300CF0ECD /* pano_trafo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pano_trafo; sourceTree = BUILT_PRODUCTS_DIR; }; + 73573E4710F9EEA300CF0ECD /* cpclean */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cpclean; sourceTree = BUILT_PRODUCTS_DIR; }; 73573E5110F9EEF400CF0ECD /* pano_trafo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pano_trafo.cpp; sourceTree = "<group>"; }; 7364217010763A22000121C5 /* deghosting_mask */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = deghosting_mask; sourceTree = BUILT_PRODUCTS_DIR; }; 736421C110763D0B000121C5 /* threshold.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threshold.h; sourceTree = "<group>"; }; @@ -3051,12 +3052,12 @@ 7388EAFC0F6BFB1B001E08FA /* ResetDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetDialog.h; sourceTree = "<group>"; }; 738C044910A0A5D90061D144 /* AboutDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AboutDialog.cpp; sourceTree = "<group>"; }; 738C044A10A0A5D90061D144 /* AboutDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutDialog.h; sourceTree = "<group>"; }; - 739A0C2410FA524E00D8E4C7 /* fulla */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fulla; sourceTree = BUILT_PRODUCTS_DIR; }; - 739A0C6310FA539B00D8E4C7 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; }; - 739A0CBC10FA567700D8E4C7 /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; }; - 739A0D0910FA56D300D8E4C7 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0C2410FA524E00D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0C6310FA539B00D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0CBC10FA567700D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0D0910FA56D300D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; }; 739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "complete-tools-package.sh"; sourceTree = "<group>"; }; - 739A0DD810FA5FB700D8E4C7 /* pto2mk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto2mk; sourceTree = BUILT_PRODUCTS_DIR; }; + 739A0DD810FA5FB700D8E4C7 /* hugin_hdrmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hugin_hdrmerge; sourceTree = BUILT_PRODUCTS_DIR; }; 739A0DE710FA602200D8E4C7 /* pto2mk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pto2mk.cpp; sourceTree = "<group>"; }; 739A0EA410FA7A3100D8E4C7 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = "<group>"; }; 739A0EA510FA7A3100D8E4C7 /* set_environment.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set_environment.txt; sourceTree = "<group>"; }; @@ -3102,7 +3103,7 @@ 73D24BB21061592C00B8A25D /* CleanCP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CleanCP.h; sourceTree = "<group>"; }; 73E488F710D5997300A083C8 /* CalculateOptimalROI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CalculateOptimalROI.h; path = algorithms/basic/CalculateOptimalROI.h; sourceTree = "<group>"; }; 73E488F810D5997300A083C8 /* CalculateOptimalROI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CalculateOptimalROI.cpp; path = algorithms/basic/CalculateOptimalROI.cpp; sourceTree = "<group>"; }; - 73E6770010F8BF18001807AB /* libhugin_base.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_base.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 73E6770010F8BF18001807AB /* libhugin_algorithms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_algorithms.a; sourceTree = BUILT_PRODUCTS_DIR; }; 73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; }; 73EAB5280E86CF120020D514 /* libboost_thread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libboost_thread.a; sourceTree = "<group>"; }; 73EAB5290E86CF120020D514 /* libexiv2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libexiv2.a; sourceTree = "<group>"; }; @@ -3124,7 +3125,7 @@ 73EAB53A0E86CF130020D514 /* IlmBase.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IlmBase.pc; sourceTree = "<group>"; }; 73EAB53B0E86CF130020D514 /* OpenEXR.pc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenEXR.pc; sourceTree = "<group>"; }; 73EAB5400E86CF130020D514 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; }; - 73EBC0900EC9E0B20068B821 /* celeste_standalone */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste_standalone; sourceTree = BUILT_PRODUCTS_DIR; }; + 73EBC0900EC9E0B20068B821 /* celeste */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = celeste; sourceTree = BUILT_PRODUCTS_DIR; }; E864E2C510CE8437007AC6E4 /* liblcms.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblcms.dylib; path = lib/liblcms.dylib; sourceTree = "<group>"; }; E8A7C02710F7993100839DF3 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGLEW.a; sourceTree = "<group>"; }; E8A7C02810F7993100839DF3 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libintl.a; sourceTree = "<group>"; }; @@ -3700,6 +3701,7 @@ 739A0C8610FA557300D8E4C7 /* libexiv2.a in Frameworks */, 739A0C9110FA55B800D8E4C7 /* libintl.dylib in Frameworks */, 739A0C9810FA560600D8E4C7 /* libiconv.dylib in Frameworks */, + 73A1602A10FB1A0100931D10 /* libPTLensDB.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4213,7 +4215,7 @@ 73E79F300D674EAC00C07126 /* align_image_stack */, 7332AEAE0D8D4986002BF5FF /* matchpoint */, 734BDF5B0EB8EC19007EBA09 /* PTBatcher */, - 73EBC0900EC9E0B20068B821 /* celeste_standalone */, + 73EBC0900EC9E0B20068B821 /* celeste */, ); name = "tools-dynamic"; sourceTree = "<group>"; @@ -4702,7 +4704,7 @@ 576482BE0C469052003AFC2F /* fulla */, 576482E20C469056003AFC2F /* vig_optimize */, 73C959140DA2C9DB00E19110 /* tca_correct */, - 57D50B520F5971A600CCDCB5 /* celeste_standalone */, + 57D50B520F5971A600CCDCB5 /* celeste */, ); name = "tools-static"; sourceTree = "<group>"; @@ -5065,14 +5067,14 @@ 73C153681052E6DE00AE93C1 /* calibrate_lens */, 73D24B4E106152CD00B8A25D /* cpclean */, 7364217010763A22000121C5 /* deghosting_mask */, - 73E6770010F8BF18001807AB /* libhugin_base.a */, - 73573E4710F9EEA300CF0ECD /* pano_trafo */, + 73E6770010F8BF18001807AB /* libhugin_algorithms.a */, + 73573E4710F9EEA300CF0ECD /* cpclean */, 73704DA310FA30520012F4C1 /* Carbon.framework */, - 739A0C2410FA524E00D8E4C7 /* fulla */, - 739A0C6310FA539B00D8E4C7 /* autooptimiser */, - 739A0CBC10FA567700D8E4C7 /* vig_optimize */, - 739A0D0910FA56D300D8E4C7 /* tca_correct */, - 739A0DD810FA5FB700D8E4C7 /* pto2mk */, + 739A0C2410FA524E00D8E4C7 /* hugin_hdrmerge */, + 739A0C6310FA539B00D8E4C7 /* hugin_hdrmerge */, + 739A0CBC10FA567700D8E4C7 /* hugin_hdrmerge */, + 739A0D0910FA56D300D8E4C7 /* hugin_hdrmerge */, + 739A0DD810FA5FB700D8E4C7 /* hugin_hdrmerge */, ); sourceTree = "<group>"; }; @@ -6253,7 +6255,7 @@ ); name = "celeste static"; productName = celeste_standalone; - productReference = 57D50B520F5971A600CCDCB5 /* celeste_standalone */; + productReference = 57D50B520F5971A600CCDCB5 /* celeste */; productType = "com.apple.product-type.tool"; }; 57E122570D2BE4E800743A93 /* align_image_stack static */ = { @@ -6384,7 +6386,7 @@ ); name = pano_trafo; productName = cpclean; - productReference = 73573E4710F9EEA300CF0ECD /* pano_trafo */; + productReference = 73573E4710F9EEA300CF0ECD /* cpclean */; productType = "com.apple.product-type.tool"; }; 7364216F10763A22000121C5 /* deghosting_mask */ = { @@ -6422,7 +6424,7 @@ ); name = "fulla dynamic"; productName = "sample open_close"; - productReference = 739A0C2410FA524E00D8E4C7 /* fulla */; + productReference = 739A0C2410FA524E00D8E4C7 /* hugin_hdrmerge */; productType = "com.apple.product-type.tool"; }; 739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */ = { @@ -6440,7 +6442,7 @@ ); name = "autooptimiser dynamic"; productName = "sample open_close"; - productReference = 739A0C6310FA539B00D8E4C7 /* autooptimiser */; + productReference = 739A0C6310FA539B00D8E4C7 /* hugin_hdrmerge */; productType = "com.apple.product-type.tool"; }; 739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */ = { @@ -6458,7 +6460,7 @@ ); name = "vig_optimize dynamic"; productName = "sample open_close"; - productReference = 739A0CBC10FA567700D8E4C7 /* vig_optimize */; + productReference = 739A0CBC10FA567700D8E4C7 /* hugin_hdrmerge */; productType = "com.apple.product-type.tool"; }; 739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */ = { @@ -6476,7 +6478,7 @@ ); name = "tca_correct dynamic"; productName = "sample open_close"; - productReference = 739A0D0910FA56D300D8E4C7 /* tca_correct */; + productReference = 739A0D0910FA56D300D8E4C7 /* hugin_hdrmerge */; productType = "com.apple.product-type.tool"; }; 739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */ = { @@ -6494,7 +6496,7 @@ ); name = "pto2mk dynamic"; productName = "sample open_close"; - productReference = 739A0DD810FA5FB700D8E4C7 /* pto2mk */; + productReference = 739A0DD810FA5FB700D8E4C7 /* hugin_hdrmerge */; productType = "com.apple.product-type.tool"; }; 73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */ = { @@ -6564,7 +6566,7 @@ ); name = hugin_base; productName = algorithms; - productReference = 73E6770010F8BF18001807AB /* libhugin_base.a */; + productReference = 73E6770010F8BF18001807AB /* libhugin_algorithms.a */; productType = "com.apple.product-type.library.static"; }; 73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */ = { @@ -6602,7 +6604,7 @@ ); name = "celeste dynamic"; productName = celeste_standalone; - productReference = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; + productReference = 73EBC0900EC9E0B20068B821 /* celeste */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ Modified: hugin/trunk/mac/complete-tools-package.sh =================================================================== --- hugin/trunk/mac/complete-tools-package.sh 2010-01-11 08:27:48 UTC (rev 4874) +++ hugin/trunk/mac/complete-tools-package.sh 2010-01-11 08:43:20 UTC (rev 4875) @@ -7,12 +7,13 @@ dylib_install_loc="Libraries" new_install_name_dirname="@executable_path/../$dylib_install_loc" +# Package is not really a correct name as it is a folder mimicing an OSX application Package="$TARGET_BUILD_DIR/Hugin_tools" archs="ppc i386 ppc64 x86_64" libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf" # these are the "internal" Hugin tools -bins="align_image_stack autooptimiser calibrate_lens celeste cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize" +bins="align_image_stack autooptimiser calibrate_lens celeste_standalone cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize" # these are the external tools. Note: due to license restrictions autopano-sift-c and panomatic are not copied in ext_bins="enblend enfuse PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ski...@us...> - 2010-01-13 09:58:14
|
Revision: 4884 http://hugin.svn.sourceforge.net/hugin/?rev=4884&view=rev Author: skipgaede Date: 2010-01-13 09:58:07 +0000 (Wed, 13 Jan 2010) Log Message: ----------- [OSX] Added support for new dynamic libraries to scripts Modified Paths: -------------- hugin/trunk/mac/complete-bundle.sh hugin/trunk/mac/complete-tools-package.sh Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2010-01-13 06:12:10 UTC (rev 4883) +++ hugin/trunk/mac/complete-bundle.sh 2010-01-13 09:58:07 UTC (rev 4884) @@ -10,7 +10,7 @@ App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf" +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi" binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*" Modified: hugin/trunk/mac/complete-tools-package.sh =================================================================== --- hugin/trunk/mac/complete-tools-package.sh 2010-01-13 06:12:10 UTC (rev 4883) +++ hugin/trunk/mac/complete-tools-package.sh 2010-01-13 09:58:07 UTC (rev 4884) @@ -11,7 +11,7 @@ Package="$TARGET_BUILD_DIR/Hugin_tools" archs="ppc i386 ppc64 x86_64" -libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf" +libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi" # these are the "internal" Hugin tools bins="align_image_stack autooptimiser calibrate_lens celeste_standalone cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize" # these are the external tools. Note: due to license restrictions autopano-sift-c and panomatic are not copied in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |