From: <da...@us...> - 2007-06-19 16:33:42
|
Revision: 2110 http://hugin.svn.sourceforge.net/hugin/?rev=2110&view=rev Author: dangelo Date: 2007-06-19 09:33:40 -0700 (Tue, 19 Jun 2007) Log Message: ----------- first working OpenEXR import Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/src/foreign/vigra_impex/codecmanager.cxx hugin/trunk/src/foreign/vigra_impex/exr.cxx hugin/trunk/src/include/config.h.in.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-06-19 08:22:06 UTC (rev 2109) +++ hugin/trunk/CMakeLists.txt 2007-06-19 16:33:40 UTC (rev 2110) @@ -20,6 +20,11 @@ FIND_PACKAGE(PANO13 REQUIRED) FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(OpenEXR) + +IF (OPENEXR_FOUND) +include_directories(${OPENEXR_INCLUDE_DIR}) +ENDIF (OPENEXR_FOUND) + FIND_PACKAGE(Boost REQUIRED) SET(wxWidgets_USE_LIBS base core xrc) @@ -40,7 +45,7 @@ MESSAGE("Vips include dir: ${VIPSCC_INCLUDE_DIR}") MESSAGE("Vips link dir: ${VIPSCC_LINK_DIR}") -MESSAGE("Vips link flags: ${VIPSCC_LINK_FLAGS}") +MESSAGE("Vips link flags: ${VIPSCC_LDFLAGS}") MESSAGE("Vips cflags: ${VIPSCC_CFLAGS}") MESSAGE("tiff libraries: ${TIFF_LIBRARIES}") Modified: hugin/trunk/src/foreign/vigra_impex/codecmanager.cxx =================================================================== --- hugin/trunk/src/foreign/vigra_impex/codecmanager.cxx 2007-06-19 08:22:06 UTC (rev 2109) +++ hugin/trunk/src/foreign/vigra_impex/codecmanager.cxx 2007-06-19 16:33:40 UTC (rev 2110) @@ -230,16 +230,15 @@ std::string fileType = filetype; if ( fileType == "undefined" ) { - fileType = getFileTypeByMagicString(filename); - vigra_precondition( !fileType.empty(), - "did not find a matching file type." ); - #ifdef DEBUG std::cerr << "detected " << fileType << " file format by magicstring of " << filename << std::endl; #endif + vigra_precondition( !fileType.empty(), + "did not find a matching file type." ); + } // return a codec factory by the file type Modified: hugin/trunk/src/foreign/vigra_impex/exr.cxx =================================================================== --- hugin/trunk/src/foreign/vigra_impex/exr.cxx 2007-06-19 08:22:06 UTC (rev 2109) +++ hugin/trunk/src/foreign/vigra_impex/exr.cxx 2007-06-19 16:33:40 UTC (rev 2110) @@ -76,10 +76,10 @@ // init magic strings desc.magicStrings.resize(1); desc.magicStrings[0].resize(4); - desc.magicStrings[0][0] = '\x2f'; - desc.magicStrings[0][1] = '\x76'; - desc.magicStrings[0][2] = '\x01'; - desc.magicStrings[0][3] = '\x31'; + desc.magicStrings[0][0] = '\x76'; + desc.magicStrings[0][1] = '\x2f'; + desc.magicStrings[0][2] = '\x31'; + desc.magicStrings[0][3] = '\x01'; // init file extensions desc.fileExtensions.resize(1); @@ -160,6 +160,7 @@ height = dw.max.y - dw.min.y + 1; position.x = dw.min.x; + scanline = dw.min.x; position.y = dw.min.y; // allocate data buffers @@ -169,8 +170,9 @@ void ExrDecoderImpl::nextScanline() { - file.setFrameBuffer (pixels.begin(), 1, width); - file.readPixels (1, width); + file.setFrameBuffer (pixels.data() - position.x - scanline * width, 1, width); + file.readPixels (scanline, scanline); + scanline++; // convert scanline to float float * dest = bands.begin(); for (int i=0; i < width; i++) { Modified: hugin/trunk/src/include/config.h.in.cmake =================================================================== --- hugin/trunk/src/include/config.h.in.cmake 2007-06-19 08:22:06 UTC (rev 2109) +++ hugin/trunk/src/include/config.h.in.cmake 2007-06-19 16:33:40 UTC (rev 2110) @@ -31,6 +31,12 @@ #define HasTIFF 1 #endif +/* Define if you have OpenEXR library */ +#cmakedefine OPENEXR_FOUND 1 +#ifdef OPENEXR_FOUND +#define HasEXR 1 +#endif + /* Define if you have Panotools library (pano13) */ #cmakedefine TLALLI_FOUND 1 #cmakedefine PANO13_FOUND 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-08 12:34:24
|
Revision: 2241 http://hugin.svn.sourceforge.net/hugin/?rev=2241&view=rev Author: ippei Date: 2007-07-08 05:34:22 -0700 (Sun, 08 Jul 2007) Log Message: ----------- Mac: moved config.h; use pano12 instead of buggy pano13 Modified Paths: -------------- hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj Added Paths: ----------- hugin/trunk/src/include/config_mac.h Removed Paths: ------------- hugin/trunk/mac/config.h Modified: hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj 2007-07-08 12:23:55 UTC (rev 2240) +++ hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj 2007-07-08 12:34:22 UTC (rev 2241) @@ -64,10 +64,22 @@ name = lib; productName = lib; }; + 57E83C640C4100F900F20012 /* copy config.h */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57E83C710C41015600F20012 /* Build configuration list for PBXAggregateTarget "copy config.h" */; + buildPhases = ( + 57E83D580C41020B00F20012 /* ShellScript */, + ); + dependencies = ( + ); + name = "copy config.h"; + productName = "copy config.h"; + }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ 5702996E07F967CB00F1FF15 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5702996D07F967CB00F1FF15 /* HuginFiles.icns */; }; + 570F69390C3448DF00256D95 /* exr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 577785FB0BF3439D0041F8FF /* exr.cxx */; }; 5711523606BC6562004F4FA7 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FF906BC2302004F4FA7 /* exif.cpp */; }; 5711523706BC6562004F4FA7 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FFB06BC2303004F4FA7 /* jpgfile.cpp */; }; 5711524306BC65EA004F4FA7 /* graph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114EB906BC2301004F4FA7 /* graph.cpp */; }; @@ -75,8 +87,6 @@ 571152F806BC6E4C004F4FA7 /* bmp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0306BC2301004F4FA7 /* bmp.cxx */; }; 571152F906BC6E58004F4FA7 /* byteorder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0506BC2301004F4FA7 /* byteorder.cxx */; }; 571152FE06BC6E8E004F4FA7 /* codecmanager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0706BC2301004F4FA7 /* codecmanager.cxx */; }; - 5720E4740BD456CD00E63404 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FF906BC2302004F4FA7 /* exif.cpp */; }; - 5720E4750BD456CD00E63404 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FFB06BC2303004F4FA7 /* jpgfile.cpp */; }; 5720E4900BD4575000E63404 /* Axb.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E47C0BD4575000E63404 /* Axb.c */; }; 5720E4920BD4575000E63404 /* lm.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4850BD4575000E63404 /* lm.c */; }; 5720E4940BD4575000E63404 /* lmbc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4880BD4575000E63404 /* lmbc.c */; }; @@ -84,10 +94,15 @@ 5720E4990BD4575000E63404 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E48D0BD4575000E63404 /* misc.c */; }; 5720E49F0BD457B600E63404 /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; 5720E4A80BD4584C00E63404 /* emor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4A70BD4584C00E63404 /* emor.cpp */; }; + 5722DF7A0C2C70AC00C1111F /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 5722DF7B0C2C70AC00C1111F /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 5722DF7C0C2C70AC00C1111F /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 5722DF7D0C2C70AC00C1111F /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 5722DF7E0C2C70AC00C1111F /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; 573B8FE1067BAC7B00B7B355 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; 573B8FE2067BAC8400B7B355 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 573B8FE3067BAC9000B7B355 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 573B8FE5067BACA500B7B355 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 573B8FE5067BACA500B7B355 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; 573F32AA09F7991A0088B333 /* PTLensDB.c in Sources */ = {isa = PBXBuildFile; fileRef = 573F32A909F7991A0088B333 /* PTLensDB.c */; }; 573F330509F79BAA0088B333 /* iccjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 573F330409F79BAA0088B333 /* iccjpeg.c */; }; 573F330C09F79C550088B333 /* Plot2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D0E09A0D78E004C6964 /* Plot2D.cpp */; }; @@ -99,7 +114,7 @@ 573F339909F7AB110088B333 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 573F339A09F7AB110088B333 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; 573F339B09F7AB110088B333 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 573F339C09F7AB110088B333 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 573F339C09F7AB110088B333 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; 573F339D09F7AB110088B333 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; 573F339E09F7AB110088B333 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; 573F339F09F7AB110088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; @@ -110,7 +125,7 @@ 573F33D809F7AC260088B333 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 573F33D909F7AC260088B333 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; 573F33DA09F7AC260088B333 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 573F33DB09F7AC260088B333 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 573F33DB09F7AC260088B333 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; 573F33DC09F7AC260088B333 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; 573F33DD09F7AC260088B333 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; 573F33DE09F7AC260088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; @@ -123,7 +138,7 @@ 57452BA6094E3C7400E6B672 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 57452BA7094E3C7400E6B672 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; 57452BA8094E3C7400E6B672 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 57452BA9094E3C7400E6B672 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 57452BA9094E3C7400E6B672 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; 57452BAA094E3C7400E6B672 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; 57452BAB094E3C7400E6B672 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; 57452BAC094E3C7400E6B672 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; @@ -144,7 +159,6 @@ 5770930006BD7424004058A1 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 5770930906BD754A004058A1 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; 5770930A06BD754A004058A1 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 577785FD0BF3439D0041F8FF /* exr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 577785FB0BF3439D0041F8FF /* exr.cxx */; }; 5777860B0BF3477A0041F8FF /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; 5777860C0BF3477B0041F8FF /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; 577786120BF347B80041F8FF /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; @@ -181,19 +195,6 @@ 57C1707D09A1268C00FAF325 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; 57C1707E09A126A600FAF325 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; 57C1707F09A126AC00FAF325 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 57C1709F09A12DE400FAF325 /* barrier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709209A12DE400FAF325 /* barrier.cpp */; }; - 57C170A009A12DE400FAF325 /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709309A12DE400FAF325 /* condition.cpp */; }; - 57C170A109A12DE400FAF325 /* exceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709409A12DE400FAF325 /* exceptions.cpp */; }; - 57C170A209A12DE400FAF325 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709509A12DE400FAF325 /* mutex.cpp */; }; - 57C170A309A12DE400FAF325 /* once.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709609A12DE400FAF325 /* once.cpp */; }; - 57C170A409A12DE400FAF325 /* recursive_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709709A12DE400FAF325 /* recursive_mutex.cpp */; }; - 57C170A509A12DE400FAF325 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709809A12DE400FAF325 /* thread.cpp */; }; - 57C170A609A12DE400FAF325 /* tss_dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709909A12DE400FAF325 /* tss_dll.cpp */; }; - 57C170A709A12DE400FAF325 /* tss_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709A09A12DE400FAF325 /* tss_hooks.cpp */; }; - 57C170A809A12DE400FAF325 /* tss_null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709B09A12DE400FAF325 /* tss_null.cpp */; }; - 57C170A909A12DE400FAF325 /* tss_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709C09A12DE400FAF325 /* tss_pe.cpp */; }; - 57C170AA09A12DE400FAF325 /* tss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709D09A12DE400FAF325 /* tss.cpp */; }; - 57C170AB09A12DE400FAF325 /* xtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709E09A12DE400FAF325 /* xtime.cpp */; }; 57CBEE2C06BC713500C43FF5 /* gif.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0A06BC2301004F4FA7 /* gif.cxx */; }; 57CBEE2D06BC713C00C43FF5 /* imageinfo.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0C06BC2301004F4FA7 /* imageinfo.cxx */; }; 57CBEE2E06BC713F00C43FF5 /* jpeg.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0D06BC2301004F4FA7 /* jpeg.cxx */; }; @@ -244,7 +245,7 @@ 57CF928E06BD7B7800780AC5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 57CF928F06BD7B7800780AC5 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 57CF929006BD7B7800780AC5 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 57CF929206BD7B7800780AC5 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 57CF929206BD7B7800780AC5 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; 57CF929306BD7B7800780AC5 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; 57CF929406BD7B7800780AC5 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; 57CF929506BD7B7800780AC5 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; @@ -263,10 +264,24 @@ 57E7827B0681074B0070F6AA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */; }; 57E7827C0681074B0070F6AA /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; 57E7827E0681074B0070F6AA /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 57E782810681074B0070F6AA /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 57E782810681074B0070F6AA /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; 57E782820681074B0070F6AA /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; 57E782900681074B0070F6AA /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3861067C789F00A5DBE0 /* System.framework */; }; 57E782910681074B0070F6AA /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3862067C789F00A5DBE0 /* WebKit.framework */; }; + 57E83B240C40F3F500F20012 /* barrier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709209A12DE400FAF325 /* barrier.cpp */; }; + 57E83B250C40F3F500F20012 /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709309A12DE400FAF325 /* condition.cpp */; }; + 57E83B260C40F3F500F20012 /* exceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709409A12DE400FAF325 /* exceptions.cpp */; }; + 57E83B270C40F3F500F20012 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709509A12DE400FAF325 /* mutex.cpp */; }; + 57E83B280C40F3F500F20012 /* once.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709609A12DE400FAF325 /* once.cpp */; }; + 57E83B290C40F3F500F20012 /* recursive_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709709A12DE400FAF325 /* recursive_mutex.cpp */; }; + 57E83B2A0C40F3F500F20012 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709809A12DE400FAF325 /* thread.cpp */; }; + 57E83B2B0C40F3F500F20012 /* tss_dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709909A12DE400FAF325 /* tss_dll.cpp */; }; + 57E83B2C0C40F3F500F20012 /* tss_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709A09A12DE400FAF325 /* tss_hooks.cpp */; }; + 57E83B2D0C40F3F500F20012 /* tss_null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709B09A12DE400FAF325 /* tss_null.cpp */; }; + 57E83B2E0C40F3F500F20012 /* tss_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709C09A12DE400FAF325 /* tss_pe.cpp */; }; + 57E83B2F0C40F3F500F20012 /* tss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709D09A12DE400FAF325 /* tss.cpp */; }; + 57E83B300C40F3F500F20012 /* xtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709E09A12DE400FAF325 /* xtime.cpp */; }; + 57E83B460C40F5A500F20012 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E83B230C40F3DD00F20012 /* libboost_thread.a */; }; 57EEC3EF08CD09CA00B6A197 /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EEC3EE08CD09C900B6A197 /* LocalizedFileTipProvider.cpp */; }; /* End PBXBuildFile section */ @@ -627,6 +642,97 @@ remoteGlobalIDString = 5711524906BC6709004F4FA7; remoteInfo = vigra_impex; }; + 57E83B310C40F3FC00F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83B220C40F3DD00F20012 /* boost_thread */; + remoteInfo = boost_thread; + }; + 57E83C650C41011B00F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C670C41011F00F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C6D0C41013800F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C7A0C4101A100F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C7C0C4101A400F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C7E0C4101A900F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C800C4101AE00F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C820C4101B300F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C840C4101BB00F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C860C4101C300F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C880C4101C700F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; + 57E83C8A0C4101CC00F20012 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012 /* copy config.h */; + remoteInfo = "copy config.h"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -804,7 +910,7 @@ 572B947D06FABE6B004EC7BF /* CPZoomDisplayPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPZoomDisplayPanel.cpp; sourceTree = "<group>"; }; 573154D5083B9CA500017987 /* PutAutopanoSiftToHuginOSX.applescript */ = {isa = PBXFileReference; explicitFileType = sourcecode.applescript; fileEncoding = 30; path = PutAutopanoSiftToHuginOSX.applescript; sourceTree = "<group>"; }; 573154D6083B9CA500017987 /* PutEnblendToHuginOSX.applescript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.applescript; path = PutEnblendToHuginOSX.applescript; sourceTree = "<group>"; }; - 573B8F85067BAAB900B7B355 /* libpano13.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano13.a; path = lib/libpano13.a; sourceTree = "<group>"; }; + 573B8F85067BAAB900B7B355 /* libpano12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano12.a; path = lib/libpano12.a; sourceTree = "<group>"; }; 573B8FD6067BAC4600B7B355 /* nona */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = BUILT_PRODUCTS_DIR; }; 573BCD1508409610001D8D54 /* CPFineTuneFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPFineTuneFrame.cpp; sourceTree = "<group>"; }; 573C3861067C789F00A5DBE0 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = System/Library/Frameworks/System.framework; sourceTree = "<group>"; }; @@ -1029,12 +1135,13 @@ 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "nona_gui-Info.plist"; sourceTree = "<group>"; }; 57D14A4506B8A3D100D8A03D /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = lib/libjpeg.a; sourceTree = "<group>"; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; - 57D5DCD6073FD86D0027E52F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; + 57D5DCD6073FD86D0027E52F /* config_mac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config_mac.h; sourceTree = "<group>"; }; 57D5DCF2073FE2CF0027E52F /* PreferencesDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreferencesDialog.cpp; sourceTree = "<group>"; }; 57DA3B55083FA3EF00BE2613 /* wxPlatform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wxPlatform.h; sourceTree = "<group>"; }; 57DD644C0BDD315400F89259 /* align_image_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = align_image_stack.cpp; sourceTree = "<group>"; }; 57DD644D0BDD315400F89259 /* img2vips.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = img2vips.cpp; sourceTree = "<group>"; }; 57E7825F068107210070F6AA /* HuginOSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HuginOSX.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 57E83B230C40F3DD00F20012 /* libboost_thread.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboost_thread.a; sourceTree = "<group>"; }; 57EEC3EE08CD09C900B6A197 /* LocalizedFileTipProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LocalizedFileTipProvider.cpp; sourceTree = "<group>"; }; 57FD3E5E06E98ED50070426B /* pano13 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = pano13; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -1049,12 +1156,17 @@ 573B8FE3067BAC9000B7B355 /* libcommon.a in Frameworks */, 57C1707F09A126AC00FAF325 /* libvigra_ext.a in Frameworks */, 57CBEEF706BC7B7C00C43FF5 /* libvigra_impex.a in Frameworks */, - 573B8FE5067BACA500B7B355 /* libpano13.a in Frameworks */, + 573B8FE5067BACA500B7B355 /* libpano12.a in Frameworks */, 574716D606B8AF260020D6E7 /* libjpeg.a in Frameworks */, 5770930906BD754A004058A1 /* libpng.a in Frameworks */, 5770930A06BD754A004058A1 /* libtiff.a in Frameworks */, 574716D906B8AF260020D6E7 /* libz.dylib in Frameworks */, 57BF87B40B3CC4E0006829C2 /* libmx.dylib in Frameworks */, + 5722DF7A0C2C70AC00C1111F /* libIlmImf.a in Frameworks */, + 5722DF7B0C2C70AC00C1111F /* libImath.a in Frameworks */, + 5722DF7C0C2C70AC00C1111F /* libIex.a in Frameworks */, + 5722DF7D0C2C70AC00C1111F /* libIlmThread.a in Frameworks */, + 5722DF7E0C2C70AC00C1111F /* libHalf.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1068,7 +1180,7 @@ 573F339909F7AB110088B333 /* libjhead.a in Frameworks */, 573F33CA09F7ABD20088B333 /* libvigra_ext.a in Frameworks */, 573F339F09F7AB110088B333 /* libtiff.a in Frameworks */, - 573F339C09F7AB110088B333 /* libpano13.a in Frameworks */, + 573F339C09F7AB110088B333 /* libpano12.a in Frameworks */, 573F339D09F7AB110088B333 /* libjpeg.a in Frameworks */, 573F339E09F7AB110088B333 /* libpng.a in Frameworks */, 573F33A009F7AB110088B333 /* libz.dylib in Frameworks */, @@ -1096,7 +1208,7 @@ 573F33D809F7AC260088B333 /* libjhead.a in Frameworks */, 573F33DA09F7AC260088B333 /* libvigra_impex.a in Frameworks */, 573F33E909F7AC500088B333 /* libvigra_ext.a in Frameworks */, - 573F33DB09F7AC260088B333 /* libpano13.a in Frameworks */, + 573F33DB09F7AC260088B333 /* libpano12.a in Frameworks */, 573F33DC09F7AC260088B333 /* libjpeg.a in Frameworks */, 573F33DD09F7AC260088B333 /* libpng.a in Frameworks */, 573F33DE09F7AC260088B333 /* libtiff.a in Frameworks */, @@ -1113,7 +1225,7 @@ 57452BA6094E3C7400E6B672 /* libjhead.a in Frameworks */, 57452BA7094E3C7400E6B672 /* libcommon.a in Frameworks */, 57452BA8094E3C7400E6B672 /* libvigra_impex.a in Frameworks */, - 57452BA9094E3C7400E6B672 /* libpano13.a in Frameworks */, + 57452BA9094E3C7400E6B672 /* libpano12.a in Frameworks */, 57452BAA094E3C7400E6B672 /* libjpeg.a in Frameworks */, 57452BAB094E3C7400E6B672 /* libpng.a in Frameworks */, 57452BAC094E3C7400E6B672 /* libtiff.a in Frameworks */, @@ -1133,7 +1245,7 @@ 57CF928E06BD7B7800780AC5 /* libiconv.dylib in Frameworks */, 57CF928F06BD7B7800780AC5 /* libjhead.a in Frameworks */, 57CF929006BD7B7800780AC5 /* libjpeg.a in Frameworks */, - 57CF929206BD7B7800780AC5 /* libpano13.a in Frameworks */, + 57CF929206BD7B7800780AC5 /* libpano12.a in Frameworks */, 57CF929306BD7B7800780AC5 /* libpanorama.a in Frameworks */, 57CF929406BD7B7800780AC5 /* libpng.a in Frameworks */, 57CF929506BD7B7800780AC5 /* libtiff.a in Frameworks */, @@ -1171,7 +1283,7 @@ 57989569068E2FA3009F90BF /* libwxregexu-2.7.a in Frameworks */, 574F3EE9081FF3BC0086E561 /* libwxexpat-2.7.a in Frameworks */, 5798954A068E2F22009F90BF /* libwx_macu-2.7.a in Frameworks */, - 57E782810681074B0070F6AA /* libpano13.a in Frameworks */, + 57E782810681074B0070F6AA /* libpano12.a in Frameworks */, 57E7827C0681074B0070F6AA /* libcommon.a in Frameworks */, 57E7827E0681074B0070F6AA /* libjhead.a in Frameworks */, 57C1707D09A1268C00FAF325 /* libvigra_ext.a in Frameworks */, @@ -1187,6 +1299,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57E83B440C40F59F00F20012 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57E83B460C40F5A500F20012 /* libboost_thread.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -1204,7 +1324,6 @@ isa = PBXGroup; children = ( 5751D8600939F1C0001477EA /* HuginOSX.xcodeproj */, - 57D5DCD6073FD86D0027E52F /* config.h */, 57114E9F06BC2301004F4FA7 /* HuginOSX-Info.plist */, 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */, 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */, @@ -1439,6 +1558,7 @@ isa = PBXGroup; children = ( 57114F9C06BC2302004F4FA7 /* common */, + 57D5DCD6073FD86D0027E52F /* config_mac.h */, 573C68CA085D18FA0064661D /* config.h.in */, 57114FA506BC2302004F4FA7 /* hugin */, 57114FCA06BC2302004F4FA7 /* jhead */, @@ -1693,6 +1813,7 @@ 57C1706C09A125DE00FAF325 /* libvigra_ext.a */, 5711524A06BC6709004F4FA7 /* libvigra_impex.a */, 5749F987067B696900A6EDD4 /* libhuginwxutils.a */, + 57E83B230C40F3DD00F20012 /* libboost_thread.a */, ); name = lib; sourceTree = "<group>"; @@ -1749,11 +1870,11 @@ path = include; sourceTree = "<group>"; }; - 5745FBE5094E1C4700E6B672 /* repository */ = { + 5745FBE5094E1C4700E6B672 /* Repository-universal */ = { isa = PBXGroup; children = ( 570D581A082A9ED50030E768 /* enblend */, - 573B8F85067BAAB900B7B355 /* libpano13.a */, + 573B8F85067BAAB900B7B355 /* libpano12.a */, 577092FA06BD7388004058A1 /* libpng.a */, 577092FB06BD7388004058A1 /* libtiff.a */, 57D14A4506B8A3D100D8A03D /* libjpeg.a */, @@ -1767,15 +1888,15 @@ 577786180BF348E90041F8FF /* libHalf.a */, 57452CC1094E4EC500E6B672 /* include */, ); - name = repository; - path = ExternalPrograms/repository; + name = "Repository-universal"; + path = "../../ExternalPrograms/Repository-universal"; sourceTree = "<group>"; }; 5745FC05094E1D5400E6B672 /* External */ = { isa = PBXGroup; children = ( 5749F84D067B601A00A6EDD4 /* MacOSX SDK */, - 5745FBE5094E1C4700E6B672 /* repository */, + 5745FBE5094E1C4700E6B672 /* Repository-universal */, ); name = External; sourceTree = "<group>"; @@ -1838,7 +1959,7 @@ 57C1708F09A12D9300FAF325 /* libs */, ); name = boost; - path = ExternalPrograms/boost_1_33_1; + path = ExternalPrograms/boost_1_34_0; sourceTree = "<group>"; }; 57C1708F09A12D9300FAF325 /* libs */ = { @@ -1951,6 +2072,7 @@ buildRules = ( ); dependencies = ( + 57E83C830C4101B300F20012 /* PBXTargetDependency */, 573B8FD9067BAC6200B7B355 /* PBXTargetDependency */, 573B8FDB067BAC6200B7B355 /* PBXTargetDependency */, 573B8FDF067BAC6200B7B355 /* PBXTargetDependency */, @@ -1972,6 +2094,7 @@ buildRules = ( ); dependencies = ( + 57E83C870C4101C300F20012 /* PBXTargetDependency */, 573F338D09F7AB110088B333 /* PBXTargetDependency */, 573F338F09F7AB110088B333 /* PBXTargetDependency */, 573F339109F7AB110088B333 /* PBXTargetDependency */, @@ -1993,6 +2116,7 @@ buildRules = ( ); dependencies = ( + 57E83C890C4101C700F20012 /* PBXTargetDependency */, ); name = color_correct_tiff; productName = nona; @@ -2009,6 +2133,7 @@ buildRules = ( ); dependencies = ( + 57E83C8B0C4101CC00F20012 /* PBXTargetDependency */, 573F33CC09F7AC260088B333 /* PBXTargetDependency */, 573F33CE09F7AC260088B333 /* PBXTargetDependency */, 573F33D009F7AC260088B333 /* PBXTargetDependency */, @@ -2030,6 +2155,7 @@ buildRules = ( ); dependencies = ( + 57E83C850C4101BB00F20012 /* PBXTargetDependency */, 57452B9A094E3C7400E6B672 /* PBXTargetDependency */, 57452B9C094E3C7400E6B672 /* PBXTargetDependency */, 57452B9E094E3C7400E6B672 /* PBXTargetDependency */, @@ -2049,6 +2175,7 @@ buildRules = ( ); dependencies = ( + 57E83C660C41011B00F20012 /* PBXTargetDependency */, ); name = jhead; productName = jhead; @@ -2064,6 +2191,7 @@ buildRules = ( ); dependencies = ( + 57E83C7B0C4101A100F20012 /* PBXTargetDependency */, ); name = panorama; productName = panorama; @@ -2079,6 +2207,7 @@ buildRules = ( ); dependencies = ( + 57E83C7D0C4101A400F20012 /* PBXTargetDependency */, ); name = huginwxutils; productName = wximageproc; @@ -2095,6 +2224,7 @@ 57177E890677815800A367AE /* PBXBuildRule */, ); dependencies = ( + 57E83C680C41011F00F20012 /* PBXTargetDependency */, ); name = common; productName = common; @@ -2106,10 +2236,13 @@ buildConfigurationList = 57C1706609A125DE00FAF325 /* Build configuration list for PBXNativeTarget "vigra_ext" */; buildPhases = ( 57C1705909A125DE00FAF325 /* Sources */, + 57E83B440C40F59F00F20012 /* Frameworks */, ); buildRules = ( ); dependencies = ( + 57E83C6E0C41013800F20012 /* PBXTargetDependency */, + 57E83B320C40F3FC00F20012 /* PBXTargetDependency */, ); name = vigra_ext; productName = vigra_impex; @@ -2126,6 +2259,7 @@ buildRules = ( ); dependencies = ( + 57E83C810C4101AE00F20012 /* PBXTargetDependency */, 57DD5A8A08490C1A006C50E4 /* PBXTargetDependency */, 57DD5A8C08490C1A006C50E4 /* PBXTargetDependency */, 57DD5A8E08490C1A006C50E4 /* PBXTargetDependency */, @@ -2145,12 +2279,13 @@ 57E7825B068107210070F6AA /* Sources */, 57E7825D068107210070F6AA /* Frameworks */, 57E7825A068107210070F6AA /* Resources */, + 57D70EE30A8BEB2F00AB281E /* CopyFiles */, 57B8C68E083A951000283C06 /* Resouce Script */, - 57D70EE30A8BEB2F00AB281E /* CopyFiles */, ); buildRules = ( ); dependencies = ( + 57E83C7F0C4101A900F20012 /* PBXTargetDependency */, 5700FE2B0681E72A00B01AE2 /* PBXTargetDependency */, 5700FE2D0681E72A00B01AE2 /* PBXTargetDependency */, 57C1707709A1263300FAF325 /* PBXTargetDependency */, @@ -2164,6 +2299,21 @@ productReference = 57E7825F068107210070F6AA /* HuginOSX.app */; productType = "com.apple.product-type.application"; }; + 57E83B220C40F3DD00F20012 /* boost_thread */ = { + isa = PBXNativeTarget; + buildConfigurationList = 57E83B380C40F40800F20012 /* Build configuration list for PBXNativeTarget "boost_thread" */; + buildPhases = ( + 57E83B200C40F3DD00F20012 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = boost_thread; + productName = boost_thread; + productReference = 57E83B230C40F3DD00F20012 /* libboost_thread.a */; + productType = "com.apple.product-type.library.static"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -2187,14 +2337,16 @@ productRefGroup = 57FC3ABD0675E43600C3E0AC; projectDirPath = ""; targets = ( + 57E83C640C4100F900F20012 /* copy config.h */, 570878D2067BC56F0057B4D7 /* all */, 5749FA15067B7DE400A6EDD4 /* lib */, + 5720E4720BD456CD00E63404 /* levmar */, + 5711524906BC6709004F4FA7 /* vigra_impex */, + 57E83B220C40F3DD00F20012 /* boost_thread */, 5749F8A2067B60CA00A6EDD4 /* jhead */, 5750CC8506774D0300B049DC /* common */, - 5711524906BC6709004F4FA7 /* vigra_impex */, 57C1705809A125DE00FAF325 /* vigra_ext */, 5749F92D067B654900A6EDD4 /* panorama */, - 5720E4720BD456CD00E63404 /* levmar */, 5749F986067B696900A6EDD4 /* huginwxutils */, 573B8F54067BA9CF00B7B355 /* apps */, 57E7825E068107210070F6AA /* HuginOSX */, @@ -2237,6 +2389,21 @@ shellPath = /bin/sh; shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./localised.sh\nfi"; }; + 57E83D580C41020B00F20012 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ../src/include/config_mac.h, + ); + outputPaths = ( + ../src/include/config.h, + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cp -r ../src/include/config_mac.h ../src/include/config.h"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2257,9 +2424,9 @@ 57CBEE3306BC716200C43FF5 /* viff.cxx in Sources */, 57CBEE3406BC716600C43FF5 /* void_vector.cxx in Sources */, 573F330509F79BAA0088B333 /* iccjpeg.c in Sources */, + 578ED0010A8D0C160028A7FB /* rgbe.c in Sources */, 578ED0000A8D0C160028A7FB /* hdr.cxx in Sources */, - 578ED0010A8D0C160028A7FB /* rgbe.c in Sources */, - 577785FD0BF3439D0041F8FF /* exr.cxx in Sources */, + 570F69390C3448DF00256D95 /* exr.cxx in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2267,8 +2434,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5720E4740BD456CD00E63404 /* exif.cpp in Sources */, - 5720E4750BD456CD00E63404 /* jpgfile.cpp in Sources */, 5720E4900BD4575000E63404 /* Axb.c in Sources */, 5720E4920BD4575000E63404 /* lm.c in Sources */, 5720E4940BD4575000E63404 /* lmbc.c in Sources */, @@ -2375,19 +2540,6 @@ buildActionMask = 2147483647; files = ( 57C1706F09A1261800FAF325 /* MultiThreadOperations.cpp in Sources */, - 57C1709F09A12DE400FAF325 /* barrier.cpp in Sources */, - 57C170A009A12DE400FAF325 /* condition.cpp in Sources */, - 57C170A109A12DE400FAF325 /* exceptions.cpp in Sources */, - 57C170A209A12DE400FAF325 /* mutex.cpp in Sources */, - 57C170A309A12DE400FAF325 /* once.cpp in Sources */, - 57C170A409A12DE400FAF325 /* recursive_mutex.cpp in Sources */, - 57C170A509A12DE400FAF325 /* thread.cpp in Sources */, - 57C170A609A12DE400FAF325 /* tss_dll.cpp in Sources */, - 57C170A709A12DE400FAF325 /* tss_hooks.cpp in Sources */, - 57C170A809A12DE400FAF325 /* tss_null.cpp in Sources */, - 57C170A909A12DE400FAF325 /* tss_pe.cpp in Sources */, - 57C170AA09A12DE400FAF325 /* tss.cpp in Sources */, - 57C170AB09A12DE400FAF325 /* xtime.cpp in Sources */, 5720E4A80BD4584C00E63404 /* emor.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2437,6 +2589,26 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57E83B200C40F3DD00F20012 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 57E83B240C40F3F500F20012 /* barrier.cpp in Sources */, + 57E83B250C40F3F500F20012 /* condition.cpp in Sources */, + 57E83B260C40F3F500F20012 /* exceptions.cpp in Sources */, + 57E83B270C40F3F500F20012 /* mutex.cpp in Sources */, + 57E83B280C40F3F500F20012 /* once.cpp in Sources */, + 57E83B290C40F3F500F20012 /* recursive_mutex.cpp in Sources */, + 57E83B2A0C40F3F500F20012 /* thread.cpp in Sources */, + 57E83B2B0C40F3F500F20012 /* tss_dll.cpp in Sources */, + 57E83B2C0C40F3F500F20012 /* tss_hooks.cpp in Sources */, + 57E83B2D0C40F3F500F20012 /* tss_null.cpp in Sources */, + 57E83B2E0C40F3F500F20012 /* tss_pe.cpp in Sources */, + 57E83B2F0C40F3F500F20012 /* tss.cpp in Sources */, + 57E83B300C40F3F500F20012 /* xtime.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -2685,6 +2857,71 @@ target = 5711524906BC6709004F4FA7 /* vigra_impex */; targetProxy = 57DF5F4D0943BDBC00D67E88 /* PBXContainerItemProxy */; }; + 57E83B320C40F3FC00F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83B220C40F3DD00F20012 /* boost_thread */; + targetProxy = 57E83B310C40F3FC00F20012 /* PBXContainerItemProxy */; + }; + 57E83C660C41011B00F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C650C41011B00F20012 /* PBXContainerItemProxy */; + }; + 57E83C680C41011F00F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C670C41011F00F20012 /* PBXContainerItemProxy */; + }; + 57E83C6E0C41013800F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C6D0C41013800F20012 /* PBXContainerItemProxy */; + }; + 57E83C7B0C4101A100F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C7A0C4101A100F20012 /* PBXContainerItemProxy */; + }; + 57E83C7D0C4101A400F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C7C0C4101A400F20012 /* PBXContainerItemProxy */; + }; + 57E83C7F0C4101A900F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C7E0C4101A900F20012 /* PBXContainerItemProxy */; + }; + 57E83C810C4101AE00F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C800C4101AE00F20012 /* PBXContainerItemProxy */; + }; + 57E83C830C4101B300F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C820C4101B300F20012 /* PBXContainerItemProxy */; + }; + 57E83C850C4101BB00F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C840C4101BB00F20012 /* PBXContainerItemProxy */; + }; + 57E83C870C4101C300F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C860C4101C300F20012 /* PBXContainerItemProxy */; + }; + 57E83C890C4101C700F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C880C4101C700F20012 /* PBXContainerItemProxy */; + }; + 57E83C8B0C4101CC00F20012 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57E83C8A0C4101CC00F20012 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -2951,6 +3188,7 @@ buildSettings = { GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -2971,6 +3209,7 @@ buildSettings = { GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3088,6 +3327,7 @@ DEPLOYMENT_POSTPROCESSING = YES; GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3119,6 +3359,7 @@ DEPLOYMENT_POSTPROCESSING = YES; GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3150,6 +3391,7 @@ DEPLOYMENT_POSTPROCESSING = YES; GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3179,6 +3421,7 @@ DEPLOYMENT_POSTPROCESSING = YES; GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3210,8 +3453,10 @@ "$(LIBRARY_SEARCH_PATHS)", "$(TARGET_BUILD_DIR)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona; STRIP_INSTALLED_PRODUCT = NO; }; @@ -3225,8 +3470,10 @@ "$(LIBRARY_SEARCH_PATHS)", "$(TARGET_BUILD_DIR)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona; STRIP_INSTALLED_PRODUCT = YES; }; @@ -3536,6 +3783,7 @@ GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; HEADER_SEARCH_PATHS = ( /usr/include, /Developer/Headers/FlatCarbon, @@ -3647,6 +3895,7 @@ buildSettings = { GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3668,6 +3917,7 @@ DEPLOYMENT_POSTPROCESSING = NO; GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3701,8 +3951,10 @@ "$(LIBRARY_SEARCH_PATHS)", "$(TARGET_BUILD_DIR)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona; STRIP_INSTALLED_PRODUCT = NO; }; @@ -3714,6 +3966,7 @@ DEPLOYMENT_POSTPROCESSING = NO; GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", WX_PRECOMP, __WXMAC__, "_FILE_OFFSET_BITS=64", @@ -3943,6 +4196,7 @@ GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; HEADER_SEARCH_PATHS = ( /usr/include, /Developer/Headers/FlatCarbon, @@ -3974,6 +4228,11 @@ 57C1706809A125DE00FAF325 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\""; PRODUCT_NAME = vigra_ext; }; name = Debug; @@ -3981,6 +4240,11 @@ 57C1706909A125DE00FAF325 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\""; PRODUCT_NAME = vigra_ext; }; name = Development; @@ -3988,10 +4252,69 @@ 57C1706B09A125DE00FAF325 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\""; PRODUCT_NAME = vigra_ext; }; name = Release; }; + 57E83B390C40F40800F20012 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = boost_thread; + }; + name = Debug; + }; + 57E83B3A0C40F40800F20012 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = boost_thread; + }; + name = Development; + }; + 57E83B3B0C40F40800F20012 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = boost_thread; + }; + name = Release; + }; + 57E83C720C41015600F20012 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "copy config.h"; + }; + name = Debug; + }; + 57E83C730C41015600F20012 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "copy config.h"; + }; + name = Development; + }; + 57E83C740C41015600F20012 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + PRODUCT_NAME = "copy config.h"; + ZERO_LINK = NO; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -4185,6 +4508,26 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 57E83B380C40F40800F20012 /* Build configuration list for PBXNativeTarget "boost_thread" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57E83B390C40F40800F20012 /* Debug */, + 57E83B3A0C40F40800F20012 /* Development */, + 57E83B3B0C40F40800F20012 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 57E83C710C41015600F20012 /* Build configuration list for PBXAggregateTarget "copy config.h" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57E83C720C41015600F20012 /* Debug */, + 57E83C730C41015600F20012 /* Development */, + 57E83C740C41015600F20012 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; /* End XCConfigurationList section */ }; rootObject = 57FC3AC10675E43600C3E0AC /* Project object */; Deleted: hugin/trunk/mac/config.h =================================================================== --- hugin/trunk/mac/config.h 2007-07-08 12:23:55 UTC (rev 2240) +++ hugin/trunk/mac/config.h 2007-07-08 12:34:22 UTC (rev 2241) @@ -1,131 +0,0 @@ -/* src/include/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - -/* have boost */ -#define HAVE_BOOST - -/* define if the Boost::Date_Time library is available */ -#undef HAVE_BOOST_DATE_TIME - -/* define if the Boost::FILESYSTEM library is available */ -#undef HAVE_BOOST_FILESYSTEM - -/* define if the Boost::IOStreams library is available */ -#undef HAVE_BOOST_IOSTREAMS - -/* define if the Boost::PROGRAM_OPTIONS library is available */ -#undef HAVE_BOOST_PROGRAM_OPTIONS - -/* define if the Boost::Regex library is available */ -#undef HAVE_BOOST_REGEX - -/* define if the Boost::Serialization library is available */ -#undef HAVE_BOOST_SERIALIZATION - -/* define if the Boost::Signals library is available */ -#undef HAVE_BOOST_SIGNALS - -/* define if the Boost::THREAD library is available */ -#define HAVE_BOOST_THREAD 1 - -/* define if the Boost::Unit_test_framework library is available */ -#undef HAVE_BOOST_UNIT_TEST_FRAMEWORK - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#define HAVE_CFLOCALECOPYCURRENT - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#define HAVE_CFPREFERENCESCOPYAPPVALUE - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#define HAVE_DCGETTEXT - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#define HAVE_DLFCN_H - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT - -/* Define if you have the iconv() function. */ -#define HAVE_ICONV - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H - -/* Define to 1 if you have the <pano12/queryfeature.h> header file. */ -#undef HAVE_PANO12_QUERYFEATURE_H - -/* Define to 1 if you have the <pano13/queryfeature.h> header file. */ -#define HAVE_PANO13_QUERYFEATURE_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H - -/* Current Version of Hugin */ -#define HUGIN_VERSION 0.5 - -/* Define if you have JPEG library */ -#define HasJPEG - -/* Define if you have Panotools library (pano12) */ -#define HasPANO - -/* Define if you have PNG library */ -#define HasPNG - -/* Define if you have TIFF library */ -#define HasTIFF - -/**/ -#define HasEXR - -/* Install Location of Hugin */ -#define INSTALL_LOCALE_DIR "" - -/* Location for XRC information */ -#define INSTALL_XRC_DIR "" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "pab...@we..." - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "hugin" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "hugin 0.5" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "hugin" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.5" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 Copied: hugin/trunk/src/include/config_mac.h (from rev 2143, hugin/trunk/mac/config.h) =================================================================== --- hugin/trunk/src/include/config_mac.h (rev 0) +++ hugin/trunk/src/include/config_mac.h 2007-07-08 12:34:22 UTC (rev 2241) @@ -0,0 +1,131 @@ +/* src/include/config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* have boost */ +#define HAVE_BOOST + +/* define if the Boost::Date_Time library is available */ +#undef HAVE_BOOST_DATE_TIME + +/* define if the Boost::FILESYSTEM library is available */ +#undef HAVE_BOOST_FILESYSTEM + +/* define if the Boost::IOStreams library is available */ +#undef HAVE_BOOST_IOSTREAMS + +/* define if the Boost::PROGRAM_OPTIONS library is available */ +#undef HAVE_BOOST_PROGRAM_OPTIONS + +/* define if the Boost::Regex library is available */ +#undef HAVE_BOOST_REGEX + +/* define if the Boost::Serialization library is available */ +#undef HAVE_BOOST_SERIALIZATION + +/* define if the Boost::Signals library is available */ +#undef HAVE_BOOST_SIGNALS + +/* define if the Boost::THREAD library is available */ +#define HAVE_BOOST_THREAD 1 + +/* define if the Boost::Unit_test_framework library is available */ +#undef HAVE_BOOST_UNIT_TEST_FRAMEWORK + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#define HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#define HAVE_CFPREFERENCESCOPYAPPVALUE + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#define HAVE_DCGETTEXT + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#define HAVE_DLFCN_H + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#define HAVE_GETTEXT + +/* Define if you have the iconv() function. */ +#define HAVE_ICONV + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H + +/* Define to 1 if you have the <pano12/queryfeature.h> header file. */ +#define HAVE_PANO12_QUERYFEATURE_H + +/* Define to 1 if you have the <pano13/queryfeature.h> header file. */ +//#define HAVE_PANO13_QUERYFEATURE_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H + +/* Current Version of Hugin */ +#define HUGIN_VERSION 0.7 + +/* Define if you have JPEG library */ +#define HasJPEG + +/* Define if you have Panotools library (pano12) */ +#define HasPANO + +/* Define if you have PNG library */ +#define HasPNG + +/* Define if you have TIFF library */ +#define HasTIFF + +/**/ +#define HasEXR + +/* Install Location of Hugin */ +#define INSTALL_LOCALE_DIR "" + +/* Location for XRC information */ +#define INSTALL_XRC_DIR "" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "pab...@we..." + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "hugin" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "hugin 0.7" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "hugin" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.7" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jin...@us...> - 2007-07-13 05:32:30
|
Revision: 2258 http://hugin.svn.sourceforge.net/hugin/?rev=2258&view=rev Author: jing1986612 Date: 2007-07-12 22:32:28 -0700 (Thu, 12 Jul 2007) Log Message: ----------- pyramid khan, not working yet Modified Paths: -------------- hugin/trunk/TODO hugin/trunk/src/deghosting/khan.cpp Modified: hugin/trunk/TODO =================================================================== --- hugin/trunk/TODO 2007-07-12 22:41:23 UTC (rev 2257) +++ hugin/trunk/TODO 2007-07-13 05:32:28 UTC (rev 2258) @@ -1 +1 @@ -Use the sourceforge site for TODO tasks. \ No newline at end of file +Use the sourceforge site for TODO tasks. Modified: hugin/trunk/src/deghosting/khan.cpp =================================================================== --- hugin/trunk/src/deghosting/khan.cpp 2007-07-12 22:41:23 UTC (rev 2257) +++ hugin/trunk/src/deghosting/khan.cpp 2007-07-13 05:32:28 UTC (rev 2258) @@ -39,6 +39,7 @@ #include <vigra/functorexpression.hxx> #include <vigra/transformimage.hxx> #include <vigra/combineimages.hxx> +#include <vigra/resizeimage.hxx> #include <vigra_ext/impexalpha.hxx> #include <vigra_ext/utils.h> @@ -60,6 +61,7 @@ t *= t; // ^2 t *= t; // ^4 t *= t; // ^8 + t *= t; // ^16 return 1.0 - t; } @@ -254,26 +256,23 @@ } num_layers = inputFiles.size(); //pyramid: do half of iter as resized to (1/2)^x where x = half_iters - iter - int num_iters = 5; - //int bias = 2; //hat function coefficient to make "wrong" pixels less weighted - int half_iters = (num_iters % 2 ? num_iters/2 + 1 : num_iters/2); + int num_iters = 6; + int half_iters = num_iters/2; + int bias = 1; //hat function coefficient to make "wrong" pixels less weighted + //min value 1 int rad_neighbors = 1; - std::vector<FImagePtr> init_weights (weights); + std::vector<FImagePtr> init_weights; + for (int i=0; i < weights.size(); i++) + init_weights.push_back(FImagePtr(new FImage(*weights[i]))); + + //place to store prefetched neighbors in + std::vector<vector <int> > neighbors; + if(g_verbose > 0) { - std::cout << "pre-fetching neighbors..." << std::endl; + std::cout << "deghosting..." << std::endl; } - //(verified) pre-fetch descriptors as offset to ptr to each layer - // neighbors.at(i * width + j) is the offset for pixel(j, i) from the start of - // the floating point data pointer for each layer - std::vector<vector <int> > neighbors (width * height); - khanNeighbors(&neighbors, height, width, rad_neighbors); - - if(g_verbose > 0) { - std::cout << "deghosting..." << std::endl; - } - //for each iteration for(int iter = 0; iter < num_iters; iter++) { @@ -281,17 +280,97 @@ std::cout << "\n\niteration " << iter << endl; } - /*if(iter < half_iters) { //resize image - int proportion = exp(half_iters - iter); - std::vector<int> new_size = {width - }*/ - - khanIteration(&grayImages, height, width, num_layers, &weights, - &init_weights, &neighbors, rad_neighbors); + //resize image + if(iter <= half_iters) { //resize image + int proportion = 1 << (half_iters - iter); + int nh = height/proportion; + int nw = width/proportion; + + if(g_verbose > 1) { + std::cout << "resizing to 1/" << proportion << " size" << endl; + } + + std::vector <FImagePtr> smallGrayImages; + std::vector <FImagePtr> smallInitWeights; + for(int i = 0; i < num_layers; i++) { + FImagePtr smallGray(new FImage(nw, nh)); + FImagePtr newInitWeight(new FImage(nw, nh)); + + if(iter < half_iters){ + //resize input img + resizeImageLinearInterpolation( + srcImageRange(*(grayImages.at(i))), + destImageRange(*smallGray)); + smallGrayImages.push_back(smallGray); + + //resize init_weights + resizeImageLinearInterpolation( + srcImageRange(*(init_weights.at(i))), + destImageRange(*newInitWeight)); + smallInitWeights.push_back(newInitWeight); + + /* + if(g_verbose > 2) { + char tmpfn[100]; + snprintf(tmpfn, 99, "debug_gray_resized(%d)_%d.jpg", + proportion, i); + ImageExportInfo exGray(tmpfn); + exportImage(srcImageRange(*smallGray), exGray); + } + */ + } + + //resize weights + FImagePtr newWeight(new FImage(nw, nh)); + resizeImageLinearInterpolation( + srcImageRange(*(weights.at(i))), + destImageRange(*newWeight)); + //replace old weights w/ new weights + /*** do i need to free? //delete weights.at(i); */ + weights.at(i) = newWeight; + + } + + if(iter == half_iters) { + if(g_verbose > 0) { + std::cout << "pre-fetching neighbors..." << std::endl; + } + + //(verified) pre-fetch descriptors as offset to ptr to each layer + // neighbors.at(i * width + j) is the offset for pixel(j, i) from the start of + // the floating point data pointer for each layer + //*neighbors = std::vector<vector<int> > (width * height); + khanNeighbors(&neighbors, height, width, rad_neighbors); + + khanIteration(&grayImages, height, width, num_layers, &weights, + &init_weights, &neighbors, rad_neighbors); + } + else { + khanIteration(&smallGrayImages, nh, nw, num_layers, &weights, + &smallInitWeights, NULL, rad_neighbors); + } + + //save files for debugging purposes + if(g_verbose > 2) { + for(int i = 0; i < num_layers; i++) { + char tmpfn[100]; + snprintf(tmpfn, 99, "debug_weight_resized(%d)_%d.jpg", + proportion, i); + ImageExportInfo exWeight(tmpfn); + exportImage(srcImageRange(*(weights.at(i))), exWeight); + } + } + } + else { + khanIteration(&grayImages, height, width, num_layers, &weights, + &init_weights, &neighbors, rad_neighbors); + } } //end iteration loop - /* //bias and normalize weights + if(g_verbose > 0) { + std::cout << "\nadjusting weights" << endl; + } for(int i = 0; i < height; i++) { for(int j = 0; j < width; j++) { float sum = 0; @@ -309,7 +388,8 @@ tmp_weights.at(layer) / sum; //sum >= 1 b/c of pow } } - */ + } + // free gray images to save memory grayImages.clear(); @@ -326,13 +406,16 @@ { //if given pre-calculated neighbors, use //otherwise make own - std::vector<vector <int> > neighbors (width * height); + std::vector<vector <int> > neighbors; if(prefetched_neighbors) neighbors = *prefetched_neighbors; else khanNeighbors(&neighbors, height, width, rad_neighbors); - //copy prev weights + if(g_verbose > 3) { + cout << "copying prev weights" << endl; + } + std::vector<FImagePtr> old_weights; for(int i = 0; i <(*weights).size(); i++) { old_weights.push_back(FImagePtr(new FImage(*(*weights)[i]))); @@ -340,7 +423,6 @@ int diam_neighbors = 2*rad_neighbors + 1; int num_neighbors = diam_neighbors * diam_neighbors * num_layers; - int bias = 1; //for each row for(int row = 0; row < height; row++) { @@ -357,7 +439,7 @@ //for each column for (int col = 0; col < width; col++) { - if(g_verbose > 3 && !(col % 100)) + if(g_verbose > 3) cout << "(x, y) = (" << col << ", " << row << ")" << endl; //get descriptors @@ -366,8 +448,9 @@ { std::vector<int>::iterator neighbor_iter; std::vector<int> neighbor_ptr_vec = neighbors.at(row * width + col); - + for(int layer = 0; layer < num_layers; layer++) { + const float *pixels = (*grayImages).at(layer)->data(); const float *weight_ptr = old_weights.at(layer)->data(); @@ -384,9 +467,8 @@ } //end neighbor_iter } //end layer - } + } - if(g_verbose > 2 && row == 1 && col == 1) { cout << "\t\tneighbor values for (1, 1)"; @@ -423,6 +505,10 @@ //for each layer for(int layer = 0; layer < num_layers; layer++) { + if(g_verbose > 3) { + cout << "\tlayer " << layer << endl; + } + //initialize sum to 0 float sum_weight = 0; //get center pixel @@ -451,19 +537,10 @@ } //end layer loop if(total_sum) { - float new_sum = 0; - std::vector<float> tmp_weights; - //bias weights - for(int layer = 0; layer < num_layers; layer++) { - float tmp = pow(raw_weights.at(layer) / total_sum, bias); - new_sum += tmp; - tmp_weights.push_back(tmp); - } - //normalize weights for(int layer = 0; layer < num_layers; layer++) { *(float *)((*weights).at(layer)->data() + row *width + col) = - tmp_weights.at(layer) / new_sum; + raw_weights.at(layer) / total_sum; } } else { @@ -484,7 +561,7 @@ for(int i = 0; i < height; i++) { int curr_row = i * width; for(int j = 0; j < width; j++) { - int curr_px = curr_row + j; + //int curr_px = curr_row + j; std::vector<int> curr; //each neighbor @@ -507,7 +584,13 @@ } //end h }//end v - (*neighbors).at(curr_px) = curr; + //(*neighbors).at(curr_px) = curr; + (*neighbors).push_back(curr); } //end j - } //end i + } //end i + + if(g_verbose > 3) { + cout << "got " << neighbors->size() << "neighbors from " << width + << " x " << height << " image" << endl; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-21 10:06:32
|
Revision: 2304 http://hugin.svn.sourceforge.net/hugin/?rev=2304&view=rev Author: ippei Date: 2007-07-21 03:06:26 -0700 (Sat, 21 Jul 2007) Log Message: ----------- Separated ResponseTransform header from lut.h Modified Paths: -------------- hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj hugin/trunk/src/include/PT/RemappedPanoImage.h hugin/trunk/src/include/vigra_ext/lut.h Added Paths: ----------- hugin/trunk/src/include/vigra_ext/ResponseTransform.h Modified: hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj 2007-07-21 07:42:58 UTC (rev 2303) +++ hugin/trunk/mac/HuginOSX.xcodeproj/project.pbxproj 2007-07-21 10:06:26 UTC (rev 2304) @@ -26,6 +26,7 @@ buildPhases = ( ); dependencies = ( + 573BAC980C520F4D0057D41C /* PBXTargetDependency */, 57CBEFDE06BC7F4E00C43FF5 /* PBXTargetDependency */, 57CF92A406BD7BBE00780AC5 /* PBXTargetDependency */, ); @@ -38,11 +39,10 @@ buildPhases = ( ); dependencies = ( - 573F340109F7ADA70088B333 /* PBXTargetDependency */, 573F33FF09F7AD9A0088B333 /* PBXTargetDependency */, - 573F33FD09F7AD8F0088B333 /* PBXTargetDependency */, - 573F33FB09F7AD8F0088B333 /* PBXTargetDependency */, 573F33F909F7AD8F0088B333 /* PBXTargetDependency */, + 573F340109F7ADA70088B333 /* PBXTargetDependency */, + 5752953F0C46C4AD00BD4FDB /* PBXTargetDependency */, ); name = tools; productName = "tools apps"; @@ -59,7 +59,6 @@ 57C1707509A1262900FAF325 /* PBXTargetDependency */, 5749FA1F067B7E0A00A6EDD4 /* PBXTargetDependency */, 5720E49D0BD4578100E63404 /* PBXTargetDependency */, - 5749FA21067B7E0A00A6EDD4 /* PBXTargetDependency */, ); name = lib; productName = lib; @@ -103,24 +102,26 @@ 573B8FE2067BAC8400B7B355 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 573B8FE3067BAC9000B7B355 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; 573B8FE5067BACA500B7B355 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 573BAC8C0C520ED90057D41C /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 573BAC8D0C520ED90057D41C /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 573BAC8E0C520ED90057D41C /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 573BAC8F0C520ED90057D41C /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 573BAC900C520ED90057D41C /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 573BAC920C520EFA0057D41C /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 573BAC930C520EFA0057D41C /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 573BAC940C520EFA0057D41C /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 573BAC950C520EFA0057D41C /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 573BAC960C520EFA0057D41C /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 573BAC9A0C520FB40057D41C /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 573BAC9B0C520FB40057D41C /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 573BAC9C0C520FB40057D41C /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 573BAC9D0C520FB40057D41C /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 573BAC9E0C520FB40057D41C /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; 573F32AA09F7991A0088B333 /* PTLensDB.c in Sources */ = {isa = PBXBuildFile; fileRef = 573F32A909F7991A0088B333 /* PTLensDB.c */; }; 573F330509F79BAA0088B333 /* iccjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 573F330409F79BAA0088B333 /* iccjpeg.c */; }; 573F330C09F79C550088B333 /* Plot2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D0E09A0D78E004C6964 /* Plot2D.cpp */; }; 573F330D09F79C550088B333 /* PTWXDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573F330A09F79C140088B333 /* PTWXDlg.cpp */; }; - 573F330E09F79CE00088B333 /* CPFineTuneFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573BCD1508409610001D8D54 /* CPFineTuneFrame.cpp */; }; - 573F330F09F79D0D0088B333 /* UniversalCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F4406BC2302004F4FA7 /* UniversalCursor.cpp */; }; 573F333609F7A1E40088B333 /* lu.c in Sources */ = {isa = PBXBuildFile; fileRef = 573F333509F7A1E40088B333 /* lu.c */; }; - 573F339809F7AB110088B333 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; - 573F339909F7AB110088B333 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 573F339A09F7AB110088B333 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 573F339B09F7AB110088B333 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 573F339C09F7AB110088B333 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 573F339D09F7AB110088B333 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 573F339E09F7AB110088B333 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 573F339F09F7AB110088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 573F33A009F7AB110088B333 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 573F33BD09F7AB190088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 573F33CA09F7ABD20088B333 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; 573F33D709F7AC260088B333 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; 573F33D809F7AC260088B333 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 573F33D909F7AC260088B333 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; @@ -131,9 +132,7 @@ 573F33DE09F7AC260088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; 573F33DF09F7AC260088B333 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 573F33E909F7AC500088B333 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 573F33F209F7AC760088B333 /* color_correct_tiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D2009A0D814004C6964 /* color_correct_tiff.cpp */; }; 573F33F609F7AC7C0088B333 /* fulla.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573F332C09F79F300088B333 /* fulla.cpp */; }; - 573F33F709F7AC880088B333 /* zhang_undistort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570E7B5206FC917900D23E0D /* zhang_undistort.cpp */; }; 57452BA5094E3C7400E6B672 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; 57452BA6094E3C7400E6B672 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 57452BA7094E3C7400E6B672 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; @@ -154,6 +153,25 @@ 574F3F30082005980086E561 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3F2E082005980086E561 /* IOKit.framework */; }; 5751ABF90BDD4EBC003A7B5C /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5751ABF80BDD4EBC003A7B5C /* OptimizePhotometricPanel.cpp */; }; 5751BF710BDD4F3A003A7B5C /* PhotometricOptimizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5751BF700BDD4F3A003A7B5C /* PhotometricOptimizer.cpp */; }; + 575295400C46C4E100BD4FDB /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; + 575295410C46C4E100BD4FDB /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F987067B696900A6EDD4 /* libhuginwxutils.a */; }; + 575295420C46C4E100BD4FDB /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 575295430C46C4E100BD4FDB /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 575295440C46C4E100BD4FDB /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 575295450C46C4E100BD4FDB /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 575295460C46C4E100BD4FDB /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 575295480C46C4F500BD4FDB /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 57649A8F0C46C39F003AFC2F /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; + 57649A900C46C39F003AFC2F /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 57649A910C46C39F003AFC2F /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; + 57649A920C46C39F003AFC2F /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 57649A930C46C39F003AFC2F /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 57649A940C46C39F003AFC2F /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 57649A950C46C39F003AFC2F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 57649A960C46C39F003AFC2F /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 57649A970C46C39F003AFC2F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 57649A980C46C39F003AFC2F /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; + 57649AA30C46C40E003AFC2F /* vig_optimize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57649AA20C46C40E003AFC2F /* vig_optimize.cpp */; }; 577092FC06BD7388004058A1 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; 577092FD06BD7388004058A1 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; 5770930006BD7424004058A1 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; @@ -178,8 +196,6 @@ 57A6048C0B4B6321008F4039 /* HFOVDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57A6048B0B4B6321008F4039 /* HFOVDialog.cpp */; }; 57A604900B4B6375008F4039 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57A6048F0B4B6375008F4039 /* utils.cpp */; }; 57A91BD807FD85E30013AE47 /* autopano-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */; }; - 57ABCA7509F7F126005D8908 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 57ABCA7609F7F126005D8908 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 57B8C3C3083A4B6900283C06 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B8C3C2083A4B6900283C06 /* MyExternalCmdExecDialog.cpp */; }; 57BF84F20B3CB214006829C2 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57BF84F00B3CB214006829C2 /* AssistantPanel.cpp */; }; 57BF84F30B3CB214006829C2 /* CropPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57BF84F10B3CB214006829C2 /* CropPanel.cpp */; }; @@ -187,9 +203,7 @@ 57BF87B30B3CC4DF006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; 57BF87B40B3CC4E0006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; 57BF87B50B3CC4E0006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF87B70B3CC4E2006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; 57BF87B80B3CC4E3006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF87B90B3CC4E3006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; 57BF8AC00B3CC73D006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; 57C1706F09A1261800FAF325 /* MultiThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D3309A0D9F6004C6964 /* MultiThreadOperations.cpp */; }; 57C1707D09A1268C00FAF325 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; @@ -362,41 +376,13 @@ remoteGlobalIDString = 5749F92D067B654900A6EDD4; remoteInfo = panorama; }; - 573F338E09F7AB110088B333 /* PBXContainerItemProxy */ = { + 573BAC970C520F4D0057D41C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; + remoteGlobalIDString = 5749F986067B696900A6EDD4 /* huginwxutils */; + remoteInfo = huginwxutils; }; - 573F339009F7AB110088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; - }; - 573F339209F7AB110088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; - }; - 573F339409F7AB110088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 573F33C809F7ABB70088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; 573F33CD09F7AC260088B333 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -439,20 +425,6 @@ remoteGlobalIDString = 573F33CB09F7AC260088B333; remoteInfo = fulla; }; - 573F33FA09F7AD8F0088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573F33AA09F7AB190088B333; - remoteInfo = color_correct_tiff; - }; - 573F33FC09F7AD8F0088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573F338C09F7AB110088B333; - remoteInfo = zhang_undistort; - }; 573F33FE09F7AD9A0088B333 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -530,20 +502,55 @@ remoteGlobalIDString = 5749F92D067B654900A6EDD4; remoteInfo = panorama; }; - 5749FA20067B7E0A00A6EDD4 /* PBXContainerItemProxy */ = { + 574F3F38082006B80086E561 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; remoteGlobalIDString = 5749F986067B696900A6EDD4; - remoteInfo = wximageproc; + remoteInfo = huginwxutils; }; - 574F3F38082006B80086E561 /* PBXContainerItemProxy */ = { + 5752953E0C46C4AD00BD4FDB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5749F986067B696900A6EDD4; - remoteInfo = huginwxutils; + remoteGlobalIDString = 57649A810C46C39F003AFC2F; + remoteInfo = vig_optimizer; }; + 57649A830C46C39F003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E83C640C4100F900F20012; + remoteInfo = "copy config.h"; + }; + 57649A850C46C39F003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; + remoteInfo = jhead; + }; + 57649A870C46C39F003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5750CC8506774D0300B049DC; + remoteInfo = common; + }; + 57649A890C46C39F003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F92D067B654900A6EDD4; + remoteInfo = panorama; + }; + 57649A8B0C46C39F003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5711524906BC6709004F4FA7; + remoteInfo = vigra_impex; + }; 579354B006EAA70F003F2DE7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -712,20 +719,6 @@ remoteGlobalIDString = 57E83C640C4100F900F20012; remoteInfo = "copy config.h"; }; - 57E83C860C4101C300F20012 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57E83C640C4100F900F20012; - remoteInfo = "copy config.h"; - }; - 57E83C880C4101C700F20012 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57E83C640C4100F900F20012; - remoteInfo = "copy config.h"; - }; 57E83C8A0C4101CC00F20012 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -876,7 +869,6 @@ 5711504506BC2303004F4FA7 /* PTOptimise.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PTOptimise.cpp; sourceTree = "<group>"; }; 5711504606BC2303004F4FA7 /* SpaceTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SpaceTransform.cpp; sourceTree = "<group>"; }; 5711504706BC2303004F4FA7 /* Stitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher.cpp; sourceTree = "<group>"; }; - 5711505D06BC2303004F4FA7 /* automatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = automatch.cpp; sourceTree = "<group>"; }; 5711505E06BC2303004F4FA7 /* autooptimiser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = autooptimiser.cpp; sourceTree = "<group>"; }; 5711506106BC2303004F4FA7 /* nona.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nona.cpp; sourceTree = "<group>"; }; 5711524A06BC6709004F4FA7 /* libvigra_impex.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libvigra_impex.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1017,8 +1009,6 @@ 573F332C09F79F300088B333 /* fulla.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fulla.cpp; sourceTree = "<group>"; }; 573F333509F7A1E40088B333 /* lu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = lu.c; sourceTree = "<group>"; }; 573F333709F7A2230088B333 /* lu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lu.h; sourceTree = "<group>"; }; - 573F33A809F7AB110088B333 /* zhang_undistort */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = zhang_undistort; sourceTree = BUILT_PRODUCTS_DIR; }; - 573F33C609F7AB190088B333 /* color_correct_tiff */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = color_correct_tiff; sourceTree = BUILT_PRODUCTS_DIR; }; 573F33E709F7AC260088B333 /* fulla */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fulla; sourceTree = BUILT_PRODUCTS_DIR; }; 57452BB5094E3C7400E6B672 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; }; 57453AEF094E4F9C00E6B672 /* jconfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = jconfig.h; sourceTree = "<group>"; }; @@ -1046,6 +1036,8 @@ 5751ABF80BDD4EBC003A7B5C /* OptimizePhotometricPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OptimizePhotometricPanel.cpp; sourceTree = "<group>"; }; 5751BF700BDD4F3A003A7B5C /* PhotometricOptimizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PhotometricOptimizer.cpp; sourceTree = "<group>"; }; 5751D8630939F1E9001477EA /* project.pbxproj */ = {isa = PBXFileReference; lastKnownFileType = text.pbxproject; name = project.pbxproj; path = HuginOSX.xcodeproj/project.pbxproj; sourceTree = "<group>"; }; + 57649A9D0C46C39F003AFC2F /* vig_optimizer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimizer; sourceTree = BUILT_PRODUCTS_DIR; }; + 57649AA20C46C40E003AFC2F /* vig_optimize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vig_optimize.cpp; sourceTree = "<group>"; }; 577092FA06BD7388004058A1 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = lib/libpng.a; sourceTree = "<group>"; }; 577092FB06BD7388004058A1 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = lib/libtiff.a; sourceTree = "<group>"; }; 577785FB0BF3439D0041F8FF /* exr.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = exr.cxx; sourceTree = "<group>"; }; @@ -1062,7 +1054,6 @@ 577D3D1909A0D7D9004C6964 /* Stitcher2.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher2.cpp; sourceTree = "<group>"; }; 577D3D1A09A0D7D9004C6964 /* Stitcher3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher3.cpp; sourceTree = "<group>"; }; 577D3D1B09A0D7D9004C6964 /* Stitcher4.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher4.cpp; sourceTree = "<group>"; }; - 577D3D2009A0D814004C6964 /* color_correct_tiff.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = color_correct_tiff.cpp; sourceTree = "<group>"; }; 577D3D2109A0D91D004C6964 /* LocalizedFileTipProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LocalizedFileTipProvider.h; sourceTree = "<group>"; }; 577D3D2209A0D935004C6964 /* Plot2D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Plot2D.h; sourceTree = "<group>"; }; 577D3D2309A0D93F004C6964 /* PreferencesDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesDialog.h; sourceTree = "<group>"; }; @@ -1139,7 +1130,6 @@ 57D5DCF2073FE2CF0027E52F /* PreferencesDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreferencesDialog.cpp; sourceTree = "<group>"; }; 57DA3B55083FA3EF00BE2613 /* wxPlatform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wxPlatform.h; sourceTree = "<group>"; }; 57DD644C0BDD315400F89259 /* align_image_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = align_image_stack.cpp; sourceTree = "<group>"; }; - 57DD644D0BDD315400F89259 /* img2vips.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = img2vips.cpp; sourceTree = "<group>"; }; 57E7825F068107210070F6AA /* HuginOSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HuginOSX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57E83B230C40F3DD00F20012 /* libboost_thread.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboost_thread.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57EEC3EE08CD09C900B6A197 /* LocalizedFileTipProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LocalizedFileTipProvider.cpp; sourceTree = "<group>"; }; @@ -1170,35 +1160,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 573F339709F7AB110088B333 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 573F339809F7AB110088B333 /* libpanorama.a in Frameworks */, - 573F339A09F7AB110088B333 /* libcommon.a in Frameworks */, - 573F339B09F7AB110088B333 /* libvigra_impex.a in Frameworks */, - 573F339909F7AB110088B333 /* libjhead.a in Frameworks */, - 573F33CA09F7ABD20088B333 /* libvigra_ext.a in Frameworks */, - 573F339F09F7AB110088B333 /* libtiff.a in Frameworks */, - 573F339C09F7AB110088B333 /* libpano13.a in Frameworks */, - 573F339D09F7AB110088B333 /* libjpeg.a in Frameworks */, - 573F339E09F7AB110088B333 /* libpng.a in Frameworks */, - 573F33A009F7AB110088B333 /* libz.dylib in Frameworks */, - 57BF87B90B3CC4E3006829C2 /* libmx.dylib in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 573F33B509F7AB190088B333 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 573F33BD09F7AB190088B333 /* libtiff.a in Frameworks */, - 57ABCA7509F7F126005D8908 /* libjpeg.a in Frameworks */, - 57ABCA7609F7F126005D8908 /* libz.dylib in Frameworks */, - 57BF87B70B3CC4E2006829C2 /* libmx.dylib in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 573F33D609F7AC260088B333 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1212,6 +1173,11 @@ 573F33DC09F7AC260088B333 /* libjpeg.a in Frameworks */, 573F33DD09F7AC260088B333 /* libpng.a in Frameworks */, 573F33DE09F7AC260088B333 /* libtiff.a in Frameworks */, + 573BAC920C520EFA0057D41C /* libIlmImf.a in Frameworks */, + 573BAC930C520EFA0057D41C /* libImath.a in Frameworks */, + 573BAC940C520EFA0057D41C /* libIex.a in Frameworks */, + 573BAC950C520EFA0057D41C /* libIlmThread.a in Frameworks */, + 573BAC960C520EFA0057D41C /* libHalf.a in Frameworks */, 573F33DF09F7AC260088B333 /* libz.dylib in Frameworks */, 57BF87B80B3CC4E3006829C2 /* libmx.dylib in Frameworks */, ); @@ -1229,11 +1195,41 @@ 57452BAA094E3C7400E6B672 /* libjpeg.a in Frameworks */, 57452BAB094E3C7400E6B672 /* libpng.a in Frameworks */, 57452BAC094E3C7400E6B672 /* libtiff.a in Frameworks */, + 573BAC8C0C520ED90057D41C /* libIlmImf.a in Frameworks */, + 573BAC8D0C520ED90057D41C /* libImath.a in Frameworks */, + 573BAC8E0C520ED90057D41C /* libIex.a in Frameworks */, + 573BAC8F0C520ED90057D41C /* libIlmThread.a in Frameworks */, + 573BAC900C520ED90057D41C /* libHalf.a in Frameworks */, 57452BAD094E3C7400E6B672 /* libz.dylib in Frameworks */, 57BF87B50B3CC4E0006829C2 /* libmx.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; + 57649A8E0C46C39F003AFC2F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57649A970C46C39F003AFC2F /* libz.dylib in Frameworks */, + 57649A980C46C39F003AFC2F /* libmx.dylib in Frameworks */, + 57649A8F0C46C39F003AFC2F /* libpanorama.a in Frameworks */, + 57649A900C46C39F003AFC2F /* libjhead.a in Frameworks */, + 575295480C46C4F500BD4FDB /* libvigra_ext.a in Frameworks */, + 57649A910C46C39F003AFC2F /* libcommon.a in Frameworks */, + 57649A920C46C39F003AFC2F /* libvigra_impex.a in Frameworks */, + 57649A930C46C39F003AFC2F /* libpano13.a in Frameworks */, + 57649A940C46C39F003AFC2F /* libjpeg.a in Frameworks */, + 57649A950C46C39F003AFC2F /* libpng.a in Frameworks */, + 57649A960C46C39F003AFC2F /* libtiff.a in Frameworks */, + 575295400C46C4E100BD4FDB /* liblevmar.a in Frameworks */, + 575295410C46C4E100BD4FDB /* libhuginwxutils.a in Frameworks */, + 575295420C46C4E100BD4FDB /* libIlmImf.a in Frameworks */, + 575295430C46C4E100BD4FDB /* libImath.a in Frameworks */, + 575295440C46C4E100BD4FDB /* libIex.a in Frameworks */, + 575295450C46C4E100BD4FDB /* libIlmThread.a in Frameworks */, + 575295460C46C4E100BD4FDB /* libHalf.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 57CF926706BD7AD100780AC5 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1241,7 +1237,6 @@ 57CF928A06BD7B7800780AC5 /* Carbon.framework in Frameworks */, 57CF928B06BD7B7800780AC5 /* Cocoa.framework in Frameworks */, 57CF928C06BD7B7800780AC5 /* libcommon.a in Frameworks */, - 57CF928D06BD7B7800780AC5 /* libhuginwxutils.a in Frameworks */, 57CF928E06BD7B7800780AC5 /* libiconv.dylib in Frameworks */, 57CF928F06BD7B7800780AC5 /* libjhead.a in Frameworks */, 57CF929006BD7B7800780AC5 /* libjpeg.a in Frameworks */, @@ -1251,6 +1246,12 @@ 57CF929506BD7B7800780AC5 /* libtiff.a in Frameworks */, 57C1707E09A126A600FAF325 /* libvigra_ext.a in Frameworks */, 57CF929706BD7B7800780AC5 /* libvigra_impex.a in Frameworks */, + 57CF928D06BD7B7800780AC5 /* libhuginwxutils.a in Frameworks */, + 573BAC9A0C520FB40057D41C /* libIlmImf.a in Frameworks */, + 573BAC9B0C520FB40057D41C /* libImath.a in Frameworks */, + 573BAC9C0C520FB40057D41C /* libIex.a in Frameworks */, + 573BAC9D0C520FB40057D41C /* libIlmThread.a in Frameworks */, + 573BAC9E0C520FB40057D41C /* libHalf.a in Frameworks */, 57CF929906BD7B7800780AC5 /* libwx_macu-2.7.a in Frameworks */, 574F3F20082004870086E561 /* libwxexpat-2.7.a in Frameworks */, 57CF929F06BD7B7800780AC5 /* libwxregexu-2.7.a in Frameworks */, @@ -1747,12 +1748,10 @@ children = ( 57DD644C0BDD315400F89259 /* align_image_stack.cpp */, 5711505E06BC2303004F4FA7 /* autooptimiser.cpp */, - 577D3D2009A0D814004C6964 /* color_correct_tiff.cpp */, 573F332C09F79F300088B333 /* fulla.cpp */, - 5711506106BC2303004F4FA7 /* nona.cpp */, 570E7B5206FC917900D23E0D /* zhang_undistort.cpp */, - 5711505D06BC2303004F4FA7 /* automatch.cpp */, - 57DD644D0BDD315400F89259 /* img2vips.cpp */, + 5711506106BC2303004F4FA7 /* nona.cpp */, + 57649AA20C46C40E003AFC2F /* vig_optimize.cpp */, ); path = tools; sourceTree = "<group>"; @@ -1822,10 +1821,9 @@ isa = PBXGroup; children = ( 57452BB5094E3C7400E6B672 /* autooptimiser */, - 573B8FD6067BAC4600B7B355 /* nona */, - 573F33A809F7AB110088B333 /* zhang_undistort */, - 573F33C609F7AB190088B333 /* color_correct_tiff */, 573F33E709F7AC260088B333 /* fulla */, + 573B8FD6067BAC4600B7B355 /* nona */, + 57649A9D0C46C39F003AFC2F /* vig_optimizer */, ); name = tools; sourceTree = "<group>"; @@ -2084,45 +2082,6 @@ productReference = 573B8FD6067BAC4600B7B355 /* nona */; productType = "com.apple.product-type.tool"; }; - 573F338C09F7AB110088B333 /* zhang_undistort */ = { - isa = PBXNativeTarget; - buildConfigurationList = 573F33A209F7AB110088B333 /* Build configuration list for PBXNativeTarget "zhang_undistort" */; - buildPhases = ( - 573F339509F7AB110088B333 /* Sources */, - 573F339709F7AB110088B333 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 57E83C870C4101C300F20012 /* PBXTargetDependency */, - 573F338D09F7AB110088B333 /* PBXTargetDependency */, - 573F338F09F7AB110088B333 /* PBXTargetDependency */, - 573F339109F7AB110088B333 /* PBXTargetDependency */, - 573F339309F7AB110088B333 /* PBXTargetDependency */, - 573F33C909F7ABB70088B333 /* PBXTargetDependency */, - ); - name = zhang_undistort; - productName = nona; - productReference = 573F33A809F7AB110088B333 /* zhang_undistort */; - productType = "com.apple.product-type.tool"; - }; - 573F33AA09F7AB190088B333 /* color_correct_tiff */ = { - isa = PBXNativeTarget; - buildConfigurationList = 573F33C009F7AB190088B333 /* Build configuration list for PBXNativeTarget "color_correct_tiff" */; - buildPhases = ( - 573F33B309F7AB190088B333 /* Sources */, - 573F33B509F7AB190088B333 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 57E83C890C4101C700F20012 /* PBXTargetDependency */, - ); - name = color_correct_tiff; - productName = nona; - productReference = 573F33C609F7AB190088B333 /* color_correct_tiff */; - productType = "com.apple.product-type.tool"; - }; 573F33CB09F7AC260088B333 /* fulla */ = { isa = PBXNativeTarget; buildConfigurationList = 573F33E109F7AC260088B333 /* Build configuration list for PBXNativeTarget "fulla" */; @@ -2231,6 +2190,27 @@ productReference = 5750CC8606774D0300B049DC /* libcommon.a */; productType = "com.apple.product-type.library.static"; }; + 57649A810C46C39F003AFC2F /* vig_optimizer */ = { + isa = PBXNativeTarget; + buildConfigurationList = 57649A990C46C39F003AFC2F /* Build configuration list for PBXNativeTarget "vig_optimizer" */; + buildPhases = ( + 57649A8C0C46C39F003AFC2F /* Sources */, + 57649A8E0C46C39F003AFC2F /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 57649A820C46C39F003AFC2F /* PBXTargetDependency */, + 57649A840C46C39F003AFC2F /* PBXTargetDependency */, + 57649A860C46C39F003AFC2F /* PBXTargetDependency */, + 57649A880C46C39F003AFC2F /* PBXTargetDependency */, + 57649A8A0C46C39F003AFC2F /* PBXTargetDependency */, + ); + name = vig_optimizer; + productName = nona; + productReference = 57649A9D0C46C39F003AFC2F /* vig_optimizer */; + productType = "com.apple.product-type.tool"; + }; 57C1705809A125DE00FAF325 /* vigra_ext */ = { isa = PBXNativeTarget; buildConfigurationList = 57C1706609A125DE00FAF325 /* Build configuration list for PBXNativeTarget "vigra_ext" */; @@ -2347,16 +2327,15 @@ 5750CC8506774D0300B049DC /* common */, 57C1705809A125DE00FAF325 /* vigra_ext */, 5749F92D067B654900A6EDD4 /* panorama */, - 5749F986067B696900A6EDD4 /* huginwxutils */, 573B8F54067BA9CF00B7B355 /* apps */, + 5749F986067B696900A6EDD4 /* huginwxutils */, 57E7825E068107210070F6AA /* HuginOSX */, 57CF926806BD7AD100780AC5 /* nona_gui */, 573B9036067BADC600B7B355 /* tools */, - 573B8FD5067BAC4600B7B355 /* nona */, 57452B99094E3C7400E6B672 /* autooptimiser */, - 573F338C09F7AB110088B333 /* zhang_undistort */, - 573F33AA09F7AB190088B333 /* color_correct_tiff */, 573F33CB09F7AC260088B333 /* fulla */, + 573B8FD5067BAC4600B7B355 /* nona */, + 57649A810C46C39F003AFC2F /* vig_optimizer */, ); }; /* End PBXProject section */ @@ -2450,22 +2429,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 573F339509F7AB110088B333 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 573F33F709F7AC880088B333 /* zhang_undistort.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 573F33B309F7AB190088B333 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 573F33F209F7AC760088B333 /* color_correct_tiff.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 573F33D409F7AC260088B333 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2535,6 +2498,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57649A8C0C46C39F003AFC2F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 57649AA30C46C40E003AFC2F /* vig_optimize.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 57C1705909A125DE00FAF325 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2570,22 +2541,20 @@ 57CBEFCF06BC7E8F00C43FF5 /* PTStitcherPanel.cpp in Sources */, 57CBEFD006BC7E8F00C43FF5 /* PreviewFrame.cpp in Sources */, 57CBEFD106BC7E8F00C43FF5 /* PreviewPanel.cpp in Sources */, + 57BF84F30B3CB214006829C2 /* CropPanel.cpp in Sources */, + 5751ABF90BDD4EBC003A7B5C /* OptimizePhotometricPanel.cpp in Sources */, 57CBEFD306BC7E8F00C43FF5 /* OptimizePanel.cpp in Sources */, 57CBEFD506BC7E8F00C43FF5 /* RunStitcherFrame.cpp in Sources */, 57CBEFD606BC7E8F00C43FF5 /* CPListFrame.cpp in Sources */, 57CBEFD706BC7E8F00C43FF5 /* TextKillFocusHandler.cpp in Sources */, 57CBEFDA06BC7E8F00C43FF5 /* PanoDruid.cpp in Sources */, - 573F330E09F79CE00088B333 /* CPFineTuneFrame.cpp in Sources */, 57D5DCF3073FE2CF0027E52F /* PreferencesDialog.cpp in Sources */, 57EEC3EF08CD09CA00B6A197 /* LocalizedFileTipProvider.cpp in Sources */, 577D3D0B09A0D76D004C6964 /* VigCorrDialog.cpp in Sources */, 577D3D0909A0D759004C6964 /* wxPanoCommand.cpp in Sources */, 57B8C3C3083A4B6900283C06 /* MyExternalCmdExecDialog.cpp in Sources */, - 573F330F09F79D0D0088B333 /* UniversalCursor.cpp in Sources */, 57BF84F20B3CB214006829C2 /* AssistantPanel.cpp in Sources */, - 57BF84F30B3CB214006829C2 /* CropPanel.cpp in Sources */, 57A6048C0B4B6321008F4039 /* HFOVDialog.cpp in Sources */, - 5751ABF90BDD4EBC003A7B5C /* OptimizePhotometricPanel.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2657,31 +2626,11 @@ target = 5749F92D067B654900A6EDD4 /* panorama */; targetProxy = 573B8FDE067BAC6200B7B355 /* PBXContainerItemProxy */; }; - 573F338D09F7AB110088B333 /* PBXTargetDependency */ = { + 573BAC980C520F4D0057D41C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5749F8A2067B60CA00A6EDD4 /* jhead */; - targetProxy = 573F338E09F7AB110088B333 /* PBXContainerItemProxy */; + target = 5749F986067B696900A6EDD4 /* huginwxutils */; + targetProxy = 573BAC970C520F4D0057D41C /* PBXContainerItemProxy */; }; - 573F338F09F7AB110088B333 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5750CC8506774D0300B049DC /* common */; - targetProxy = 573F339009F7AB110088B333 /* PBXContainerItemProxy */; - }; - 573F339109F7AB110088B333 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5749F92D067B654900A6EDD4 /* panorama */; - targetProxy = 573F339209F7AB110088B333 /* PBXContainerItemProxy */; - }; - 573F339309F7AB110088B333 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5711524906BC6709004F4FA7 /* vigra_impex */; - targetProxy = 573F339409F7AB110088B333 /* PBXContainerItemProxy */; - }; - 573F33C909F7ABB70088B333 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 57C1705809A125DE00FAF325 /* vigra_ext */; - targetProxy = 573F33C809F7ABB70088B333 /* PBXContainerItemProxy */; - }; 573F33CC09F7AC260088B333 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5749F8A2067B60CA00A6EDD4 /* jhead */; @@ -2712,16 +2661,6 @@ target = 573F33CB09F7AC260088B333 /* fulla */; targetProxy = 573F33F809F7AD8F0088B333 /* PBXContainerItemProxy */; }; - 573F33FB09F7AD8F0088B333 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 573F33AA09F7AB190088B333 /* color_correct_tiff */; - targetProxy = 573F33FA09F7AD8F0088B333 /* PBXContainerItemProxy */; - }; - 573F33FD09F7AD8F0088B333 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 573F338C09F7AB110088B333 /* zhang_undistort */; - targetProxy = 573F33FC09F7AD8F0088B333 /* PBXContainerItemProxy */; - }; 573F33FF09F7AD9A0088B333 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57452B99094E3C7400E6B672 /* autooptimiser */; @@ -2777,16 +2716,41 @@ target = 5749F92D067B654900A6EDD4 /* panorama */; targetProxy = 5749FA1E067B7E0A00A6EDD4 /* PBXContainerItemProxy */; }; - 5749FA21067B7E0A00A6EDD4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5749F986067B696900A6EDD4 /* huginwxutils */; - targetProxy = 5749FA20067B7E0A00A6EDD4 /* PBXContainerItemProxy */; - }; 574F3F39082006B80086E561 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5749F986067B696900A6EDD4 /* huginwxutils */; targetProxy = 574F3F38082006B80086E561 /* PBXContainerItemProxy */; }; + 5752953F0C46C4AD00BD4FDB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57649A810C46C39F003AFC2F /* vig_optimizer */; + targetProxy = 5752953E0C46C4AD00BD4FDB /* PBXContainerItemProxy */; + }; + 57649A820C46C39F003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E83C640C4100F900F20012 /* copy config.h */; + targetProxy = 57649A830C46C39F003AFC2F /* PBXContainerItemProxy */; + }; + 57649A840C46C39F003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F8A2067B60CA00A6EDD4 /* jhead */; + targetProxy = 57649A850C46C39F003AFC2F /* PBXContainerItemProxy */; + }; + 57649A860C46C39F003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5750CC8506774D0300B049DC /* common */; + targetProxy = 57649A870C46C39F003AFC2F /* PBXContainerItemProxy */; + }; + 57649A880C46C39F003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F92D067B654900A6EDD4 /* panorama */; + targetProxy = 57649A890C46C39F003AFC2F /* PBXContainerItemProxy */; + }; + 57649A8A0C46C39F003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5711524906BC6709004F4FA7 /* vigra_impex */; + targetProxy = 57649A8B0C46C39F003AFC2F /* PBXContainerItemProxy */; + }; 579354B106EAA70F003F2DE7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5711524906BC6709004F4FA7 /* vigra_impex */; @@ -2907,16 +2871,6 @@ target = 57E83C640C4100F900F20012 /* copy config.h */; targetProxy = 57E83C840C4101BB00F20012 /* PBXContainerItemProxy */; }; - 57E83C870C4101C300F20012 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 57E83C640C4100F900F20012 /* copy config.h */; - targetProxy = 57E83C860C4101C300F20012 /* PBXContainerItemProxy */; - }; - 57E83C890C4101C700F20012 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 57E83C640C4100F900F20012 /* copy config.h */; - targetProxy = 57E83C880C4101C700F20012 /* PBXContainerItemProxy */; - }; 57E83C8B0C4101CC00F20012 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57E83C640C4100F900F20012 /* copy config.h */; @@ -2946,93 +2900,6 @@ }; name = Release; }; - 573F33A409F7AB110088B333 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = YES; - LIBRARY_SEARCH_PATHS = ( - "$(LIBRARY_SEARCH_PATHS)", - "$(TARGET_BUILD_DIR)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; - PRODUCT_NAME = zhang_undistort; - STRIP_INSTALLED_PRODUCT = NO; - }; - name = Debug; - }; - 573F33A509F7AB110088B333 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = NO; - LIBRARY_SEARCH_PATHS = ( - "$(LIBRARY_SEARCH_PATHS)", - "$(TARGET_BUILD_DIR)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; - PRODUCT_NAME = zhang_undistort; - STRIP_INSTALLED_PRODUCT = NO; - }; - name = Development; - }; - 573F33A709F7AB110088B333 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = YES; - LIBRARY_SEARCH_PATHS = ( - "$(LIBRARY_SEARCH_PATHS)", - "$(TARGET_BUILD_DIR)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; - PRODUCT_NAME = zhang_undistort; - STRIP_INSTALLED_PRODUCT = YES; - }; - name = Release; - }; - 573F33C209F7AB190088B333 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = YES; - LIBRARY_SEARCH_PATHS = ( - "$(LIBRARY_SEARCH_PATHS)", - "$(TARGET_BUILD_DIR)", - "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib", - ); - PRODUCT_NAME = color_correct_tiff; - STRIP_INSTALLED_PRODUCT = NO; - }; - name = Debug; - }; - 573F33C309F7AB190088B333 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = NO; - LIBRARY_SEARCH_PATHS = ( - "$(LIBRARY_SEARCH_PATHS)", - "$(TARGET_BUILD_DIR)", - "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib", - ); - PRODUCT_NAME = color_correct_tiff; - STRIP_INSTALLED_PRODUCT = NO; - }; - name = Development; - }; - 573F33C509F7AB190088B333 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEPLOYMENT_POSTPROCESSING = YES; - LIBRARY_SEARCH_PATHS = ( - "$(LIBRARY_SEARCH_PATHS)", - "$(TARGET_BUILD_DIR)", - "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib", - ); - PRODUCT_NAME = color_correct_tiff; - STRIP_INSTALLED_PRODUCT = YES; - }; - name = Release; - }; 573F33E309F7AC260088B333 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3040,8 +2907,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = fulla; STRIP_INSTALLED_PRODUCT = NO; }; @@ -3054,8 +2923,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = fulla; STRIP_INSTALLED_PRODUCT = NO; }; @@ -3068,8 +2939,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = fulla; STRIP_INSTALLED_PRODUCT = YES; }; @@ -3082,8 +2955,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = autooptimiser; STRIP_INSTALLED_PRODUCT = NO; }; @@ -3096,8 +2971,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = autooptimiser; STRIP_INSTALLED_PRODUCT = NO; }; @@ -3110,8 +2987,10 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = autooptimiser; STRIP_INSTALLED_PRODUCT = YES; }; @@ -3149,6 +3028,7 @@ isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", "HasPNG=1", "HasJPEG=1", "HasTIFF=1", @@ -3161,6 +3041,7 @@ isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", "HasPNG=1", "HasJPEG=1", "HasTIFF=1", @@ -3186,7 +3067,7 @@ 5745FC1A094E1E6400E6B672 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3207,7 +3088,7 @@ 5745FC1B094E1E6400E6B672 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3325,7 +3206,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = YES; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3357,7 +3238,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = YES; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3389,7 +3270,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = YES; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3408,8 +3289,10 @@ "$(LIBRARY_SEARCH_PATHS)", "$(TARGET_BUILD_DIR)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona_gui; STRIP_INSTALLED_PRODUCT = NO; }; @@ -3419,7 +3302,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = YES; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3438,8 +3321,10 @@ "$(LIBRARY_SEARCH_PATHS)", "$(TARGET_BUILD_DIR)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona_gui; STRIP_INSTALLED_PRODUCT = YES; }; @@ -3804,7 +3689,6 @@ STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; USER_HEADER_SEARCH_PATHS = "../src/foreign/ ../src/include "; - VERSIONING_SYSTEM = "apple-generic"; WARNING_CFLAGS = "-Wstrict-aliasing"; WX_INCLUDE_DIR = "./ExternalPrograms/repository/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "./ExternalPrograms/repository/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -3857,6 +3741,60 @@ }; name = Release; }; + 57649A9A0C46C39F003AFC2F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_3)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + PRODUCT_NAME = vig_optimizer; + STRIP_INSTALLED_PRODUCT = NO; + }; + name = Debug; + }; + 57649A9B0C46C39F003AFC2F /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = NO; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_3)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + PRODUCT_NAME = vig_optimizer; + STRIP_INSTALLED_PRODUCT = NO; + }; + name = Development; + }; + 57649A9C0C46C39F003AFC2F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = YES; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_3)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + PRODUCT_NAME = vig_optimizer; + STRIP_INSTALLED_PRODUCT = YES; + }; + name = Release; + }; 576D276E093B3D4300FC5596 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3875,6 +3813,7 @@ isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( + "$(value)", "HasPNG=1", "HasJPEG=1", "HasTIFF=1", @@ -3893,7 +3832,7 @@ 576D2772093B3D4300FC5596 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3915,7 +3854,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = NO; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3964,7 +3903,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = NO; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/include/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", WX_PRECOMP, @@ -3983,8 +3922,10 @@ "$(LIBRARY_SEARCH_PATHS)", "$(TARGET_BUILD_DIR)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/usr/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona_gui; STRIP_INSTALLED_PRODUCT = NO; }; @@ -4458,26 +4399,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 573F33A209F7AB110088B333 /* Build configuration list for PBXNativeTarget "zhang_undistort" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 573F33A409F7AB110088B333 /* Debug */, - 573F33A509F7AB110088B333 /* Development */, - 573F33A709F7AB110088B333 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; - 573F33C009F7AB190088B333 /* Build configuration list for PBXNativeTarget "color_correct_tiff" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 573F33C209F7AB190088B333 /* Debug */, - 573F33C309F7AB190088B333 /* Development */, - 573F33C509F7AB190088B333 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 573F33E109F7AC260088B333 /* Build configuration list for PBXNativeTarget "fulla" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -4498,6 +4419,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 57649A990C46C39F003AFC2F /* Build configuration list for PBXNativeTarget "vig_optimizer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57649A9A0C46C39F003AFC2F /* Debug */, + 57649A9B0C46C39F003AFC2F /* Development */, + 57649A9C0C46C39F003AFC2F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 57C1706609A125DE00FAF325 /* Build configuration list for PBXNativeTarget "vigra_ext" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/trunk/src/include/PT/RemappedPanoImage.h =================================================================== --- hugin/trunk/src/include/PT/RemappedPanoImage.h 2007-07-21 07:42:58 UTC (rev 2303) +++ hugin/tru... [truncated message content] |
From: <da...@us...> - 2007-07-23 17:27:23
|
Revision: 2316 http://hugin.svn.sourceforge.net/hugin/?rev=2316&view=rev Author: dangelo Date: 2007-07-23 10:27:22 -0700 (Mon, 23 Jul 2007) Log Message: ----------- added check for VIPS Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/src/CMakeLists.txt Added Paths: ----------- hugin/trunk/CMakeModules/HuginMacros.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-07-23 17:24:14 UTC (rev 2315) +++ hugin/trunk/CMakeLists.txt 2007-07-23 17:27:22 UTC (rev 2316) @@ -1,5 +1,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules ) +include(HuginMacros) include(CheckIncludeFiles) ## global setup @@ -38,20 +39,17 @@ MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})") ENDIF(MSGFMT_FOUND) -# check for VIPSvipsCC-7.12 -#PKGCONFIG(vipsCC-7.12 VIPS_INCLUDE_DIR VIPS_LINK_DIR VIPS_LINK_FLAGS VIPS_CFLAGS) +pkg_check_modules(VIPS vips-7.12) +LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING) +LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING) pkg_check_modules(VIPSCC vipsCC-7.12) +LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING) +LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING) -MESSAGE("Vips include dir: ${VIPSCC_INCLUDE_DIR}") -MESSAGE("Vips link dir: ${VIPSCC_LINK_DIR}") -MESSAGE("Vips link flags: ${VIPSCC_LDFLAGS}") -MESSAGE("Vips cflags: ${VIPSCC_CFLAGS}") - MESSAGE("tiff libraries: ${TIFF_LIBRARIES}") MESSAGE("tiff include dir: ${TIFF_INCLUDE_DIR}") - #BUILD SETUP IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING @@ -102,8 +100,6 @@ MESSAGE("WARNING: installation for OSX not yet supported") ENDIF(UNIX) -set(AAAA "bbbbb") - # create config.h file configure_file(src/include/config.h.in.cmake ${CMAKE_BINARY_DIR}/src/include/config.h) @@ -111,4 +107,7 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} ) +INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} ) + add_subdirectory(src) Added: hugin/trunk/CMakeModules/HuginMacros.cmake =================================================================== --- hugin/trunk/CMakeModules/HuginMacros.cmake (rev 0) +++ hugin/trunk/CMakeModules/HuginMacros.cmake 2007-07-23 17:27:22 UTC (rev 2316) @@ -0,0 +1,6 @@ +# macro to convert a CMAKE list to a string +MACRO(LIST2STRING alist astring) + FOREACH(elem ${${alist}}) + SET(${astring} "${${astring}} ${elem}") + ENDFOREACH(elem) +ENDMACRO(LIST2STRING) Modified: hugin/trunk/src/CMakeLists.txt =================================================================== --- hugin/trunk/src/CMakeLists.txt 2007-07-23 17:24:14 UTC (rev 2315) +++ hugin/trunk/src/CMakeLists.txt 2007-07-23 17:27:22 UTC (rev 2316) @@ -19,9 +19,9 @@ # build vips stuff, only if vips was found # not ready for the general public yet -#IF(VIPS_FOUND) -# add_subdirectory(vips) -#ENDIF(VIPS_FOUND) +IF(VIPS_FOUND) + add_subdirectory(vips) +ENDIF(VIPS_FOUND) # build gui only if wxWidgets was found IF(wxWidgets_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-10-26 22:50:41
|
Revision: 2501 http://hugin.svn.sourceforge.net/hugin/?rev=2501&view=rev Author: dangelo Date: 2007-10-26 15:50:38 -0700 (Fri, 26 Oct 2007) Log Message: ----------- specify better paths for windows install Modified Paths: -------------- hugin/trunk/CMakeLists.txt Removed Paths: ------------- hugin/trunk/INSTALL Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-10-26 22:47:38 UTC (rev 2500) +++ hugin/trunk/CMakeLists.txt 2007-10-26 22:50:38 UTC (rev 2501) @@ -18,10 +18,31 @@ #FIND_PACKAGE(FLEX REQUIRED) # find dependencies +IF (UNIX) FIND_PACKAGE(PkgConfig) +ENDIF (UNIX) + +## +## Graphics libraries +## + + FIND_PACKAGE(TIFF REQUIRED) +INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) FIND_PACKAGE(JPEG REQUIRED) +INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) +FIND_PACKAGE(PNG REQUIRED) +INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) +FIND_PACKAGE(OpenEXR) +IF (OPENEXR_FOUND) +include_directories(${OPENEXR_INCLUDE_DIR}) +ENDIF (OPENEXR_FOUND) + +## +## Panotools +## + FIND_PACKAGE(PANO13) FIND_PACKAGE(PANO12) @@ -32,40 +53,42 @@ SET(PANO_LIBRARIES ${PANO13_LIBRARIES}) SET(PANO_INCLUDE_DIR ${PANO13_INCLUDE_DIR}) ELSE(PANO13_FOUND) - ERROR("Either libpano13 or libpano12 are required") + MESSAGE(SEND_ERROR "Either libpano13 or libpano12 are required") ENDIF(PANO13_FOUND) +INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR}) -FIND_PACKAGE(PNG REQUIRED) -FIND_PACKAGE(OpenEXR) +## +## Boost +## -IF (OPENEXR_FOUND) -include_directories(${OPENEXR_INCLUDE_DIR}) -ENDIF (OPENEXR_FOUND) - FIND_PACKAGE(Boost REQUIRED) -SET(wxWidgets_USE_LIBS base core xrc) + +## +## wxWidgets +## + +SET(wxWidgets_USE_LIBS base core xrc html xml adv) FIND_PACKAGE(wxWidgets REQUIRED) IF(NOT wxWidgets_FOUND) - MESSAGE("wxWidgets was not found, GUI (hugin, nona_gui) disabled") + MESSAGE("wxWidgets was not found, GUI programs (hugin, nona_gui) disabled") ENDIF(NOT wxWidgets_FOUND) -FIND_PACKAGE(MSGFMT REQUIRED) -IF(MSGFMT_FOUND) - MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})") -ENDIF(MSGFMT_FOUND) -pkg_check_modules(VIPS vips-7.12) -LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING) -LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING) -pkg_check_modules(VIPSCC vipsCC-7.12) -LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING) -LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING) +IF (WIN32) + # todo: check for vips (not needed right now) +ELSE (WIN32) + pkg_check_modules(VIPS vips-7.12) + LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING) + LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING) -MESSAGE("tiff libraries: ${TIFF_LIBRARIES}") -MESSAGE("tiff include dir: ${TIFF_INCLUDE_DIR}") + pkg_check_modules(VIPSCC vipsCC-7.12) + LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING) + LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING) +ENDIF (WIN32) + #BUILD SETUP IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING @@ -92,11 +115,12 @@ # SET(CMAKE_C_FLAGS_DEBUG "-g3 -O0 -Wall -DDEBUG" CACHE) #ENDIF(UNIX) -IF (UNIX) +IF (UNIX OR APPLE) # define destination dirs (relative to prefix) SET(HUGINDATADIR share/hugin) SET(DATADIR share) SET(BINDIR bin) + SET(LOCALEDIR share/locale) SET(ICONDIR share/icons) SET(LINKDIR share/applications) SET(LIBDIR lib${LIB_SUFFIX}) @@ -107,21 +131,23 @@ SET(HUGIN_SHARED_LIBS 1) ENDIF (${HUGIN_SHARED}) MESSAGE("Using shared libraries") -ELSEIF (WIN32) - SET(HUGINDATADIR "") - SET(DATADIR xrc) - SET(BINDIR "") - SET(ICONDIR "") - SET(LINKDIR "") +ELSE (UNIX OR APPLE) + # Windows + SET(BINDIR ${CMAKE_INSTALL_PREFIX}) + SET(DATADIR ${CMAKE_INSTALL_PREFIX}) + SET(HUGINDATADIR ${CMAKE_INSTALL_PREFIX}) + SET(LIBDIR ${CMAKE_INSTALL_PREFIX}) + SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) # no shared libs DLL on windows. The code is just # not set up for that.. ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) +ENDIF (UNIX OR APPLE) - # backward compatibility - SET(INSTALL_XRC_DIR xrc) - SET(INSTALL_LOCALE_DIR locale) -ENDIF(UNIX) +FIND_PACKAGE(MSGFMT REQUIRED) +IF(MSGFMT_FOUND) + MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})") +ENDIF(MSGFMT_FOUND) #This namespace workaround is not needed for CMake >= 2.5.x @@ -148,7 +174,6 @@ LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} ) INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} ) -INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR}) add_subdirectory(src) add_subdirectory(doc) Deleted: hugin/trunk/INSTALL =================================================================== --- hugin/trunk/INSTALL 2007-10-26 22:47:38 UTC (rev 2500) +++ hugin/trunk/INSTALL 2007-10-26 22:50:38 UTC (rev 2501) @@ -1,88 +0,0 @@ -Overview: - -These are UNIX only instructions, but they might also work with a proper mingw or -cygwin system, that has support for all the needed requirements. - -hugin uses the following libraries. make sure that they are completely -installed (including dev packages) - -REQUIRED LIBRARIES/PACKAGES: - - - wxwindows 2.4.0 or higher (libary and development packages) - - wxWidgets >= 2.6 is recommended - - Special instructions for wxWindows 2.4.x: - - hugin uses the XRC extension of wxwindows to build its - dialogs. - - the XRC extension needs to be installed. You might - need to install a wxwin-contrib (debian) or similar package if provided - by your distribution, since most distributions do not include it - in their default package. - - If you compile wxwindows from scratch, go to the contrib/src/xrc folder - and compile and install xrc from there. - - - Panorama tools. Please DO NOT USE the versions from the original site. - I'm using the version maintaned on sourceforge, http://panotools.sf.net - - Prebuild packages are available from: - http://www.photocreations.ca/panotools/index.html (windows builds) - or - http://bugbear.blackfish.org.uk/~bruno/panorama-tools/ (linux rpm & sourcecode) - - - make, - - boost, get it from www.boost.org - The headers and the boost thread library are required - - gcc (tested with 3.2, 3.3, 3.4 and 4.0) - - -Required packages building for debian: - libwxgtk2.6-dev libpano12-dev libboost-dev libboost-graph-dev libboost-thread-dev libboost-thread - -Required packages for ubuntu dapper: -apt-get install automake1.7 autoconf libtool zlib1g-dev libtiff-dev libjpeg-dev libpng-dev gcc g++ gcj libboost-graph-dev libboost-thread-dev libwxgtk2.6-dev wx-common libglib2.0-dev libgtk2.0-dev - -Panotools 2.8.3 or later is required. Install manually. - -COMPILATION: - -These are the instructions for linux. see the WINDOWS_COMPILE.txt -if you compile on windows. - -If you use the CVS source, please read HACKING before continuing - -do the following in the hugin directory: -$ ./configure - Configure might get confused if wxWindows 2.4 and 2.5 is installed - at the same time (especially on debian). - For example, debian ships wxWindows 2.5 as unicode enabled, so use - ./configure --with-unicode=yes, else it configure will mix 2.4 and 2.5. - - Other important configure switches include: - --disable-desktop Disable calling update-mime-database - This is useful if update-desktop-database - fails. This can happen if a nonstandart --prefix - has is used. - -$ make -$ make install - -If you need to compile wxWindows, please use the following steps: -$ bzip2 -dv wxGTK-2.4.2.tar.bz2 -$ cd wxGTK-2.4.0 -$ ./configure --with-gtk --with-opengl -$ make -$ cd contrib -$ ./configure -$ make -$ cd .. -$ su ( login as root ) -$ make install -$ cd contrib -$ make install -$ ldconfig -$ exit ( exit the root mode ) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-10-27 07:59:29
|
Revision: 2505 http://hugin.svn.sourceforge.net/hugin/?rev=2505&view=rev Author: dangelo Date: 2007-10-27 00:59:26 -0700 (Sat, 27 Oct 2007) Log Message: ----------- trying to compile on mingw Modified Paths: -------------- hugin/trunk/CMakeModules/FindOpenEXR.cmake hugin/trunk/src/CMakeLists.txt hugin/trunk/src/foreign/CMakeLists.txt hugin/trunk/src/hugin1/PT/Panorama.h hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h Modified: hugin/trunk/CMakeModules/FindOpenEXR.cmake =================================================================== --- hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-10-27 07:59:26 UTC (rev 2505) @@ -16,13 +16,13 @@ SET(OPENEXR_FOUND TRUE) else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -IF (NOT WIN32) +IF (NOT WIN32 OR MINGW) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) -ENDIF (NOT WIN32) +ENDIF (NOT WIN32 OR MINGW) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h ${_OpenEXRIncDir} ${_OpenEXRIncDir}/OpenEXR/ Modified: hugin/trunk/src/CMakeLists.txt =================================================================== --- hugin/trunk/src/CMakeLists.txt 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/src/CMakeLists.txt 2007-10-27 07:59:26 UTC (rev 2505) @@ -5,21 +5,26 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/vigra ) # define common sets of libraries, used by different subdirectories -IF (WIN32) +IF (WIN32 AND NOT MINGW) # boost_thread is linked automatically # additionally link to our getopt set(common_libs huginbase huginjhead hugingetopt ${PANO_LIBRARIES} huginlevmar) include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/getopt/include ) -ELSE (WIN32) +ELSEIF (MINGW) # need to specify boost thread library + set(common_libs huginbase huginjhead boost_thread-mgw-mt + ${PANO_LIBRARIES} huginlevmar) +ELSE (WIN32 AND NOT MINGW) + # need to specify boost thread library set(common_libs huginbase huginjhead boost_thread ${PANO_LIBRARIES} huginlevmar) -ENDIF (WIN32) -set(image_libs huginvigraimpex ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} - ${PNG_LIBRARIES} ${OPENEXR_LIBRARIES}) +ENDIF (WIN32 AND NOT MINGW) +set(image_libs huginvigraimpex ${OPENEXR_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} + ${PNG_LIBRARIES}) + add_subdirectory(foreign) add_subdirectory(hugin_base) add_subdirectory(tools) Modified: hugin/trunk/src/foreign/CMakeLists.txt =================================================================== --- hugin/trunk/src/foreign/CMakeLists.txt 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/src/foreign/CMakeLists.txt 2007-10-27 07:59:26 UTC (rev 2505) @@ -5,7 +5,7 @@ add_subdirectory(jhead) add_subdirectory(lensdb) -IF (WIN32) -add_subdirectory(getopt) -ENDIF (WIN32) +IF (WIN32 AND NOT MINGW) + add_subdirectory(getopt) +ENDIF (WIN32 AND NOT MINGW) Modified: hugin/trunk/src/hugin1/PT/Panorama.h =================================================================== --- hugin/trunk/src/hugin1/PT/Panorama.h 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/src/hugin1/PT/Panorama.h 2007-10-27 07:59:26 UTC (rev 2505) @@ -89,7 +89,7 @@ unsigned calcOptimalWidth() const { Panorama pano(*this); - return HuginBase::CalculateOptimalScale::calcOptimalScale(pano) * pano.getOptions().getWidth(); + return hugin_utils::roundi(HuginBase::CalculateOptimalScale::calcOptimalScale(pano) * pano.getOptions().getWidth()); } /** calculate control point error distance statistics */ Modified: hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h =================================================================== --- hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h 2007-10-27 07:59:26 UTC (rev 2505) @@ -72,7 +72,7 @@ o_successful = runAlgorithm(); } -#if 1 +#if 0 /// runs the algorithm. template<class AlgorithmClass> AlgorithmClass& runMe() Modified: hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h =================================================================== --- hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h 2007-10-27 07:59:26 UTC (rev 2505) @@ -46,7 +46,7 @@ class StitcherAlgorithm : public TimeConsumingPanoramaAlgorithm { - protected: + public: /// StitcherAlgorithm(PanoramaData& panoramaData, AppBase::ProgressDisplay* progressDisplay, @@ -85,7 +85,7 @@ class ImageStitcherAlgorithm : public StitcherAlgorithm { - protected: + public: typedef vigra::FRGBImage DestImage; typedef vigra::BImage DestAlpha; @@ -114,7 +114,7 @@ class FileOutputStitcherAlgorithm : public StitcherAlgorithm { - protected: + public: typedef std::string String; /// @@ -138,6 +138,8 @@ }; + // parent class does not have a default constructor, leads to compiler errors +#if 0 /** reserved for future use; allows more control over the filenames of output. * the current implementation is identical to that of FileOutputStitcherAlgorithm. */ @@ -147,7 +149,7 @@ /// virtual ~MultiFileOutputStitcherAlgorithm() {}; }; - +#endif } // namespace #endif // _H Modified: hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp 2007-10-27 07:59:26 UTC (rev 2505) @@ -56,3 +56,4 @@ } //namespace + Modified: hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2007-10-27 00:18:38 UTC (rev 2504) +++ hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2007-10-27 07:59:26 UTC (rev 2505) @@ -33,7 +33,6 @@ #include <algorithm/StitcherAlgorithm.h> - namespace HuginBase { @@ -62,7 +61,8 @@ virtual bool runStitcher(); // uses Nona::stitchPanorama() }; + - } + #endif //_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-10-28 10:28:54
|
Revision: 2507 http://hugin.svn.sourceforge.net/hugin/?rev=2507&view=rev Author: dangelo Date: 2007-10-28 03:28:52 -0700 (Sun, 28 Oct 2007) Log Message: ----------- Added new platforms directory, for platform-specific setup things. I haven't moved the mac directory there, because there might be relative paths pointing to the hugin sources etc. in there. Added Paths: ----------- hugin/trunk/platforms/ hugin/trunk/platforms/windows/ hugin/trunk/platforms/windows/msi/ hugin/trunk/platforms/windows/msi/WixFragmentEnblend.wxs hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs hugin/trunk/platforms/windows/msi/big_banner.bmp hugin/trunk/platforms/windows/msi/big_banner.png hugin/trunk/platforms/windows/msi/big_banner.psd hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup hugin/trunk/platforms/windows/msi/top_banner.bmp hugin/trunk/platforms/windows/msi/top_banner.psd Added: hugin/trunk/platforms/windows/msi/WixFragmentEnblend.wxs =================================================================== --- hugin/trunk/platforms/windows/msi/WixFragmentEnblend.wxs (rev 0) +++ hugin/trunk/platforms/windows/msi/WixFragmentEnblend.wxs 2007-10-28 10:28:52 UTC (rev 2507) @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment Id="EnblendFragment"> + <Feature Id="EnblendRegistryFeature" Display="hidden" Level="1" > + <ComponentRef Id="EnblendRegistryComponent" /> + </Feature> + <DirectoryRef Id="ENBLENDDIRECTORY"> + <Component Id="EnblendRegistryComponent" Guid="29EB5F26-83E0-11DC-9259-EE4156D89593" DiskId="1"> + <Condition><![CDATA[ADDLOCAL><"ENBLENDFEATURE" Or REINSTALL><"ENBLENDFEATURE"]]></Condition> + <RegistryKey Root="HKCU" Key="Software"> + <RegistryKey Key="hugin" Action="create" > + <RegistryKey Key="Enblend" Action="create" > + <RegistryValue Name="UseCroppedFiles" Value="1" Type="integer" /> + <RegistryValue Name="EnblendExe" Value="[ENBLENDDIRECTORY]enblend.exe" Type="string" /> + <RegistryValue Name="DeleteRemappedFiles" Value="1" Type="integer" /> + <RegistryValue Name="EnblendArgs" Value="-v " Type="string" /> + <RegistryValue Name="EnblendExeCustom" Value="1" Type="integer" /> + </RegistryKey> + </RegistryKey> + </RegistryKey> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Added: hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs =================================================================== --- hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs (rev 0) +++ hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs 2007-10-28 10:28:52 UTC (rev 2507) @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + + <Fragment Id="RegistryFragment"> + + <Feature Id="HuginRegistryFeature" Display="hidden" Level="1"> + <ComponentRef Id="HuginRegistryComponent" /> + </Feature> + + <FeatureRef Id="HUGINFEATURE" > + <Feature Id="HuginAssociationFeature" Title="Association" Description="Associate .pto files with hugin" Level="1"> + <ComponentRef Id="HuginAssociationComponent" /> + </Feature> + </FeatureRef> + + <Property Id="AUTOPANOSIFT"> + <DirectorySearch Id="AutopanoSiftDirectory" Depth="1" Path="[ProgramFilesFolder]"> + <FileSearch Name="autopano-win32.exe" /> + </DirectorySearch> + </Property> + + <DirectoryRef Id="TARGETDIR"> + + <Component Id="HuginAssociationComponent" Guid="398B874E-837C-11DC-A44F-2A8755D89593" DiskId="1"> + <Extension Id="pto"> + <Verb Id="Open" Command="Open" TargetFile="HUGINEXECUTABLE" Argument='"%1"' /> + </Extension> + </Component> + + <Component Id="HuginRegistryComponent" Guid="FF46C478-8316-11DC-9F04-5B8056D89593" DiskId="1"> + + <Shortcut Id="HomePage" Name="hugin website" Target="[System64Folder]rundll32.exe" Arguments="url.dll,FileProtocolHandler http://hugin.sourceforge.net" Directory="ProgramMenuDir" Description="hugin website on the Internet" /> + <Shortcut Id="UninstallProduct" Name="Uninstall hugin" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" Directory="ProgramMenuDir" Description="Uninstalls hugin" /> + + <RegistryKey Root="HKLM" Key="Software"> + <RegistryKey Key="hugin" Action="create"> + <RegistryValue Name="Install_Dir" Value="[APPLICATIONFOLDER]" Type="string" /> + </RegistryKey> + </RegistryKey> + + <RegistryKey Root="HKCU" Key="Software"> + <RegistryKey Key="hugin" Action="create" > + + <RegistryKey Key="AutoPano" Action="create" > + <RegistryValue Name="Type" Value="1" Type="integer" /> + </RegistryKey> + + <RegistryKey Key="AutoPanoKolor" Action="create" > + <RegistryValue Name="AutopanoExeCustom" Value="0" Type="integer" /> + </RegistryKey> + + <RegistryKey Key="AutoPanoSift" Action="create" > + <RegistryValue Name="Args" Value="--output %o --imagelist %namefile" Type="string" /> + <RegistryValue Name="AutopanoExeCustom" Value="1" Type="integer" /> + <RegistryValue Name="AutopanoExe" Value="[AUTOPANOSIFT]" Type="string" /> + </RegistryKey> + + <RegistryKey Key="Panotools" Action="create" > + <RegistryValue Name="PTStitcherExeCustom" Value="0" Type="integer" /> + </RegistryKey> + + </RegistryKey> + </RegistryKey> + + </Component> + + </DirectoryRef> + + </Fragment> + +</Wix> Added: hugin/trunk/platforms/windows/msi/big_banner.bmp =================================================================== (Binary files differ) Property changes on: hugin/trunk/platforms/windows/msi/big_banner.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/trunk/platforms/windows/msi/big_banner.png =================================================================== (Binary files differ) Property changes on: hugin/trunk/platforms/windows/msi/big_banner.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/trunk/platforms/windows/msi/big_banner.psd =================================================================== (Binary files differ) Property changes on: hugin/trunk/platforms/windows/msi/big_banner.psd ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs =================================================================== --- hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs (rev 0) +++ hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs 2007-10-28 10:28:52 UTC (rev 2507) @@ -0,0 +1,499 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <!--This file was generated by WarSetup version 3.5.0.0 + See http://warsetup.jgaa.com for information about WarSetup.--> + <Product Id="5f3faf99-d8a2-46c1-8d41-facc1f95213a" Name="hugin" Manufacturer="hugin" UpgradeCode="a8245656-ca56-43a9-a642-f0e3e4da47a0" Language="1033" Codepage="1252" Version="0.7.0.4"> + <Package Description="hugin" Manufacturer="hugin" SummaryCodepage="1252" Languages="1033" InstallerVersion="100" Keywords="Installer" Compressed="yes" /> + <Media Id="1" Cabinet="Setup_1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" CompressionLevel="mszip" /> + <Property Id="DiskPrompt" Value="hugin Installation [1]" /> + <Upgrade Id="a8245656-ca56-43a9-a642-f0e3e4da47a0"> + <UpgradeVersion OnlyDetect="no" Property="WARSETUP_PREVIOUSVERSIONFOUND" IncludeMinimum="yes" Minimum="0.0.0" IncludeMaximum="no" /> + </Upgrade> + <InstallExecuteSequence> + <RemoveExistingProducts After="InstallValidate">WARSETUP_PREVIOUSVERSIONFOUND</RemoveExistingProducts> + </InstallExecuteSequence> + <CustomAction Id="IDF40148CF25DD82F1F400158B03845EC3" Property="TARGETDIR" Value="[APPLICATIONFOLDER]" /> + <InstallExecuteSequence> + <Custom Action="ID27EDEFB68BF9AAA5AD6FD77B09D778C2" After="CostFinalize" /> + <Custom Action="IDF40148CF25DD82F1F400158B03845EC3" After="FileCost" /> + <Custom Action="ID0DD6E44812D4F209C3C117DD9C05EFB0" After="ID27EDEFB68BF9AAA5AD6FD77B09D778C2" /> + <Custom Action="IDD1A23139DB883EF601C5B63D4D595111" After="ID0DD6E44812D4F209C3C117DD9C05EFB0" /> + <Custom Action="ID577987D84F2AE3127896E2588BC01133" After="IDD1A23139DB883EF601C5B63D4D595111" /> + <Custom Action="ID2C30D080F4CE9201201C001BE6C1F9D1" After="ID577987D84F2AE3127896E2588BC01133" /> + <Custom Action="IDA454B7938D11A4C1C2D9967CF8CCE181" After="ID2C30D080F4CE9201201C001BE6C1F9D1" /> + <Custom Action="ID9D0262722208511E52B27EB2091A5278" After="IDA454B7938D11A4C1C2D9967CF8CCE181" /> + </InstallExecuteSequence> + <CustomAction Id="ID27EDEFB68BF9AAA5AD6FD77B09D778C2" Property="WarSetup_PRODUCT" Value="5f3faf99-d8a2-46c1-8d41-facc1f95213a" /> + <Directory Id="TARGETDIR" Name="SourceDir"> + <Directory Id="ProgramMenuFolder" Name="Programs"> + <Directory Id="ProgramMenuDir" Name="hugin" /> + </Directory> + <Directory Id="AppDataFolder" Name="AppData"> + <Directory Id="Microsoft" Name="Microsoft"> + <Directory Id="AppMsInternetExplorer" Name="Internet Explorer"> + <Directory Id="QuickLaunchFolder" Name="Quick Launch" /> + </Directory> + </Directory> + </Directory> + <Directory Id="DesktopFolder" Name="Desktop" /> + <Directory Id="ProgramFilesFolder" Name="Program Files Folder"> + <Directory Id="WarInstallOrganizationFolder" Name="hugin"> + <Directory Id="APPLICATIONFOLDER" Name="hugin"> + <Directory Id="ID6B7D8162DC1CB5C10D1FD32878E7D8CC" Name="locale"> + <Component Id="IDD6E5ABF4290BB328D2A2ADDB55E0B63B" Guid="b19971b7-c8ca-4dcb-994f-164ac2c3f000" /> + <Directory Id="Id_ea3313bd20b9879ef9de80bf326fb35d" Name="ca_ES"> + <Component Id="ID1D3284CBA87E016FEBF293F11B31651E" Guid="a7889d92-4314-4c39-a4d7-9c3a848356a2"> + <File Id="ID_18c82d6d_8ea5_409b_93ea_1a0298721fdb" Source=".\FILES\locale\ca_ES\hugin.mo" DiskId="1" Name="hugin.mo" /> + </Component> + </Directory> + <Directory Id="Id_6153049744950151a6bd05ef95d99b0c" Name="cs_CZ"> + <Component Id="IDA1AB1FEE2027D7C9F4BD8222CFDF5E03" Guid="599a3d59-efb7-4b5f-bdd7-644f7a81fd13"> + <File Id="ID_02ffa137_39b2_473b_919c_18dfd24244b1" Source=".\FILES\locale\cs_CZ\hugin.mo" DiskId="1" Name="hugin.mo" /> + </Component> + </Directory> + <Directory Id="Id_844913cb142e85a6757acf15e3cbe4c2" Name="de"> + <Component Id="ID9CFCF83C8DD9CE7803DD9B176C0AAC36" Guid="ed9edea3-0eb4-4551-b011-4acf99a7af76"> + <File Id="ID_072cbeeb_90cb_4961_9868_b9de205fe6cc" Source=".\FILES\locale\de\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_f4bd3ad2_07dc_4e84_ab78_578a41ce56a7" Source=".\FILES\locale\de\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + <Directory Id="Id_70c180cb9e1270dc4a5368f06b27990e" Name="fr"> + <Component Id="ID33B8B18041CF82999F9EFECC94E8E963" Guid="3330e7be-cfef-40d4-a981-e3a9faeec219"> + <File Id="ID_dde48b9e_5ac2_4d36_b7f9_acc96c61da2d" Source=".\FILES\locale\fr\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_3d077840_5a1f_4051_8b2e_35be1b5f55f6" Source=".\FILES\locale\fr\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + <Directory Id="Id_e25c6bfa238825e96bfd12d342adda35" Name="hu"> + <Component Id="ID62830780CD0A610FE8259E7E0597A052" Guid="28879901-d247-4ecc-af8d-5acb378b545f"> + <File Id="ID_b2e89729_f950_40d4_8bba_f43e6ca6ef35" Source=".\FILES\locale\hu\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_405b6e1e_f001_4d51_bbd2_774b067aca36" Source=".\FILES\locale\hu\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + <Directory Id="Id_f288826d7e1ef9c3112d010e859ed0f7" Name="it"> + <Component Id="ID4188AEA0E412E1320793AAFBADCEB0BE" Guid="41b7c893-8c67-4ab5-ae35-a596e04ae0c8"> + <File Id="ID_7c06e0b8_8bc2_48ae_8730_e33812546e1d" Source=".\FILES\locale\it\hugin.mo" DiskId="1" Name="hugin.mo" /> + </Component> + </Directory> + <Directory Id="Id_6c46d89afe097b13cdf7ec17963f08c7" Name="ja"> + <Component Id="ID53F78FBB8CFFA7B048018F9F55F6635F" Guid="996dc72f-4c91-4912-8737-c68ae6a96fdb"> + <File Id="ID_bf4c95d1_2da8_4bd8_9376_80b0838a4a8a" Source=".\FILES\locale\ja\hugin.mo" DiskId="1" Name="hugin.mo" /> + </Component> + </Directory> + <Directory Id="Id_c61dc35c37f30123ea31fb1d0a5348ae" Name="nl"> + <Component Id="ID1A0C36AB581D323E52FCE282647CCE14" Guid="bbaaed70-0570-4894-afa3-18deafab2e04"> + <File Id="ID_4414dd7a_70fb_47aa_8575_b6f8f9f3e8b0" Source=".\FILES\locale\nl\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_26f7ff22_79dc_4468_ba9e_a264805097ce" Source=".\FILES\locale\nl\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + <Directory Id="Id_f9d99202a0531a176ee6e72131c45f27" Name="pl"> + <Component Id="ID8EC376875182C85E4EC52F801D65005D" Guid="929e94b3-20c7-4f15-afd0-a885b4db727e"> + <File Id="ID_830873b0_9b13_44bb_815e_aa0c12d0295c" Source=".\FILES\locale\pl\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_f381e6dd_00c3_4bea_aa95_6c10a813e507" Source=".\FILES\locale\pl\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + <Directory Id="Id_b08bdc01ec50ac6eeaa92cea21fa4d9f" Name="pt_BR"> + <Component Id="ID2B0D5BC77597B31A4BBED86DEE6A42BD" Guid="a5f782e7-c8a8-45f0-b2e6-29d432aabf8b"> + <File Id="ID_dda3de3c_38a0_43d0_8b73_d058bff56a7e" Source=".\FILES\locale\pt_BR\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_410d8d9c_092c_46d1_be75_53760ae7e572" Source=".\FILES\locale\pt_BR\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + <Directory Id="Id_5e44017365198a0234ab06b6e560f871" Name="ru"> + <Component Id="IDE894E68ACC56AD249C0D360D14313875" Guid="df85ca3d-2c03-4c6b-a35d-8481e208ac2c"> + <File Id="ID_df6a954f_4735_4647_9d89_abe0b17a4de9" Source=".\FILES\locale\ru\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_15698e04_23f9_4022_9985_88e4694b468a" Source=".\FILES\locale\ru\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + <Directory Id="Id_06c2a32b68ada7e0aac331ea622f5a77" Name="uk"> + <Component Id="IDE050B906EDFF78DFFAB66D2C11189235" Guid="a7658ffa-2f6f-41cf-883d-f50b1f819309"> + <File Id="ID_1595d8c5_6baf_49e6_bff1_f3073341756f" Source=".\FILES\locale\uk\hugin.mo" DiskId="1" Name="hugin.mo" /> + </Component> + </Directory> + <Directory Id="Id_aaf5f3a54c74a18d28a6c9290589264e" Name="zh_CN"> + <Component Id="IDBFDC522288FB04ED826B1141E7E9CE11" Guid="5220fc1a-3010-4c9b-8ac5-4ac9d4974702"> + <File Id="ID_2ae924c6_137b_484a_b9a1_0acef1f65829" Source=".\FILES\locale\zh_CN\hugin.mo" DiskId="1" Name="hugin.mo" /> + <File Id="ID_6ab2f75b_29ae_40ad_84e5_929fe7c19c31" Source=".\FILES\locale\zh_CN\nona_gui.mo" DiskId="1" Name="nona_gui.mo" /> + </Component> + </Directory> + </Directory> + <Directory Id="ID22C8736068977CE9F393F4E3A19C0F13" Name="panotools"> + <Component Id="ID1B0CF79A32BE6024EB0D7AD076845F76" Guid="7a3faf84-b2e4-4792-a833-f950c0f3358d"> + <File Id="ID_d6037039_a99a_4f41_bdf0_8b12bd637551" Source=".\FILES\panotools\AUTHORS" DiskId="1" Name="AUTHORS" /> + <File Id="ID_4e499db1_28a6_40a1_a8fa_a7d6fbf5a948" Source=".\FILES\panotools\ChangeLog" DiskId="1" Name="ChangeLog" /> + <File Id="ID_5d00cda0_7283_45e3_8e63_96f2fb572e56" Source=".\FILES\panotools\PTblender.exe" DiskId="1" Name="PTblender.exe" /> + <File Id="ID_1b9dade6_407b_47d3_ab8c_df79d390db31" Source=".\FILES\panotools\PTcrop.exe" DiskId="1" Name="PTcrop.exe" /> + <File Id="ID_a2f9a3a5_dc87_4576_bf63_780406b5e515" Source=".\FILES\panotools\PTinfo.exe" DiskId="1" Name="PTinfo.exe" /> + <File Id="ID_6f3731ba_6df0_4a0f_bd3b_20e04df65760" Source=".\FILES\panotools\PTmasker.exe" DiskId="1" Name="PTmasker.exe" /> + <File Id="ID_5d2de535_e140_4617_b978_7bacdf63e8bb" Source=".\FILES\panotools\PTmender.exe" DiskId="1" Name="PTmender.exe" /> + <File Id="ID_3e0bf385_41b0_4b87_8a55_6045ccc46426" Source=".\FILES\panotools\PTOptimizer.exe" DiskId="1" Name="PTOptimizer.exe" /> + <File Id="ID_8095e7cc_863c_4e85_9a2f_5d2ae64fbeb2" Source=".\FILES\panotools\PTroller.exe" DiskId="1" Name="PTroller.exe" /> + <File Id="ID_f3360ccc_d60a_40ac_b483_e91ad301b42c" Source=".\FILES\panotools\PTtiff2psd.exe" DiskId="1" Name="PTtiff2psd.exe" /> + <File Id="ID_ca1733fe_e4a7_4495_be20_8e7ffd892cd3" Source=".\FILES\panotools\PTtiffdump.exe" DiskId="1" Name="PTtiffdump.exe" /> + <File Id="ID_b92b9369_010a_483e_8cb0_3de6e6617533" Source=".\FILES\panotools\PTuncrop.exe" DiskId="1" Name="PTuncrop.exe" /> + <File Id="ID_f524c8a6_fe7a_4b8b_a20c_a0b16dce8244" Source=".\FILES\panotools\README" DiskId="1" Name="README" /> + <File Id="ID_714f1f1b_1b68_4829_80b2_4e2c3fcbca78" Source=".\FILES\panotools\TODO" DiskId="1" Name="TODO" /> + </Component> + <Directory Id="Id_75810fbc17de7f7588a0e4f8ec484770" Name="doc"> + <Component Id="IDEA29996259B0384D67347AA27773F804" Guid="03817979-61e4-48d8-be81-dff815c12420"> + <File Id="ID_6100a824_7867_4d33_8404_ab5b3a918985" Source=".\FILES\panotools\doc\Optimize.txt" DiskId="1" Name="Optimize.txt" /> + <File Id="ID_4218acb6_3300_4020_8aab_535bae238a66" Source=".\FILES\panotools\doc\PTblender.readme" DiskId="1" Name="PTblender.readme" /> + <File Id="ID_70868e78_746e_4fed_97b0_36b894ce0a68" Source=".\FILES\panotools\doc\PTmender.readme" DiskId="1" Name="PTmender.readme" /> + <File Id="ID_f7a27de9_bd6c_4bd0_908b_03c5ca7e2716" Source=".\FILES\panotools\doc\stitch.txt" DiskId="1" Name="stitch.txt" /> + </Component> + </Directory> + </Directory> + <Directory Id="ID5119445B68A8D7EEABAF78C7F88EB605" Name="xrc"> + <Component Id="IDB5182EAAD9FD3A249A1C1D8857C9E571" Guid="a7ffae83-bb7a-4dda-8d0c-dc31c5cf05e1"> + <File Id="ID_a1863d09_5b44_4a3f_bf1c_51af83b0c963" Source=".\FILES\xrc\about.xrc" DiskId="1" Name="about.xrc" /> + <File Id="ID_2b30cfc9_a229_44cc_b1f9_0b74d7cfc08a" Source=".\FILES\xrc\about.xrs" DiskId="1" Name="about.xrs" /> + <File Id="ID_62f3c70b_867c_4f4a_b01d_c78e2645521a" Source=".\FILES\xrc\anchor_orientation.xrc" DiskId="1" Name="anchor_orientation.xrc" /> + <File Id="ID_e86fed6d_d5ac_4e5f_8bed_a1b3113c4dee" Source=".\FILES\xrc\anchor_orientation.xrs" DiskId="1" Name="anchor_orientation.xrs" /> + <File Id="ID_959bb70c_0564_49c1_b14e_acafe1176f8f" Source=".\FILES\xrc\assistant_panel.xrc" DiskId="1" Name="assistant_panel.xrc" /> + <File Id="ID_5a1346e2_90c4_4aad_a3de_2e0c6efcabd5" Source=".\FILES\xrc\assistant_panel.xrs" DiskId="1" Name="assistant_panel.xrs" /> + <File Id="ID_e8274331_6065_4ec8_9493_d9be3aac41d0" Source=".\FILES\xrc\cp_editor_panel-2.5.xrc" DiskId="1" Name="cp_editor_panel-2.5.xrc" /> + <File Id="ID_189a1d67_71d0_43c1_877d_2cc4ef72f674" Source=".\FILES\xrc\cp_editor_panel-2.5.xrs" DiskId="1" Name="cp_editor_panel-2.5.xrs" /> + <File Id="ID_6e2cdd4e_90da_428d_992d_503c7f4346af" Source=".\FILES\xrc\cp_editor_panel.xrc" DiskId="1" Name="cp_editor_panel.xrc" /> + <File Id="ID_c141bbe3_6367_4543_9a1f_4d9adf0625a7" Source=".\FILES\xrc\cp_editor_panel.xrs" DiskId="1" Name="cp_editor_panel.xrs" /> + <File Id="ID_75353e98_3646_40bd_9065_38422969da4c" Source=".\FILES\xrc\cp_list_frame.xrc" DiskId="1" Name="cp_list_frame.xrc" /> + <File Id="ID_1d6c6054_005c_4ff9_9b8a_c4cb13f93880" Source=".\FILES\xrc\cp_list_frame.xrs" DiskId="1" Name="cp_list_frame.xrs" /> + <File Id="ID_c074e27f_6576_4fe2_8613_b6b3dfa59857" Source=".\FILES\xrc\crop_panel.xrc" DiskId="1" Name="crop_panel.xrc" /> + <File Id="ID_99ac5154_e382_4a7d_bd81_4edaf85083d0" Source=".\FILES\xrc\crop_panel.xrs" DiskId="1" Name="crop_panel.xrs" /> + <File Id="ID_a220df51_6199_46c0_9a56_b5846ac5eaef" Source=".\FILES\xrc\edit_script_dialog.xrc" DiskId="1" Name="edit_script_dialog.xrc" /> + <File Id="ID_aa4995e4_b2f7_49ce_8e12_f899de355bf5" Source=".\FILES\xrc\edit_script_dialog.xrs" DiskId="1" Name="edit_script_dialog.xrs" /> + <File Id="ID_ad02331a_725f_4512_88be_db7b34b293a2" Source=".\FILES\xrc\edit_text.xrc" DiskId="1" Name="edit_text.xrc" /> + <File Id="ID_011001ea_034b_4f11_a4ce_0d71e4fec67c" Source=".\FILES\xrc\edit_text.xrs" DiskId="1" Name="edit_text.xrs" /> + <File Id="ID_e87e5c0f_995b_45cd_9a9c_c452c9e235b3" Source=".\FILES\xrc\help.xrc" DiskId="1" Name="help.xrc" /> + <File Id="ID_83cc7e68_6d21_4a92_a833_111af3936fec" Source=".\FILES\xrc\help.xrs" DiskId="1" Name="help.xrs" /> + <File Id="ID_91941cdc_204b_4f55_a48b_128ac4ec8118" Source=".\FILES\xrc\images_panel-2.5.xrc" DiskId="1" Name="images_panel-2.5.xrc" /> + <File Id="ID_bb424c87_ac4b_4e41_87ee_978e6b501324" Source=".\FILES\xrc\images_panel-2.5.xrs" DiskId="1" Name="images_panel-2.5.xrs" /> + <File Id="ID_814ad2bd_3119_43f1_a30c_1723e4e6934d" Source=".\FILES\xrc\images_panel.xrc" DiskId="1" Name="images_panel.xrc" /> + <File Id="ID_1bb548fa_a485_446d_b213_136563dea94c" Source=".\FILES\xrc\images_panel.xrs" DiskId="1" Name="images_panel.xrs" /> + <File Id="ID_7d302e28_95ef_4100_ac09_12b5875aa450" Source=".\FILES\xrc\keyboard_help.xrc" DiskId="1" Name="keyboard_help.xrc" /> + <File Id="ID_f0b72546_3c70_45bb_b632_421b28886363" Source=".\FILES\xrc\keyboard_help.xrs" DiskId="1" Name="keyboard_help.xrs" /> + <File Id="ID_5624fdd6_47c7_48a1_ae7c_31c3852d1ae8" Source=".\FILES\xrc\lens_panel-2.5.xrc" DiskId="1" Name="lens_panel-2.5.xrc" /> + <File Id="ID_0f1769bc_cc36_490a_81e0_79c75fa4bf97" Source=".\FILES\xrc\lens_panel-2.5.xrs" DiskId="1" Name="lens_panel-2.5.xrs" /> + <File Id="ID_edb8b671_0eac_4a80_a1d3_b4c8d665c9d3" Source=".\FILES\xrc\lens_panel.xrc" DiskId="1" Name="lens_panel.xrc" /> + <File Id="ID_d6994658_f6fd_41a2_83b9_54ed1f655306" Source=".\FILES\xrc\lens_panel.xrs" DiskId="1" Name="lens_panel.xrs" /> + <File Id="ID_79c6464b_3107_476a_8344_b194972abf0a" Source=".\FILES\xrc\main_frame-2.5.xrc" DiskId="1" Name="main_frame-2.5.xrc" /> + <File Id="ID_68614a5c_173a_4f40_81a3_15317c7e03c3" Source=".\FILES\xrc\main_frame-2.5.xrs" DiskId="1" Name="main_frame-2.5.xrs" /> + <File Id="ID_f3d22bb9_9d43_46c5_8496_b4e257b93b28" Source=".\FILES\xrc\main_frame.xrc" DiskId="1" Name="main_frame.xrc" /> + <File Id="ID_d177e821_7f30_44df_9c4b_b14617db7cae" Source=".\FILES\xrc\main_frame.xrs" DiskId="1" Name="main_frame.xrs" /> + <File Id="ID_ce8cdcf7_7849_44a2_a998_0329153b64d0" Source=".\FILES\xrc\main_menu.xrc" DiskId="1" Name="main_menu.xrc" /> + <File Id="ID_8de8dfb8_959a_48a8_b054_1f0f03e7a4a0" Source=".\FILES\xrc\main_menu.xrs" DiskId="1" Name="main_menu.xrs" /> + <File Id="ID_4e6f63d2_93f3_4c83_98a9_a58caba362a6" Source=".\FILES\xrc\main_menubar.xrc" DiskId="1" Name="main_menubar.xrc" /> + <File Id="ID_d62ec5df_24cb_4bca_94be_f70ce7492209" Source=".\FILES\xrc\main_menubar.xrs" DiskId="1" Name="main_menubar.xrs" /> + <File Id="ID_59435c33_27e8_4b9e_a5fc_6d7572f78b0f" Source=".\FILES\xrc\main_tool.xrc" DiskId="1" Name="main_tool.xrc" /> + <File Id="ID_5b89ae0e_660c_40df_94b3_e8f04d82d0f5" Source=".\FILES\xrc\main_tool.xrs" DiskId="1" Name="main_tool.xrs" /> + <File Id="ID_a91ebf90_f07d_4292_9466_e590eaeaf3a2" Source=".\FILES\xrc\Makefile.am" DiskId="1" Name="Makefile.am" /> + <File Id="ID_b6688aad_5a2a_4c36_8a15_69b8e7e09c45" Source=".\FILES\xrc\Makefile.in" DiskId="1" Name="Makefile.in" /> + <File Id="ID_2f287a86_bae7_49ac_938a_59ca361824e4" Source=".\FILES\xrc\nona_panel.xrc" DiskId="1" Name="nona_panel.xrc" /> + <File Id="ID_ddc231a7_154e_4d19_9aea_a8779a18ea97" Source=".\FILES\xrc\nona_panel.xrs" DiskId="1" Name="nona_panel.xrs" /> + <File Id="ID_1560d5cc_a115_4c17_be8b_0bf12b3dd627" Source=".\FILES\xrc\optimize_panel-2.5.xrc" DiskId="1" Name="optimize_panel-2.5.xrc" /> + <File Id="ID_ea69c369_4a09_472e_9a09_1c829be02604" Source=".\FILES\xrc\optimize_panel-2.5.xrs" DiskId="1" Name="optimize_panel-2.5.xrs" /> + <File Id="ID_892c0ed1_1d14_463f_9b2b_425557290dc9" Source=".\FILES\xrc\optimize_panel.xrc" DiskId="1" Name="optimize_panel.xrc" /> + <File Id="ID_0f45a382_1599_4dc0_b65c_1dc4107e0527" Source=".\FILES\xrc\optimize_panel.xrs" DiskId="1" Name="optimize_panel.xrs" /> + <File Id="ID_a98d9f49_4fb8_4d46_bec8_74c403f5728a" Source=".\FILES\xrc\pano_panel-2.5.xrc" DiskId="1" Name="pano_panel-2.5.xrc" /> + <File Id="ID_bef58915_02b4_4d89_af5e_a58a3f962c66" Source=".\FILES\xrc\pano_panel-2.5.xrs" DiskId="1" Name="pano_panel-2.5.xrs" /> + <File Id="ID_c61086ef_ac52_4265_a83d_a0b8f1e7c03f" Source=".\FILES\xrc\pano_panel.xrc" DiskId="1" Name="pano_panel.xrc" /> + <File Id="ID_a6c8cb63_4039_4884_926c_a6fe5b49bb56" Source=".\FILES\xrc\pano_panel.xrs" DiskId="1" Name="pano_panel.xrs" /> + <File Id="ID_22d1df0a_74e9_4994_a031_76fa31217218" Source=".\FILES\xrc\pref_dialog.xrc" DiskId="1" Name="pref_dialog.xrc" /> + <File Id="ID_4f989cb4_c547_4145_b424_43ff2f7bdd58" Source=".\FILES\xrc\pref_dialog.xrs" DiskId="1" Name="pref_dialog.xrs" /> + <File Id="ID_be9aa409_4114_4687_8b0f_9b0433f67062" Source=".\FILES\xrc\preview_frame.xrc" DiskId="1" Name="preview_frame.xrc" /> + <File Id="ID_d6efa2ba_d4c3_40b1_9c2c_9da79e2c8e10" Source=".\FILES\xrc\preview_frame.xrs" DiskId="1" Name="preview_frame.xrs" /> + <File Id="ID_038553d4_ec83_4a3a_a960_4e0e2951616a" Source=".\FILES\xrc\ptstitcher_panel.xrc" DiskId="1" Name="ptstitcher_panel.xrc" /> + <File Id="ID_7f36e90b_d48f_41a4_9415_574ccf5f95d9" Source=".\FILES\xrc\ptstitcher_panel.xrs" DiskId="1" Name="ptstitcher_panel.xrs" /> + <File Id="ID_b511a6de_d1f1_4402_9d83_95520ea36311" Source=".\FILES\xrc\run_optimizer_frame.xrc" DiskId="1" Name="run_optimizer_frame.xrc" /> + <File Id="ID_b2a35dcb_2f8c_4a18_b1c6_320f0f48e9f6" Source=".\FILES\xrc\run_optimizer_frame.xrs" DiskId="1" Name="run_optimizer_frame.xrs" /> + <File Id="ID_a765accc_8888_4475_8510_f116c6fc6734" Source=".\FILES\xrc\run_stitcher_frame.xrc" DiskId="1" Name="run_stitcher_frame.xrc" /> + <File Id="ID_1d93c872_3c1b_47df_bb10_72cdfc40b6b7" Source=".\FILES\xrc\run_stitcher_frame.xrs" DiskId="1" Name="run_stitcher_frame.xrs" /> + <File Id="ID_84a4987e_915a_464c_8aa4_9bc910fd505e" Source=".\FILES\xrc\vig_corr_dlg.xrc" DiskId="1" Name="vig_corr_dlg.xrc" /> + <File Id="ID_25540fad_5689_4540_af72_76d043707ead" Source=".\FILES\xrc\vig_corr_dlg.xrs" DiskId="1" Name="vig_corr_dlg.xrs" /> + </Component> + <Directory Id="Id_18ee089cb4f5840286b958110eb861d8" Name="CVS"> + <Component Id="IDAABC868093A59A01E020D0B79AB81D2A" Guid="f16a95aa-f022-40ba-8781-04a05bc1616c"> + <File Id="ID_5a1f8bcb_f7d0_45c2_8283_31fa8216d4e5" Source=".\FILES\xrc\CVS\Entries" DiskId="1" Name="Entries" /> + <File Id="ID_d6632de5_d92c_46ef_a7ee_11b73721ea70" Source=".\FILES\xrc\CVS\Repository" DiskId="1" Name="Repository" /> + <File Id="ID_a2bfe585_8764_4194_a9ee_643792d82814" Source=".\FILES\xrc\CVS\Root" DiskId="1" Name="Root" /> + </Component> + </Directory> + <Directory Id="Id_86884fd4ea9b909ffbbdee230b0981e9" Name="data"> + <Component Id="ID1E91214A72F6B89FDC49CEC7BBE7D5C2" Guid="771fa7d1-4ecd-4ee9-968a-83c773c617fa"> + <File Id="ID_a9f04482_f8d3_41ea_b88f_b4dbfa7f7b6f" Source=".\FILES\xrc\data\1leftarrow.png" DiskId="1" Name="1leftarrow.png" /> + <File Id="ID_2837453f_b082_4ce5_9dbf_4e2c41134d62" Source=".\FILES\xrc\data\1rightarrow.png" DiskId="1" Name="1rightarrow.png" /> + <File Id="ID_6905d4de_ed75_4710_8272_f0c8caac7a4f" Source=".\FILES\xrc\data\about.htm" DiskId="1" Name="about.htm" /> + <File Id="ID_3339393d_34ff_43f9_a639_9766cb449d7d" Source=".\FILES\xrc\data\about_fr.htm" DiskId="1" Name="about_fr.htm" /> + <File Id="ID_06058bc4_05fd_4692_a6c9_91357b80bfda" Source=".\FILES\xrc\data\about_pl.htm" DiskId="1" Name="about_pl.htm" /> + <File Id="ID_908eac31_a992_49fc_a57f_45a8985eeac3" Source=".\FILES\xrc\data\center_pano.xpm" DiskId="1" Name="center_pano.xpm" /> + <File Id="ID_87ffcce0_efdd_4230_bb07_533bcbce9756" Source=".\FILES\xrc\data\close.xpm" DiskId="1" Name="close.xpm" /> + <File Id="ID_c756ac5d_286e_4f2a_b3d7_f6102212c31c" Source=".\FILES\xrc\data\CPCursor0.png" DiskId="1" Name="CPCursor0.png" /> + <File Id="ID_7ffd391d_c55b_42df_9de3_20960579c14e" Source=".\FILES\xrc\data\CPCursor1.png" DiskId="1" Name="CPCursor1.png" /> + <File Id="ID_eb95a238_f7ec_420d_ab36_b3e19568ddbd" Source=".\FILES\xrc\data\CPCursor2.png" DiskId="1" Name="CPCursor2.png" /> + <File Id="ID_048521c9_29f0_47a4_a2cd_d4fe5ae6227d" Source=".\FILES\xrc\data\CPCursor3.png" DiskId="1" Name="CPCursor3.png" /> + <File Id="ID_173724f0_0ca9_44eb_b029_d81b7ff77e24" Source=".\FILES\xrc\data\CPCursor4.png" DiskId="1" Name="CPCursor4.png" /> + <File Id="ID_0b341fea_d08e_4492_96b0_19269ded3f1d" Source=".\FILES\xrc\data\CPCursor5.png" DiskId="1" Name="CPCursor5.png" /> + <File Id="ID_86ad2213_2b75_40c9_94b1_5ed18fda0bd3" Source=".\FILES\xrc\data\CPCursor6.png" DiskId="1" Name="CPCursor6.png" /> + <File Id="ID_b9ed4f57_4470_43e6_840f_7fca95fa6346" Source=".\FILES\xrc\data\cursor_cp_pick.cur" DiskId="1" Name="cursor_cp_pick.cur" /> + <File Id="ID_a3ecddbe_af7b_43a9_b9c8_46be504d910a" Source=".\FILES\xrc\data\druid.control.128.png" DiskId="1" Name="druid.control.128.png" /> + <File Id="ID_615261e3_f89a_40d2_b6bb_ad18a1f12867" Source=".\FILES\xrc\data\druid.images.128.png" DiskId="1" Name="druid.images.128.png" /> + <File Id="ID_4f982f61_40da_48b1_9df9_2b4b4387f416" Source=".\FILES\xrc\data\druid.lenses.128.png" DiskId="1" Name="druid.lenses.128.png" /> + <File Id="ID_7746fff0_9314_40b4_a108_470bf313f4c0" Source=".\FILES\xrc\data\druid.optimize.128.png" DiskId="1" Name="druid.optimize.128.png" /> + <File Id="ID_9ffafaac_4dd8_4134_b1ea_7535e0f0450d" Source=".\FILES\xrc\data\druid.stitch.128.png" DiskId="1" Name="druid.stitch.128.png" /> + <File Id="ID_4c31bcdd_2368_45e8_854a_1b216566e274" Source=".\FILES\xrc\data\editcopy.png" DiskId="1" Name="editcopy.png" /> + <File Id="ID_9c0eaeb7_2b1d_4e47_9cac_e11127b5f324" Source=".\FILES\xrc\data\editcut.png" DiskId="1" Name="editcut.png" /> + <File Id="ID_679aa534_1659_41c6_98b9_ef4b6a7a3545" Source=".\FILES\xrc\data\editdelete.png" DiskId="1" Name="editdelete.png" /> + <File Id="ID_1e08705a_246b_4c1c_83e1_0b1ed1720761" Source=".\FILES\xrc\data\editpaste.png" DiskId="1" Name="editpaste.png" /> + <File Id="ID_071c64d9_af5d_4fa6_b0ac_ce8b5dbe2aad" Source=".\FILES\xrc\data\edit_add.png" DiskId="1" Name="edit_add.png" /> + <File Id="ID_15e898a4_740f_4446_a4cf_43c48792fd0c" Source=".\FILES\xrc\data\filenew.png" DiskId="1" Name="filenew.png" /> + <File Id="ID_af850be5_1840_4a2f_876f_46363c5f405c" Source=".\FILES\xrc\data\fileopen.png" DiskId="1" Name="fileopen.png" /> + <File Id="ID_e7d7d475_2e0c_4a7e_a243_59ab97eda14b" Source=".\FILES\xrc\data\filesave.png" DiskId="1" Name="filesave.png" /> + <File Id="ID_48c00030_cdaf_48c8_b0d7_4c9400ff7514" Source=".\FILES\xrc\data\filesaveas.png" DiskId="1" Name="filesaveas.png" /> + <File Id="ID_bc887b3c_e1d3_46d4_9501_86366c77c603" Source=".\FILES\xrc\data\find.png" DiskId="1" Name="find.png" /> + <File Id="ID_5b7e4a8b_003c_48c1_8bb9_105abd032d05" Source=".\FILES\xrc\data\fit_pano.xpm" DiskId="1" Name="fit_pano.xpm" /> + <File Id="ID_87f942fb_9111_4da2_a6da_93e4b9b39619" Source=".\FILES\xrc\data\icon.ico" DiskId="1" Name="icon.ico" /> + <File Id="ID_588718cd_a21e_49fd_9841_ce515033ece1" Source=".\FILES\xrc\data\icon.png" DiskId="1" Name="icon.png" /> + <File Id="ID_fe34e9e9_bdcb_4651_9a85_c46a91aacef6" Source=".\FILES\xrc\data\icon_128x128.ico" DiskId="1" Name="icon_128x128.ico" /> + <File Id="ID_0db9e55d_c303_4e50_aae0_743f1bbf2c97" Source=".\FILES\xrc\data\icon_128x128.png" DiskId="1" Name="icon_128x128.png" /> + <File Id="ID_8e16d376_741d_442d_a56b_3211f75175f8" Source=".\FILES\xrc\data\icon_16x16.ico" DiskId="1" Name="icon_16x16.ico" /> + <File Id="ID_5610d4b7_f937_45f6_b41e_16e375a2bd6a" Source=".\FILES\xrc\data\icon_32x32.ico" DiskId="1" Name="icon_32x32.ico" /> + <File Id="ID_0945c987_b34e_4c6b_91fa_ed8d1cc51fd1" Source=".\FILES\xrc\data\icon_48x48.ico" DiskId="1" Name="icon_48x48.ico" /> + <File Id="ID_184744c7_8e10_4e88_8a45_272a468680f8" Source=".\FILES\xrc\data\icon_48x48.png" DiskId="1" Name="icon_48x48.png" /> + <File Id="ID_53b209f7_4e27_4e43_be9c_b3c1428481a2" Source=".\FILES\xrc\data\icon_64x64.ico" DiskId="1" Name="icon_64x64.ico" /> + <File Id="ID_bd883ed4_0682_4393_8c2b_2ec211f2103d" Source=".\FILES\xrc\data\icon_72x72.ico" DiskId="1" Name="icon_72x72.ico" /> + <File Id="ID_87435974_04b5_4e66_8f77_a4f1c332235b" Source=".\FILES\xrc\data\icon_96x96.ico" DiskId="1" Name="icon_96x96.ico" /> + <File Id="ID_7e83ea91_f44c_48a1_b6a4_f52f99b30fc7" Source=".\FILES\xrc\data\info.xpm" DiskId="1" Name="info.xpm" /> + <File Id="ID_28fc460d_19c5_410e_94c7_4c13fd3759ca" Source=".\FILES\xrc\data\keyboard_pl.html" DiskId="1" Name="keyboard_pl.html" /> + <File Id="ID_4569cbf6_23ba_41e0_93cb_3e41a10d6016" Source=".\FILES\xrc\data\list.png" DiskId="1" Name="list.png" /> + <File Id="ID_b489ea32_f370_45fe_8d37_7e963d04385f" Source=".\FILES\xrc\data\logo.png" DiskId="1" Name="logo.png" /> + <File Id="ID_1a21c8ee_615d_436e_9ca9_eeb0b32f7923" Source=".\FILES\xrc\data\Makefile.am" DiskId="1" Name="Makefile.am" /> + <File Id="ID_33fe05fe_cb10_40a1_9615_28ed3acc978f" Source=".\FILES\xrc\data\Makefile.in" DiskId="1" Name="Makefile.in" /> + <File Id="ID_aa16adc7_d396_42e5_b9cf_39a991614c43" Source=".\FILES\xrc\data\make_nona_enblend" DiskId="1" Name="make_nona_enblend" /> + <File Id="ID_03f74c2f_edb8_4f10_bc88_98f5560d5f32" Source=".\FILES\xrc\data\manual.html" DiskId="1" Name="manual.html" /> + <File Id="ID_481c6dc8_39f9_4d89_8c79_505249610883" Source=".\FILES\xrc\data\nona_enblend.mk" DiskId="1" Name="nona_enblend.mk" /> + <File Id="ID_d5feb23d_9560_4f8b_b3d2_97a1b63e7404" Source=".\FILES\xrc\data\nona_multilayer.mk" DiskId="1" Name="nona_multilayer.mk" /> + <File Id="ID_30a06161_db77_4b29_9018_c5e91c671723" Source=".\FILES\xrc\data\nona_smartblend.mk" DiskId="1" Name="nona_smartblend.mk" /> + <File Id="ID_beca6b03_95a0_48a4_91a8_6848cc3c2988" Source=".\FILES\xrc\data\optimize.png" DiskId="1" Name="optimize.png" /> + <File Id="ID_a913bfee_95a0_44ab_a757_b1f580297691" Source=".\FILES\xrc\data\optimize.xpm" DiskId="1" Name="optimize.xpm" /> + <File Id="ID_46338b8d_1f91_4f00_8760_d74e9e0250c2" Source=".\FILES\xrc\data\preview.png" DiskId="1" Name="preview.png" /> + <File Id="ID_f6d77cb2_155d_45d8_a97b_bd5850643a64" Source=".\FILES\xrc\data\preview_auto_update.png" DiskId="1" Name="preview_auto_update.png" /> + <File Id="ID_78d84bc2_9482_4cb9_b223_b8b9aa82f871" Source=".\FILES\xrc\data\preview_num_transform.png" DiskId="1" Name="preview_num_transform.png" /> + <File Id="ID_b48c75f9_4f65_4ea1_8710_f85f18ce9cd9" Source=".\FILES\xrc\data\preview_show_all.png" DiskId="1" Name="preview_show_all.png" /> + <File Id="ID_762cc2b4_a52a_4d02_aff5_c73d8f706caa" Source=".\FILES\xrc\data\preview_show_none.png" DiskId="1" Name="preview_show_none.png" /> + <File Id="ID_496d4e07_e283_4bea_86ed_c23ee426a324" Source=".\FILES\xrc\data\print.xpm" DiskId="1" Name="print.xpm" /> + <File Id="ID_76841cc7_3912_4246_8d3a_c18a11e5a6b4" Source=".\FILES\xrc\data\ptmender_enblend.mk" DiskId="1" Name="ptmender_enblend.mk" /> + <File Id="ID_fb3a22d2_d8ab_4c94_bc6a_53d89ef67d95" Source=".\FILES\xrc\data\ptmender_smartblend.mk" DiskId="1" Name="ptmender_smartblend.mk" /> + <File Id="ID_8cff1d50_50af_4e72_8e73_f2371e4d8688" Source=".\FILES\xrc\data\redo.png" DiskId="1" Name="redo.png" /> + <File Id="ID_51ff06dc_bccd_4461_a866_0935b9c1917f" Source=".\FILES\xrc\data\reload.png" DiskId="1" Name="reload.png" /> + <File Id="ID_c1cb3889_036c_4d06_abea_87dafb27f260" Source=".\FILES\xrc\data\searchfind.xpm" DiskId="1" Name="searchfind.xpm" /> + <File Id="ID_367af856_d4a6_41c8_99f6_efbb672043f7" Source=".\FILES\xrc\data\splash.png" DiskId="1" Name="splash.png" /> + <File Id="ID_d51d9202_e8d1_4fe9_ba0c_8f38ea38c545" Source=".\FILES\xrc\data\straighten_pano.xpm" DiskId="1" Name="straighten_pano.xpm" /> + <File Id="ID_644496f5_4cf8_4118_8905_a055a4089946" Source=".\FILES\xrc\data\tips.txt" DiskId="1" Name="tips.txt" /> + <File Id="ID_6097fb98_6a64_4e7c_8678_d8b4f223b394" Source=".\FILES\xrc\data\undo.png" DiskId="1" Name="undo.png" /> + <File Id="ID_f1b6539e_1d99_4b18_8f3c_9ec749db4697" Source=".\FILES\xrc\data\zoomin.xpm" DiskId="1" Name="zoomin.xpm" /> + <File Id="ID_e5c7f708_dd92_4416_914f_6c4dba1e76f1" Source=".\FILES\xrc\data\zoomout.xpm" DiskId="1" Name="zoomout.xpm" /> + </Component> + <Directory Id="Id_020a224bff8a66551c390c0d683494a3" Name="CVS"> + <Component Id="IDA898E74E39C8501154C5818DE17D06EF" Guid="ae1074f9-b177-4eea-bef1-e491893199f9"> + <File Id="ID_1f1325ec_9dd0_415b_aca6_89233ce2f646" Source=".\FILES\xrc\data\CVS\Entries" DiskId="1" Name="Entries" /> + <File Id="ID_9e45c0ad_0db0_4b35_baeb_b8ac3c0eca1d" Source=".\FILES\xrc\data\CVS\Repository" DiskId="1" Name="Repository" /> + <File Id="ID_0777fda9_92c7_4e89_8005_1284233491e9" Source=".\FILES\xrc\data\CVS\Root" DiskId="1" Name="Root" /> + </Component> + </Directory> + <Directory Id="Id_cb5ccd531085a4d0b14002fcb17e6b1c" Name="help_common"> + <Component Id="IDABED54CC48A38D1062FE78C94E755D7A" Guid="84fb95d9-4fc8-4340-84fc-9871ef7b436f"> + <File Id="ID_ba96c5d9_d410_48f9_ac33_bfbd2158ea47" Source=".\FILES\xrc\data\help_common\horiz-guide.jpg" DiskId="1" Name="horiz-guide.jpg" /> + <File Id="ID_04f17eb1_0b38_45f4_85ca_cd75766ddf44" Source=".\FILES\xrc\data\help_common\hugin.png" DiskId="1" Name="hugin.png" /> + <File Id="ID_fc79a011_9e4d_4309_8a86_0dff652a4672" Source=".\FILES\xrc\data\help_common\Makefile.am" DiskId="1" Name="Makefile.am" /> + <File Id="ID_b331f110_a5af_4ff1_8509_15f4a1cefbee" Source=".\FILES\xrc\data\help_common\Makefile.in" DiskId="1" Name="Makefile.in" /> + <File Id="ID_12d07cb7_4171_481b_aea9_52fbd8a0ed5c" Source=".\FILES\xrc\data\help_common\problem-circle.jpg" DiskId="1" Name="problem-circle.jpg" /> + </Component> + <Directory Id="Id_c1569b9a76c0ed45e00e4406471e6981" Name="CVS"> + <Component Id="ID62E06452130AA8BA76911CC88502327F" Guid="1baf9549-fb74-4ab3-b342-d4a155a3673d"> + <File Id="ID_0bac8b10_243b_4273_8436_c2e864100a6d" Source=".\FILES\xrc\data\help_common\CVS\Entries" DiskId="1" Name="Entries" /> + <File Id="ID_abe341bd_92be_40a0_970f_7688a54a773d" Source=".\FILES\xrc\data\help_common\CVS\Repository" DiskId="1" Name="Repository" /> + <File Id="ID_cbb11b33_4046_4606_8c3f_31b526d82756" Source=".\FILES\xrc\data\help_common\CVS\Root" DiskId="1" Name="Root" /> + </Component> + </Directory> + </Directory> + <Directory Id="Id_ec8a3f09755e044f9276953e3fad7b33" Name="help_en_EN"> + <Component Id="IDA228423C959DCE3A1B7030510C39769F" Guid="58771d5d-c2ff-417b-8efd-a1b1daba5688"> + <File Id="ID_1e60db5c_bbfe_46cd_8a64_166e34803e5b" Source=".\FILES\xrc\data\help_en_EN\contents.html" DiskId="1" Name="contents.html" /> + <File Id="ID_9386c04a_6747_4517_8c1c_52ade9ad4683" Source=".\FILES\xrc\data\help_en_EN\FAQ.html" DiskId="1" Name="FAQ.html" /> + <File Id="ID_5f9e6860_b261_4c43_b9b4_8d01e1d9824c" Source=".\FILES\xrc\data\help_en_EN\hugin.hhc" DiskId="1" Name="hugin.hhc" /> + <File Id="ID_f4871748_3329_48a1_a23c_83257ad80bec" Source=".\FILES\xrc\data\help_en_EN\hugin.hhk" DiskId="1" Name="hugin.hhk" /> + <File Id="ID_6433b2ed_b96f_4c85_ae18_5d2626297906" Source=".\FILES\xrc\data\help_en_EN\hugin.hhp" DiskId="1" Name="hugin.hhp" /> + <File Id="ID_dd922e71_d020_41a9_b7aa_42ccf21d656f" Source=".\FILES\xrc\data\help_en_EN\keyboard.html" DiskId="1" Name="keyboard.html" /> + <File Id="ID_f54678fe_4b5e_45ff_996e_b6aa940f2ab1" Source=".\FILES\xrc\data\help_en_EN\license.html" DiskId="1" Name="license.html" /> + <File Id="ID_654306f7_1d61_48a6_9887_a82d98b4a3a9" Source=".\FILES\xrc\data\help_en_EN\Makefile.am" DiskId="1" Name="Makefile.am" /> + <File Id="ID_ea4858f3_3095_4fbd_aa77_d8f9dce25d36" Source=".\FILES\xrc\data\help_en_EN\Makefile.in" DiskId="1" Name="Makefile.in" /> + <File Id="ID_68632c18_175b_4788_a560_85d3d98e9733" Source=".\FILES\xrc\data\help_en_EN\manual.html" DiskId="1" Name="manual.html" /> + </Component> + <Directory Id="Id_fa1ab27e8a9bb117074c6e27417eb83a" Name="CVS"> + <Component Id="IDE75FB1FFCA3875A2B94E867F578E3A2C" Guid="f0a5db24-3de7-45dd-8cbb-ddfebf20d091"> + <File Id="ID_1752e702_c476_40db_ad25_ac5483eac181" Source=".\FILES\xrc\data\help_en_EN\CVS\Entries" DiskId="1" Name="Entries" /> + <File Id="ID_8e369a1a_70f0_43f3_9e21_b740292dbadf" Source=".\FILES\xrc\data\help_en_EN\CVS\Repository" DiskId="1" Name="Repository" /> + <File Id="ID_fcc79b9e_e705_4ad1_af71_2468b269ae84" Source=".\FILES\xrc\data\help_en_EN\CVS\Root" DiskId="1" Name="Root" /> + </Component> + </Directory> + </Directory> + <Directory Id="Id_ed194c6c0822296fab815f4eb5130533" Name="help_fr_FR"> + <Component Id="ID5D4519B6E2691A3D8C693B0B1C70EFF7" Guid="29cfb986-9591-4a04-8e4f-e3cb6138f60b"> + <File Id="ID_e284339f_3a8a_47eb_bdbc_e0efd05b65cf" Source=".\FILES\xrc\data\help_fr_FR\contents.html" DiskId="1" Name="contents.html" /> + <File Id="ID_567f1481_be33_461b_9165_095c15776208" Source=".\FILES\xrc\data\help_fr_FR\FAQ.html" DiskId="1" Name="FAQ.html" /> + <File Id="ID_1062f6d6_0767_40b3_9b22_1a3cf354133e" Source=".\FILES\xrc\data\help_fr_FR\hugin.hhc" DiskId="1" Name="hugin.hhc" /> + <File Id="ID_f44cd4d5_9fa7_474e_a22a_29778a453b36" Source=".\FILES\xrc\data\help_fr_FR\hugin.hhk" DiskId="1" Name="hugin.hhk" /> + <File Id="ID_9bbb7293_e99e_4c4e_a5fd_d145feb453fb" Source=".\FILES\xrc\data\help_fr_FR\hugin.hhp" DiskId="1" Name="hugin.hhp" /> + <File Id="ID_dc0ad5a4_ef24_4861_801f_192ad7313d4b" Source=".\FILES\xrc\data\help_fr_FR\keyboard.html" DiskId="1" Name="keyboard.html" /> + <File Id="ID_c2e7cc76_62ee_4d96_80c8_58fbf1499f5e" Source=".\FILES\xrc\data\help_fr_FR\license.html" DiskId="1" Name="license.html" /> + <File Id="ID_0b210272_bae5_4282_a435_4fd737c53235" Source=".\FILES\xrc\data\help_fr_FR\Makefile.am" DiskId="1" Name="Makefile.am" /> + <File Id="ID_32ec2b7f_6318_445a_8eda_8c70de8706e2" Source=".\FILES\xrc\data\help_fr_FR\Makefile.in" DiskId="1" Name="Makefile.in" /> + <File Id="ID_f8feeb7f_07f3_479d_9bb0_b72616653e44" Source=".\FILES\xrc\data\help_fr_FR\manual.html" DiskId="1" Name="manual.html" /> + </Component> + <Directory Id="Id_f1c60d83a4c5bb65924b6e3d36d108ab" Name="CVS"> + <Component Id="IDF74511BE9C761CD34671DF72B8F6B0CC" Guid="23942f2a-6ff2-4565-8bce-cb5f839771d7"> + <File Id="ID_a900681a_bbd4_472f_9249_a6c96cc10880" Source=".\FILES\xrc\data\help_fr_FR\CVS\Entries" DiskId="1" Name="Entries" /> + <File Id="ID_05d39615_c295_43ad_8762_eb94aa31da67" Source=".\FILES\xrc\data\help_fr_FR\CVS\Repository" DiskId="1" Name="Repository" /> + <File Id="ID_4cf544cd_dab5_47c7_b919_6f7c2dc9053c" Source=".\FILES\xrc\data\help_fr_FR\CVS\Root" DiskId="1" Name="Root" /> + </Component> + </Directory> + </Directory> + </Directory> + </Directory> + <Directory Id="IDE93D33B9F52D73756F3497BAB16A316C" Name="doc"> + <Component Id="ID14A9C0C3AC237DC7EB5E872935DE6516" Guid="43df516f-f727-4dd2-af89-babf99d6da1e"> + <File Id="ID_fec068cc_cedd_46de_a8fe_b2f590567b26" Source=".\FILES\doc\fulla.html" DiskId="1" Name="fulla.html" /> + <File Id="ID_1d78b7d7_e1c1_484d_9f05_6be32a1cd89e" Source=".\FILES\doc\nona.txt" DiskId="1" Name="nona.txt" /> + </Component> + </Directory> + <Component Id="IDBF4899A74E15532C8301A5EA0BB1C71A" Guid="1411189e-d988-42b1-a303-817c19a2f49c"> + <File Id="ID_58fe01e0_611f_4fd6_a5c1_16e42e8d159e" Source=".\FILES\AUTHORS.txt" DiskId="1" Name="AUTHORS.txt" /> + </Component> + <Component Id="ID6E398BC7A76B2B4498B3661E5BE17A58" Guid="64ec7935-952d-4af2-80e8-d9d4c388e022"> + <File Id="ID_dcb7b614_6df6_4a42_832d_8e406aa75158" Source=".\FILES\autooptimiser.exe" DiskId="1" Name="autooptimiser.exe" /> + </Component> + <Component Id="IDB1654923AA84D4832AC7AE5825B0F9F9" Guid="066d8d90-4689-4874-9528-4f029f809d86"> + <File Id="ID_92c71837_6947_4f89_896c_ac35dd5902f6" Source=".\FILES\ChangeLog" DiskId="1" Name="ChangeLog" /> + </Component> + <Component Id="ID210012EBDB2835A34420C2821FE200E4" Guid="aa2f47e8-89f5-41f2-a224-d1a416a18bf5"> + <File Id="ID_15dfa904_a1fc_45e7_811a_7f229991d6ad" Source=".\FILES\fulla.exe" DiskId="1" Name="fulla.exe" /> + </Component> + <Component Id="ID7C319EF3F0A196B70A3B77E64843B8D9" Guid="37bd6cb8-766e-4030-a8df-0682eb6bfec1"> + <File Id="HUGINEXECUTABLE" Source=".\FILES\hugin.exe" DiskId="1" Name="hugin.exe"> + <Shortcut Id="pf_shortcut_HUGINEXECUTABLE" Directory="ProgramMenuDir" Name="hugin" Description="GUI for panorama tools suite
 and some included programs" /> + <Shortcut Id="dt_shortcut_HUGINEXECUTABLE" Directory="DesktopFolder" Name="hugin" Description="GUI for panorama tools suite
 and some included programs" /> + </File> + </Component> + <Component Id="ID5B5ACB9A77C30DBB991101CC4A1E302A" Guid="edb7c923-c6db-4ab5-9630-e82bacfca62b"> + <File Id="ID_6e37eba2_e8a0_4c04_acd3_db335b6ac198" Source=".\FILES\hugin.nsi" DiskId="1" Name="hugin.nsi" /> + </Component> + <Component Id="IDFF36E688A16C91889B2F8F6C1C514E42" Guid="4bd5af7f-f44e-4827-aecf-8fc2cc588e41"> + <File Id="ID_688dbc52_2768_4e3e_8d4e_6123648056e7" Source=".\FILES\LICENCE.txt" DiskId="1" Name="LICENCE.txt" /> + </Component> + <Component Id="IDE08D724ADA7E41B330C3A109909E15C6" Guid="93f5a10f-6cb6-44ba-8ccc-1e2c15edad40"> + <File Id="ID_26253371_0299_4ae5_917c_a4abd5817a6b" Source=".\FILES\LICENCE_JHEAD.txt" DiskId="1" Name="LICENCE_JHEAD.txt" /> + </Component> + <Component Id="IDF59A88A5FA3B91DA7DDC061EED41CC12" Guid="4f2f48d9-1733-49ef-af5c-f8e17b094b6e"> + <File Id="ID_dfd60d20_e27c_4627_b939_8eed99e8e268" Source=".\FILES\LICENCE_VIGRA.txt" DiskId="1" Name="LICENCE_VIGRA.txt" /> + </Component> + <Component Id="IDAC295338BB774B2290C96FFEC57B5292" Guid="5b969a15-7519-4799-b7e3-19b3d9dfed22"> + <File Id="ID_22b5689d_ebec_45e2_9405_7e806f91fb73" Source=".\FILES\NEWS.txt" DiskId="1" Name="NEWS.txt" /> + </Component> + <Component Id="IDF99BC5877C66564FD6DAFE3C86605C1E" Guid="75fe917f-2009-4e2e-9044-0a8b3340bb07"> + <File Id="ID_e8859b25_289c_4e4b_b141_b7a0465d4219" Source=".\FILES\nona.exe" DiskId="1" Name="nona.exe" /> + </Component> + <Component Id="ID0D55843DE31BC853CCC73E35D291C762" Guid="5fcde545-d399-40c0-8b0f-2b7513687d9c"> + <File Id="ID_dca96fb2_bfb6_4484_93ea_cbdc24a7525b" Source=".\FILES\nona_gui.exe" DiskId="1" Name="nona_gui.exe"> + <Shortcut Id="pf_shortcut_ID_dca96fb2_bfb6_4484_93ea_cbdc24a7525b" Directory="ProgramMenuDir" Name="nona_gui" Description="GUI with graphical progress bar for nona stitcher" /> + </File> + </Component> + <Component Id="ID3AF4EE1681A705331737A9BFC33CC26D" Guid="431d2e78-d281-4971-a061-0b84446368f6"> + <File Id="ID_480913d2_a3a3_4e67_aed2_8427dd035e66" Source=".\FILES\panoglview.exe" DiskId="1" Name="panoglview.exe"> + <Shortcut Id="pf_shortcut_ID_480913d2_a3a3_4e67_aed2_8427dd035e66" Directory="ProgramMenuDir" Name="panoglview" Description="Fast OpenGL accelerated viewer for spherical
 panoramas" /> + </File> + </Component> + <Component Id="ID81E35471807FAFB882ADB516814D587E" Guid="0ec88767-81ba-4b19-b237-0bb9a3f42007"> + <File Id="ID_adfccecf_f176_4002_985f_5ce1f2f455c1" Source=".\FILES\README_WINDOWS.txt" DiskId="1" Name="README_WINDOWS.txt"> + <Shortcut Id="pf_shortcut_ID_adfccecf_f176_4002_985f_5ce1f2f455c1" Directory="ProgramMenuDir" Name="README" /> + </File> + </Component> + <Directory Id="ENBLENDDIRECTORY" Name="enblend"> + <Component Id="IDA80937CA57C88D22A85D80AD10AB65EC" Guid="6398b757-4e66-48d1-b482-0ce41112d749"> + <File Id="ID_3781d07e_47ae_40e0_b806_4a2226c9ccc5" Source=".\FILES\enblend\AUTHORS" DiskId="1" Name="AUTHORS" /> + <File Id="ID_e10e7293_9e10_4bbb_914a_34225fa6820e" Source=".\FILES\enblend\ChangeLog" DiskId="1" Name="ChangeLog" /> + <File Id="ID_a9633e86_be8c_4ca4_bfd5_a7cbda55755f" Source=".\FILES\enblend\COPYING" DiskId="1" Name="COPYING" /> + <File Id="ID_c8e0e6d3_45fa_4399_9bd9_49fee5561add" Source=".\FILES\enblend\enblend.exe" DiskId="1" Name="enblend.exe" /> + <File Id="ID_cb7d3b52_d5e4_40ff_aede_bf9ce3741e53" Source=".\FILES\enblend\INSTALL" DiskId="1" Name="INSTALL" /> + <File Id="ID_df6d231d_4280_44a1_892e_ae7ea7cbf2a0" Source=".\FILES\enblend\NEWS" DiskId="1" Name="NEWS" /> + <File Id="ID_b214a003_0e57_4801_93a0_9b1aa05994de" Source=".\FILES\enblend\README" DiskId="1" Name="README" /> + <File Id="ID_a9279059_18cf_4cd4_b320_4c465a15b41a" Source=".\FILES\enblend\READMEWIN" DiskId="1" Name="READMEWIN" /> + <File Id="ID_df4f3092_8942_4735_9ada_9ee3cd36f0f8" Source=".\FILES\enblend\TODO" DiskId="1" Name="TODO" /> + <File Id="ID_9f5433ab_4cca_438d_835b_01102e030137" Source=".\FILES\enblend\VIGRA_LICENSE" DiskId="1" Name="VIGRA_LICENSE" /> + </Component> + </Directory> + </Directory> + </Directory> + </Directory> + </Directory> + <Property Id="ApplicationFolderName" Value="hugin" /> + <Property Id="WixAppFolder" Value="WixPerUserFolder" /> + <WixVariable Id="WixUILicenseRtf" Value="GNU General Public License (GPL) 2.0.rtf" /> + <WixVariable Id="WixUIBannerBmp" Value="top_banner.bmp" /> + <WixVariable Id="WixUIDialogBmp" Value="big_banner.bmp" /> + <Feature Id="HUGINFEATURE" Title="hugin" Level="1" Description="The complete hugin package, including panorama tools suite and nona" InstallDefault="local" ConfigurableDirectory="APPLICATIONFOLDER"> + <ComponentRef Id="IDBF4899A74E15532C8301A5EA0BB1C71A" /> + <ComponentRef Id="ID6E398BC7A76B2B4498B3661E5BE17A58" /> + <ComponentRef Id="IDB1654923AA84D4832AC7AE5825B0F9F9" /> + <ComponentRef Id="ID210012EBDB2835A34420C2821FE200E4" /> + <ComponentRef Id="ID7C319EF3F0A196B70A3B77E64843B8D9" /> + <ComponentRef Id="ID5B5ACB9A77C30DBB991101CC4A1E302A" /> + <ComponentRef Id="IDFF36E688A16C91889B2F8F6C1C514E42" /> + <ComponentRef Id="IDE08D724ADA7E41B330C3A109909E15C6" /> + <ComponentRef Id="IDF59A88A5FA3B91DA7DDC061EED41CC12" /> + <ComponentRef Id="IDAC295338BB774B2290C96FFEC57B5292" /> + <ComponentRef Id="IDF99BC5877C66564FD6DAFE3C86605C1E" /> + <ComponentRef Id="ID0D55843DE31BC853CCC73E35D291C762" /> + <ComponentRef Id="ID3AF4EE1681A705331737A9BFC33CC26D" /> + <ComponentRef Id="ID81E35471807FAFB882ADB516814D587E" /> + <ComponentRef Id="IDD6E5ABF4290BB328D2A2ADDB55E0B63B" /> + <ComponentRef Id="ID1D3284CBA87E016FEBF293F11B31651E" /> + <ComponentRef Id="IDA1AB1FEE2027D7C9F4BD8222CFDF5E03" /> + <ComponentRef Id="ID9CFCF83C8DD9CE7803DD9B176C0AAC36" /> + <ComponentRef Id="ID33B8B18041CF82999F9EFECC94E8E963" /> + <ComponentRef Id="ID62830780CD0A610FE8259E7E0597A052" /> + <ComponentRef Id="ID4188AEA0E412E1320793AAFBADCEB0BE" /> + <ComponentRef Id="ID53F78FBB8CFFA7B048018F9F55F6635F" /> + <ComponentRef Id="ID1A0C36AB581D323E52FCE282647CCE14" /> + <ComponentRef Id="ID8EC376875182C85E4EC52F801D65005D" /> + <ComponentRef Id="ID2B0D5BC77597B31A4BBED86DEE6A42BD" /> + <ComponentRef Id="IDE894E68ACC56AD249C0D360D14313875" /> + <ComponentRef Id="IDE050B906EDFF78DFFAB66D2C11189235" /> + <ComponentRef Id="IDBFDC522288FB04ED826B1141E7E9CE11" /> + <ComponentRef Id="ID1B0CF79A32BE6024EB0D7AD076845F76" /> + <ComponentRef Id="IDEA29996259B0384D67347AA27773F804" /> + <ComponentRef Id="IDB5182EAAD9FD3A249A1C1D8857C9E571" /> + <ComponentRef Id="IDAABC868093A59A01E020D0B79AB81D2A" /> + <ComponentRef Id="ID1E91214A72F6B89FDC49CEC7BBE7D5C2" /> + <ComponentRef Id="IDA898E74E39C8501154C5818DE17D06EF" /> + <ComponentRef Id="IDABED54CC48A38D1062FE78C94E755D7A" /> + <ComponentRef Id="ID62E06452130AA8BA76911CC88502327F" /> + <ComponentRef Id="IDA228423C959DCE3A1B7030510C39769F" /> + <ComponentRef Id="IDE75FB1FFCA3875A2B94E867F578E3A2C" /> + <ComponentRef Id="ID5D4519B6E2691A3D8C693B0B1C70EFF7" /> + <ComponentRef Id="IDF74511BE9C761CD34671DF72B8F6B0CC" /> + <ComponentRef Id="ID14A9C0C3AC237DC7EB5E872935DE6516" /> + <Feature Id="ENBLENDFEATURE" Title="Enblend" Level="1" Description="Image blending with multiresolution splines" InstallDefault="local"> + <ComponentRef Id="IDA80937CA57C88D22A85D80AD10AB65EC" /> + </Feature> + </Feature> + <UIRef Id="WixUI_FeatureTree" /> + <UIRef Id="WixUI_ErrorProgressText" /> + <Property Id="ALLUSERS" Value="1" /> + <Property Id="WarSetup_VERSION" Value="3.5.0.0" /> + <CustomAction Id="ID0DD6E44812D4F209C3C117DD9C05EFB0" Property="ARPHELPLINK" Value="http://hugin.sourceforge.net/tutorials/" /> + <CustomAction Id="IDD1A23139DB883EF601C5B63D4D595111" Property="ARPURLUPDATEINFO" Value="http://hugin.sourceforge.net/download/" /> + <CustomAction Id="ID577987D84F2AE3127896E2588BC01133" Property="ARPCOMMENTS" Value="Panorama photo stitcher" /> + <CustomAction Id="ID2C30D080F4CE9201201C001BE6C1F9D1" Property="ARPPRODUCTICON" Value="[APPLICATIONFOLDER]xrc\data\icon.ico" /> + <CustomAction Id="IDA454B7938D11A4C1C2D9967CF8CCE181" Property="ARPREADME" Value="[APPLICATIONFOLDER]README_WINDOWS.txt" /> + <CustomAction Id="ID9D0262722208511E52B27EB2091A5278" Property="ARPURLINFOABOUT" Value="http://hugin.sourceforge.net/" /> + <FeatureRef Id="EnblendRegistryFeature" /> + <FeatureRef Id="HuginRegistryFeature" /> + </Product> +</Wix> \ No newline at end of file Added: hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup =================================================================== --- hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup (rev 0) +++ hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup 2007-10-28 10:28:52 UTC (rev 2507) @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8"?> +<WarSetup-Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" projectName="hugin" projectUuid="5a8e802a-894f-4b11-988a-bc966ce021c0" projectUpgradeUuid="a8245656-ca56-43a9-a642-f0e3e4da47a0" projectVersion="0.7.0.4" projectOrganization="hugin" projectMustBeAdministratorToInstall="false" project64BitTarget="false" projectTargetDirectory="C:\Documents and Settings\John\Desktop\Hugin Setup" projectTargetName="hugin 0.7 beta 4 Win Setup" projectType="0" projectUserInterface="WixUI_FeatureTree" projectLicense="GNU General Public License (GPL) 2.0"> + <projectFeatures featureId="HUGINFEATURE" featureName="hugin" featureDescription="The complete hugin package, including panorama tools suite and nona" configurableDirectory="APPLICATIONFOLDER" configurableDirectoryDefaultPath="[ProjectName]" enableInDefaultInstall="true" enableInMinimalInstall="true" excludeFromBuild="false"> + <childFeatures featureId="ENBLENDFEATURE" featureName="Enblend" featureDescription="Image blending with multiresolution splines" enableInDefaultInstall="true" enableInMinimalInstall="true" excludeFromBuild="false"> + <defaultInstallMode>3</defaultInstallMode... [truncated message content] |
From: <da...@us...> - 2007-11-11 01:02:14
|
Revision: 2529 http://hugin.svn.sourceforge.net/hugin/?rev=2529&view=rev Author: dangelo Date: 2007-11-10 17:02:09 -0800 (Sat, 10 Nov 2007) Log Message: ----------- Added improved CMake Find scripts by Thomas Sharpless. The *_DEBUG_* variables are however not yet used in the MSVC build, this needs further changes to the CMakeLists.txt files inside the source directories Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindMSGFMT.cmake hugin/trunk/CMakeModules/FindOpenEXR.cmake hugin/trunk/CMakeModules/FindPANO13.cmake Added Paths: ----------- hugin/trunk/CMakeModules/FindJPEG.cmake hugin/trunk/CMakeModules/FindPNG.cmake hugin/trunk/CMakeModules/FindTIFF.cmake hugin/trunk/CMakeModules/FindZLIB.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-11-10 07:24:09 UTC (rev 2528) +++ hugin/trunk/CMakeLists.txt 2007-11-11 01:02:09 UTC (rev 2529) @@ -23,10 +23,34 @@ ENDIF (UNIX) ## +## The directory that contains the hugin source root is a good +## place to look for support packages, so post it in cache. +## +## Our FIND_PACKAGE calls modules will search SOURCE_BASE_DIR +## after the local standard places +## +# extract pathname from CMAKE_SOURCE_DIR (note result must be a local var) +STRING( REGEX REPLACE "(.*)/[^/]+$" "\\1" work "${CMAKE_SOURCE_DIR}" ) +# create the cache entry +SET( SOURCE_BASE_DIR ${work} CACHE FILEPATH "parent dir of hugin source root" ) + +## +## wxWidgets +## +# This must come before FINDs for tiff, jpeg, png, zlib to enable +# finding the wxWidgets distributions of those packages. + +SET(wxWidgets_USE_LIBS base core xrc html xml adv) +FIND_PACKAGE(wxWidgets REQUIRED) +IF(NOT wxWidgets_FOUND) + MESSAGE("wxWidgets was not found, GUI programs (hugin, nona_gui) disabled") +ENDIF(NOT wxWidgets_FOUND) + +## ## Graphics libraries ## +# wxWidgets sub-packages will be used if native ones aren't found - FIND_PACKAGE(TIFF REQUIRED) INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) FIND_PACKAGE(JPEG REQUIRED) @@ -63,19 +87,6 @@ FIND_PACKAGE(Boost REQUIRED) - -## -## wxWidgets -## - -SET(wxWidgets_USE_LIBS base core xrc html xml adv) -FIND_PACKAGE(wxWidgets REQUIRED) -IF(NOT wxWidgets_FOUND) - MESSAGE("wxWidgets was not found, GUI programs (hugin, nona_gui) disabled") -ENDIF(NOT wxWidgets_FOUND) - - - IF (WIN32) # todo: check for vips (not needed right now) ELSE (WIN32) @@ -149,7 +160,6 @@ MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})") ENDIF(MSGFMT_FOUND) - #This namespace workaround is not needed for CMake >= 2.5.x IF (APPLE) ## Add needed Compiler and Linker flags for OSX Added: hugin/trunk/CMakeModules/FindJPEG.cmake =================================================================== --- hugin/trunk/CMakeModules/FindJPEG.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindJPEG.cmake 2007-11-11 01:02:09 UTC (rev 2529) @@ -0,0 +1,39 @@ +# - Find JPEG for Hugin 0.7 01Nov2007 TKSharpless +# Added to support Windows build but should work anywhere. +# After looking in UNIX standard places, tries wxWidgets build +# tree, which should have this package. +# +# Call FIND_PACKAGE(wxWidgets REQUIRED) before calling this! +# +# reads cache variables +# wxWidgets_ROOT_DIR +# wxWidgets_LIB_DIR +# defines cache variables +# JPEG_INCLUDE_DIR, where to find headers +# JPEG_LIBRARIES, list of release link libraries +# JPEG_DEBUG_LIBRARIES, list of debug link libraries +# JPEG_FOUND, If != "YES", do not try to use JPEG + +FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h + /usr/local/include + /usr/include + ${wxWidgets_ROOT_DIR}/src/jpeg +) + +FIND_LIBRARY( JPEG_LIBRARIES + NAMES jpeg wxjpeg + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} +) + +IF(JPEG_INCLUDE_DIR) + IF(JPEG_LIBRARIES) + SET( JPEG_FOUND "YES" ) + FIND_LIBRARY( JPEG_DEBUG_LIBRARIES + NAMES jpegd wxjpegd + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + ) + ENDIF(JPEG_LIBRARIES) +ENDIF(JPEG_INCLUDE_DIR) + + + Modified: hugin/trunk/CMakeModules/FindMSGFMT.cmake =================================================================== --- hugin/trunk/CMakeModules/FindMSGFMT.cmake 2007-11-10 07:24:09 UTC (rev 2528) +++ hugin/trunk/CMakeModules/FindMSGFMT.cmake 2007-11-11 01:02:09 UTC (rev 2529) @@ -1,7 +1,8 @@ -# +# - FindMSGFMT.cmake for Hugin 0.7 # file taken from rosegarden # -# Find the msgfmt program +# Find the gnu gettext msgfmt program and define +# a macro that calls it to add message translations # # Defined variables: # MSGFMT_FOUND @@ -10,13 +11,17 @@ # Macro: # ADD_TRANSLATIONS # +# mod for Windows build 07Nov2007 TKSharpless -- +# look in C:\MinGW after std. Unix places, that's where +# gettext automatically installed itself on my system. +# TODO find where else on Windows, Mac, etc gettext might be IF(MSGFMT_EXECUTABLE) SET(MSGFMT_FOUND TRUE) ELSE(MSGFMT_EXECUTABLE) FIND_PROGRAM(MSGFMT_EXECUTABLE - NAMES msgfmt gmsgfmt - PATHS /bin /usr/bin /usr/local/bin ) + NAMES msgfmt gmsgfmt msgfmt.exe + PATHS /bin /usr/bin /usr/local/bin c:/MinGW/bin) IF(MSGFMT_EXECUTABLE) SET(MSGFMT_FOUND TRUE) ELSE(MSGFMT_EXECUTABLE) Modified: hugin/trunk/CMakeModules/FindOpenEXR.cmake =================================================================== --- hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-11-10 07:24:09 UTC (rev 2528) +++ hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-11-11 01:02:09 UTC (rev 2529) @@ -70,9 +70,11 @@ if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) if (OPENEXR_ILMTHREAD_LIBRARY) +# set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBARY} CACHE STRING "The libraries needed to use OpenEXR") + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ) + else (OPENEXR_ILMTHREAD_LIBRARY) set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") - else (OPENEXR_ILMTHREAD_LIBRARY) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBARY} CACHE STRING "The libraries needed to use OpenEXR") + MESSAGE(ERROR "Not using OpenEXR thread library") endif (OPENEXR_ILMTHREAD_LIBRARY) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) Modified: hugin/trunk/CMakeModules/FindPANO13.cmake =================================================================== --- hugin/trunk/CMakeModules/FindPANO13.cmake 2007-11-10 07:24:09 UTC (rev 2528) +++ hugin/trunk/CMakeModules/FindPANO13.cmake 2007-11-11 01:02:09 UTC (rev 2529) @@ -1,27 +1,46 @@ -# - Find PANO13 library -# Find the native PANO13 includes and library -# This module defines +# - Find PANO13 headers and libraries +# modified for Hugin 0.7 Windows build 02Nov2007 TKSharpless +# reads cache variable +# SOURCE_BASE_DIR -- directory that contains hugin source root +# defines cache vars # PANO13_INCLUDE_DIR, where to find pano13/panorama.h, etc. -# PANO13_LIBRARIES, libraries to link against to use PANO13. -# PANO13_FOUND, If false, do not try to use PANO13. -# also defined, but not for general use are -# PANO13_LIBRARY, where to find the PANO13 library. +# PANO13_LIBRARIES, release link library list. +# PANO13_DEBUG_LIBRARIES, debug ditto. +# PANO13_FOUND, If != "YES", do not try to use PANO13. +# In Pablo's Windows setup ${SOURCE_BASE_DIR}/libpano contains pano12 +# and pano13. This code also works if pano13 is in ${SOURCE_BASE_DIR} +## NOTE the form "pano13/panorama.h" is used in #includes in some +## Hugin source files, so we are stuck with that for now. FIND_PATH(PANO13_INCLUDE_DIR pano13/panorama.h /usr/local/include /usr/include + ${SOURCE_BASE_DIR}/libpano + ${SOURCE_BASE_DIR} ) -SET(PANO13_NAMES ${PANO13_NAMES} pano13) -FIND_LIBRARY(PANO13_LIBRARY - NAMES ${PANO13_NAMES} - PATHS /usr/lib /usr/local/lib +# Pablo's Windows setup has the link libs in subdirs Debug +# and Release of libpano/pano13, as "Panotools.lib". This +# code will also find them in pano13 or in pano13/lib, and +# with names pano13 or pano13d. +FIND_LIBRARY(PANO13_LIBRARIES + NAMES Panotools pano13 + PATHS /usr/lib /usr/local/lib + ${PANO13_INCLUDE_DIR}/pano13/Release + ${SOURCE_BASE_DIR}/pano13/lib + ${SOURCE_BASE_DIR}/pano13 ) IF(PANO13_INCLUDE_DIR) - IF(PANO13_LIBRARY) + IF(PANO13_LIBRARIES) SET( PANO13_FOUND "YES" ) - SET( PANO13_LIBRARIES ${PANO13_LIBRARY} ) - ENDIF(PANO13_LIBRARY) + FIND_LIBRARY( PANO13_DEBUG_LIBRARIES + NAMES Panotools pano13d pano13 + PATHS /usr/lib /usr/local/lib + ${PANO13_INCLUDE_DIR}/pano13/Debug + ${SOURCE_BASE_DIR}/pano13/lib + ${SOURCE_BASE_DIR}/pano13 + ) + ENDIF(PANO13_LIBRARIES) ENDIF(PANO13_INCLUDE_DIR) Added: hugin/trunk/CMakeModules/FindPNG.cmake =================================================================== --- hugin/trunk/CMakeModules/FindPNG.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindPNG.cmake 2007-11-11 01:02:09 UTC (rev 2529) @@ -0,0 +1,58 @@ +# - Find PNG for Hugin 0.7 01Nov2007 TKSharpless +# Added to support Windows build but should work anywhere. +# After looking in UNIX standard places, tries wxWidgets build +# tree, which should have this package. +# +# Call FIND_PACKAGE(wxWidgets REQUIRED) before calling this! +# +# reads cache variables +# wxWidgets_ROOT_DIR +# wxWidgets_LIB_DIR +# defines cache variables +# PNG_INCLUDE_DIR, where to find headers +# PNG_LIBRARIES, list of release link libraries. +# PNG_DEBUG_LIBRARIES, list of release link libraries. +# PNG_FOUND, If != "YES", do not try to use PNG. +# None of the above will be defined unless ZLIB can be found + +INCLUDE(FindZLIB) + +SET(PNG_FOUND "NO") + +IF (ZLIB_FOUND) + FIND_PATH(PNG_PNG_INCLUDE_DIR png.h + /usr/local/include + /usr/include + ${wxWidgets_ROOT_DIR}/src/png + ) + + FIND_LIBRARY(PNG_LIBRARY + NAMES png libpng wxpng + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + ) + + IF(PNG_PNG_INCLUDE_DIR AND PNG_LIBRARY) + SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) + SET(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY}) + + SET( PNG_FOUND "YES" ) + FIND_LIBRARY( PNG_DEBUG_LIBRARY + NAMES pngd wxpngd + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + ) + SET(PNG_DEBUG_LIBRARIES ${PNG_DEBUGLIBRARY} ${ZLIB_DEBUG_LIBRARY}) + ENDIF(PNG_PNG_INCLUDE_DIR AND PNG_LIBRARY) +ENDIF(ZLIB_FOUND) + +IF (PNG_FOUND) + IF (NOT PNG_FIND_QUIETLY) + MESSAGE(STATUS "Found PNG: ${PNG_LIBRARY}") + ENDIF (NOT PNG_FIND_QUIETLY) +ELSE (PNG_FOUND) + IF (PNG_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find PNG library") + ENDIF (PNG_FIND_REQUIRED) +ENDIF (PNG_FOUND) + +MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY ) + Added: hugin/trunk/CMakeModules/FindTIFF.cmake =================================================================== --- hugin/trunk/CMakeModules/FindTIFF.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindTIFF.cmake 2007-11-11 01:02:09 UTC (rev 2529) @@ -0,0 +1,39 @@ +# - Find TIFF for Hugin 0.7 01Nov2007 TKSharpless +# Added to support Windows build but should work anywhere. +# After looking in UNIX standard places, tries wxWidgets build +# tree, which should have this package. +# +# Call FIND_PACKAGE(wxWidgets REQUIRED) before calling this! +# +# reads cache variables +# wxWidgets_ROOT_DIR +# wxWidgets_LIB_DIR +# defines cache variables +# TIFF_INCLUDE_DIR, where to find headers +# TIFF_LIBRARIES, list of link libraries for release +# TIFF_DEBUG_LIBRARIES ditto for debug +# TIFF_FOUND, If != "YES", do not try to use TIFF. + +FIND_PATH(TIFF_INCLUDE_DIR tiff.h + /usr/local/include + /usr/include + ${wxWidgets_ROOT_DIR}/src/tiff +) + +FIND_LIBRARY( TIFF_LIBRARIES + NAMES tiff wxtiff + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} +) + +IF(TIFF_INCLUDE_DIR) + IF(TIFF_LIBRARIES) + SET( TIFF_FOUND "YES" ) + FIND_LIBRARY( TIFF_DEBUG_LIBRARIES + NAMES tiffd wxtiffd + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + ) + ENDIF(TIFF_LIBRARIES) +ENDIF(TIFF_INCLUDE_DIR) + + + Added: hugin/trunk/CMakeModules/FindZLIB.cmake =================================================================== --- hugin/trunk/CMakeModules/FindZLIB.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindZLIB.cmake 2007-11-11 01:02:09 UTC (rev 2529) @@ -0,0 +1,68 @@ +# - Find zlib +# Find the native ZLIB includes and library +# +# ZLIB_INCLUDE_DIR - where to find zlib.h, etc. +# ZLIB_LIBRARIES - List of libraries when using zlib. +# ZLIB_FOUND - True if zlib found. + +# - Find TIFF for Hugin 0.7 01Nov2007 TKSharpless +# Added to support Windows build but should work anywhere. +# After looking in UNIX standard places, tries wxWidgets build +# tree, which should have this package. +# +# reads cache variables +# wxWidgets_ROOT_DIR +# wxWidgets_LIB_DIR +# + +IF (ZLIB_INCLUDE_DIR) + # Already in cache, be silent + SET(ZLIB_FIND_QUIETLY TRUE) +ENDIF (ZLIB_INCLUDE_DIR) + +FIND_PATH(ZLIB_INCLUDE_DIR zlib.h + /usr/local/include + /usr/include + ${wxWidgets_ROOT_DIR}/src/zlib +) + +SET(ZLIB_NAMES z zlib zdll wxzlib) +FIND_LIBRARY(ZLIB_LIBRARY + NAMES ${ZLIB_NAMES} + PATHS /usr/lib /usr/local/lib + ${wxWidgets_ROOT_DIR}/src/zlib +) + +SET(ZLIB_DEBUG_NAMES zd zlibd zdlld wxzlibd) +FIND_LIBRARY(ZLIB_DEBUG_LIBRARY + NAMES ${ZLIB_DEBUG_NAMES} + PATHS /usr/lib /usr/local/lib +) + +IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) + SET(ZLIB_FOUND TRUE) + SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) + IF (ZLIB_DEBUG_LIBRARY) + SET(ZLIB_DEBUG_LIBRARIES ${ZLIB_DEBUG_LIBRARY}) + ENDIF(ZLIB_DEBUG_LIBRARY) +ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) + SET(ZLIB_FOUND FALSE) + SET( ZLIB_LIBRARIES ) +ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) + +IF (ZLIB_FOUND) + IF (NOT ZLIB_FIND_QUIETLY) + MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}") + ENDIF (NOT ZLIB_FIND_QUIETLY) +ELSE (ZLIB_FOUND) + IF (ZLIB_FIND_REQUIRED) + MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.") + MESSAGE(FATAL_ERROR "Could NOT find z library") + ENDIF (ZLIB_FIND_REQUIRED) +ENDIF (ZLIB_FOUND) + +MARK_AS_ADVANCED( + ZLIB_LIBRARY + ZLIB_DEBUG_LIBRARY + ZLIB_INCLUDE_DIR + ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-11-15 23:27:50
|
Revision: 2536 http://hugin.svn.sourceforge.net/hugin/?rev=2536&view=rev Author: dangelo Date: 2007-11-15 15:27:44 -0800 (Thu, 15 Nov 2007) Log Message: ----------- merged in some CMakeLists changes for easier MSVC build from Tom Sharpless Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindOpenEXR.cmake hugin/trunk/CMakeModules/FindZLIB.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-11-15 22:49:24 UTC (rev 2535) +++ hugin/trunk/CMakeLists.txt 2007-11-15 23:27:44 UTC (rev 2536) @@ -58,10 +58,8 @@ FIND_PACKAGE(PNG REQUIRED) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) -FIND_PACKAGE(OpenEXR) -IF (OPENEXR_FOUND) +FIND_PACKAGE(OpenEXR REQUIRED) include_directories(${OPENEXR_INCLUDE_DIR}) -ENDIF (OPENEXR_FOUND) ## ## Panotools @@ -87,17 +85,19 @@ FIND_PACKAGE(Boost REQUIRED) -IF (WIN32) - # todo: check for vips (not needed right now) -ELSE (WIN32) - pkg_check_modules(VIPS vips-7.12) - LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING) - LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING) - pkg_check_modules(VIPSCC vipsCC-7.12) - LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING) - LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING) -ENDIF (WIN32) +# vips is not used right now +#IF (WIN32) +# # todo: check for vips (not needed right now) +#ELSE (WIN32) +# pkg_check_modules(VIPS vips-7.12) +# LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING) +# LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING) +# +# pkg_check_modules(VIPSCC vipsCC-7.12) +# LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING) +# LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING) +#ENDIF (WIN32) #BUILD SETUP @@ -126,7 +126,7 @@ # SET(CMAKE_C_FLAGS_DEBUG "-g3 -O0 -Wall -DDEBUG" CACHE) #ENDIF(UNIX) -IF (UNIX OR APPLE) +IF (UNIX) # define destination dirs (relative to prefix) SET(HUGINDATADIR share/hugin) SET(DATADIR share) @@ -142,7 +142,7 @@ SET(HUGIN_SHARED_LIBS 1) ENDIF (${HUGIN_SHARED}) MESSAGE("Using shared libraries") -ELSE (UNIX OR APPLE) +ELSE (UNIX) # Windows SET(BINDIR ${CMAKE_INSTALL_PREFIX}) SET(DATADIR ${CMAKE_INSTALL_PREFIX}) @@ -153,8 +153,27 @@ # no shared libs DLL on windows. The code is just # not set up for that.. ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) -ENDIF (UNIX OR APPLE) + IF (MSVC) + # Stop MSVC8 from bitching about the C library + ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) + # compile everything for the static C runtime + STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) + STRING(REPLACE /MD /MT CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + STRING(REPLACE /MD /MT CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + STRING(REPLACE /MD /MT CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + STRING(REPLACE /MD /MT CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + # link only with the static C runtime !! THIS IS A MUST !! + SET( CMAKE_EXE_LINKER_FLAGS + ${CMAKE_EXE_LINKER_FLAGS} /noDefaultLib:MSVCRT /noDefaultLib:MSVCRTd + CACHE STRING "for MSVC" + ) + ENDIF(MSVC) +ENDIF (UNIX) + FIND_PACKAGE(MSGFMT REQUIRED) IF(MSGFMT_FOUND) MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})") @@ -172,6 +191,7 @@ ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) ENDIF (APPLE) + # create config.h file configure_file(src/hugin_config.h.in.cmake ${CMAKE_BINARY_DIR}/src/hugin_config.h) Modified: hugin/trunk/CMakeModules/FindOpenEXR.cmake =================================================================== --- hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-11-15 22:49:24 UTC (rev 2535) +++ hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-11-15 23:27:44 UTC (rev 2536) @@ -28,6 +28,7 @@ ${_OpenEXRIncDir}/OpenEXR/ /usr/include /usr/local/include + ${SOURCE_BASE_DIR}/Deploy/include ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half @@ -35,14 +36,19 @@ ${_OPENEXRLinkDir} /usr/lib /usr/local/lib + ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease + ${SOURCE_BASE_DIR}/Deploy/lib/Release ) - FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex + FIND_LIBRARY(OPENEXR_IEX_LIBRARY + NAMES Iex PATHS ${_OPENEXRLinkDir} /usr/lib /usr/local/lib + ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease + ${SOURCE_BASE_DIR}/Deploy/lib/Release ) FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread @@ -50,6 +56,8 @@ ${_OPENEXRLinkDir} /usr/lib /usr/local/lib + ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease + ${SOURCE_BASE_DIR}/Deploy/lib/Release ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath @@ -57,6 +65,8 @@ ${_OPENEXRLinkDir} /usr/lib /usr/local/lib + ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease + ${SOURCE_BASE_DIR}/Deploy/lib/Release ) @@ -65,6 +75,8 @@ ${_OPENEXRLinkDir} /usr/lib /usr/local/lib + ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease + ${SOURCE_BASE_DIR}/Deploy/lib/Release ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) Modified: hugin/trunk/CMakeModules/FindZLIB.cmake =================================================================== --- hugin/trunk/CMakeModules/FindZLIB.cmake 2007-11-15 22:49:24 UTC (rev 2535) +++ hugin/trunk/CMakeModules/FindZLIB.cmake 2007-11-15 23:27:44 UTC (rev 2536) @@ -29,14 +29,13 @@ SET(ZLIB_NAMES z zlib zdll wxzlib) FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} - PATHS /usr/lib /usr/local/lib - ${wxWidgets_ROOT_DIR}/src/zlib + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} ) SET(ZLIB_DEBUG_NAMES zd zlibd zdlld wxzlibd) FIND_LIBRARY(ZLIB_DEBUG_LIBRARY NAMES ${ZLIB_DEBUG_NAMES} - PATHS /usr/lib /usr/local/lib + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} ) IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-11-17 20:30:59
|
Revision: 2537 http://hugin.svn.sourceforge.net/hugin/?rev=2537&view=rev Author: dangelo Date: 2007-11-17 12:30:58 -0800 (Sat, 17 Nov 2007) Log Message: ----------- Use different FindBoost macro, should detect the boost_thread library with -mt suffix. Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindOpenEXR.cmake hugin/trunk/INSTALL_cmake hugin/trunk/src/CMakeLists.txt Added Paths: ----------- hugin/trunk/CMakeModules/FindBoost.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-11-15 23:27:44 UTC (rev 2536) +++ hugin/trunk/CMakeLists.txt 2007-11-17 20:30:58 UTC (rev 2537) @@ -83,9 +83,13 @@ ## Boost ## -FIND_PACKAGE(Boost REQUIRED) +FIND_PACKAGE(Boost REQUIRED thread) +IF (NOT Boost_thread_FOUND) + MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBoost_LIB_SUFFIX=<suffix>") +ENDIF (NOT Boost_thread_FOUND) + # vips is not used right now #IF (WIN32) # # todo: check for vips (not needed right now) @@ -201,8 +205,8 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} ) LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} ) -INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} ) add_subdirectory(src) Added: hugin/trunk/CMakeModules/FindBoost.cmake =================================================================== --- hugin/trunk/CMakeModules/FindBoost.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindBoost.cmake 2007-11-17 20:30:58 UTC (rev 2537) @@ -0,0 +1,277 @@ +# - Find the Boost includes and libraries. +# The following variables are set if Boost is found. If Boost is not +# found, Boost_FOUND is set to false. +# Boost_FOUND - True when the Boost include directory is found. +# Boost_INCLUDE_DIRS - the path to where the boost include files are. +# Boost_LIBRARY_DIRS - The path to where the boost library files are. +# Boost_LIB_DIAGNOSTIC_DEFINITIONS - Only set if using Windows. +# Boost_<library>_FOUND - True if the Boost <library> is found. +# Boost_<library>_INCLUDE_DIRS - The include path for Boost <library>. +# Boost_<library>_LIBRARIES - The libraries to link to to use Boost <library>. +# Boost_LIBRARIES - The libraries to link to to use all Boost libraries. +# +# The following variables can be set to configure how Boost is found: +# Boost_LIB_PREFIX - Look for Boost libraries prefixed with this, e.g. "lib" +# Boost_LIB_SUFFIX - Look for Boost libraries ending with this, e.g. "vc80-mt" +# Boost_LIB_SUFFIX_DEBUG - As for Boost_LIB_SUFFIX but for debug builds, e.g. "vs80-mt-gd" + +# ---------------------------------------------------------------------------- +# If you have installed Boost in a non-standard location or you have +# just staged the boost files using bjam then you have three +# options. In the following comments, it is assumed that <Your Path> +# points to the root directory of the include directory of Boost. e.g +# If you have put boost in C:\development\Boost then <Your Path> is +# "C:/development/Boost" and in this directory there will be two +# directories called "include" and "lib". +# 1) After CMake runs, set Boost_INCLUDE_DIR to <Your Path>/include/boost<-version> +# 2) Use CMAKE_INCLUDE_PATH to set a path to <Your Path>/include. This will allow FIND_PATH() +# to locate Boost_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g. +# SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "<Your Path>/include") +# 3) Set an environment variable called ${BOOST_ROOT} that points to the root of where you have +# installed Boost, e.g. <Your Path>. It is assumed that there is at least a subdirectory called +# include in this path. +# +# Note: +# 1) If you are just using the boost headers, then you do not need to use +# Boost_LIBRARY_DIRS in your CMakeLists.txt file. +# 2) If Boost has not been installed, then when setting Boost_LIBRARY_DIRS +# the script will look for /lib first and, if this fails, then for /stage/lib. +# +# Usage: +# In your CMakeLists.txt file do something like this: +# ... +# # Boost +# FIND_PACKAGE(Boost) +# ... +# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) +# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +# +# In Windows, we make the assumption that, if the Boost files are installed, the default directory +# will be C:\boost. + +# +# TODO: +# +# 1) Automatically find the Boost library files and eliminate the need +# to use Link Directories. +# + +IF(WIN32) + # In windows, automatic linking is performed, so you do not have to specify the libraries. + # If you are linking to a dynamic runtime, then you can choose to link to either a static or a + # dynamic Boost library, the default is to do a static link. You can alter this for a specific + # library "whatever" by defining BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to + # be linked dynamically. Alternatively you can force all Boost libraries to dynamic link by + # defining BOOST_ALL_DYN_LINK. + + # This feature can be disabled for Boost library "whatever" by defining BOOST_WHATEVER_NO_LIB, + # or for all of Boost by defining BOOST_ALL_NO_LIB. + + # If you want to observe which libraries are being linked against then defining + # BOOST_LIB_DIAGNOSTIC will cause the auto-linking code to emit a #pragma message each time + # a library is selected for linking. + SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") +ENDIF(WIN32) + + +SET(BOOST_INCLUDE_PATH_DESCRIPTION "directory containing the boost include files. E.g /usr/local/include/boost-1_33_1 or c:\\boost\\include\\boost-1_33_1") + +SET(BOOST_DIR_MESSAGE "Set the Boost_INCLUDE_DIR cmake cache entry to the ${BOOST_INCLUDE_PATH_DESCRIPTION}") + +SET(BOOST_DIR_SEARCH $ENV{BOOST_ROOT}) +IF(BOOST_DIR_SEARCH) + FILE(TO_CMAKE_PATH ${BOOST_DIR_SEARCH} BOOST_DIR_SEARCH) + SET(BOOST_DIR_SEARCH ${BOOST_DIR_SEARCH}/include) +ENDIF(BOOST_DIR_SEARCH) + +IF(WIN32) + SET(BOOST_DIR_SEARCH + ${BOOST_DIR_SEARCH} + C:/boost/include + D:/boost/include + ) +ENDIF(WIN32) + +# Add in some path suffixes. These will have to be updated whenever a new Boost version comes out. +SET(SUFFIX_FOR_PATH + boost-1_35_1 + boost-1_35_0 + boost-1_35 + boost-1_34_1 + boost-1_34_0 + boost-1_34 + boost-1_33_1 + boost-1_33_0 +) + +# +# Look for an installation. +# +FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS + + # Look in other places. + ${BOOST_DIR_SEARCH} + + # Help the user find it if we cannot. + DOC "The ${BOOST_INCLUDE_PATH_DESCRIPTION}" +) + +# Assume we didn't find it. +SET(Boost_FOUND 0) + +# Now try to get the include and library path. +IF(Boost_INCLUDE_DIR) + + # Look for the boost library path. + # Note that the user may not have installed any libraries + # so it is quite possible the Boost_LIBRARY_PATH may not exist. + SET(Boost_LIBRARY_DIR ${Boost_INCLUDE_DIR}) + + IF("${Boost_LIBRARY_DIR}" MATCHES "boost-[0-9]+") + GET_FILENAME_COMPONENT(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR} PATH) + ENDIF ("${Boost_LIBRARY_DIR}" MATCHES "boost-[0-9]+") + + IF("${Boost_LIBRARY_DIR}" MATCHES "/include$") + # Strip off the trailing "/include" in the path. + GET_FILENAME_COMPONENT(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR} PATH) + ENDIF("${Boost_LIBRARY_DIR}" MATCHES "/include$") + + IF(EXISTS "${Boost_LIBRARY_DIR}/lib") + SET (Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/lib) + ELSE(EXISTS "${Boost_LIBRARY_DIR}/lib") + IF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib") + SET(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/stage/lib) + ELSE(EXISTS "${Boost_LIBRARY_DIR}/stage/lib") + SET(Boost_LIBRARY_DIR "") + ENDIF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib") + ENDIF(EXISTS "${Boost_LIBRARY_DIR}/lib") + + IF(EXISTS "${Boost_INCLUDE_DIR}") + SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR}) + # We have found boost. It is possible that the user has not + # compiled any libraries so we set Boost_FOUND to be true here. + SET(Boost_FOUND 1) + MARK_AS_ADVANCED(Boost_INCLUDE_DIR) + ENDIF(EXISTS "${Boost_INCLUDE_DIR}") + + IF(Boost_LIBRARY_DIR AND EXISTS "${Boost_LIBRARY_DIR}") + SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIR}) + ENDIF(Boost_LIBRARY_DIR AND EXISTS "${Boost_LIBRARY_DIR}") +ENDIF(Boost_INCLUDE_DIR) + +# +# Find boost libraries +# + +# List of library suffixes to search, e.g. libboost_date_time-gcc +SET(BOOST_SUFFIX_SEARCH + gcc + mt + il +) + +# List of all boost libraries +SET(BOOST_ALL_LIBRARIES + date_time + filesystem + graph + iostreams + program_options + python + regex + serialization + signals + test + thread + unit_test_framework + wave +) + +# Macro to find boost library called name +MACRO(BOOST_FIND_LIBRARY name) + + # User can specify a particular build variant via the variables: + # Boost_LIB_PREFIX, Boost_LIB_SUFFIX, Boost_LIB_SUFFIX_DEBUG + # otherwise we'll search the BOOST_SUFFIX_SEARCH list + + IF (Boost_LIB_SUFFIX) + SET(BOOST_LIB_NAMES ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX}) + ELSE (Boost_LIB_SUFFIX) + SET(BOOST_LIB_NAMES ${Boost_LIB_PREFIX}boost_${name}) + FOREACH(suffix ${BOOST_SUFFIX_SEARCH}) + SET(BOOST_LIB_NAMES ${BOOST_LIB_NAMES} ${Boost_LIB_PREFIX}boost_${name}-${suffix}) + ENDFOREACH(suffix) + ENDIF(Boost_LIB_SUFFIX) + + # Find the library in the Boost_LIBRARY_DIRS + FIND_LIBRARY(Boost_${name}_LIBRARY + NAMES ${BOOST_LIB_NAMES} + PATHS ${Boost_LIBRARY_DIRS}) + + # For MSVC builds find debug library + IF(WIN32 AND MSVC AND Boost_${name}_LIBRARY) + FIND_LIBRARY(Boost_${name}_LIBRARY_DEBUG ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX_DEBUG}) + + IF(MSVC_IDE) + IF(Boost_${name}_LIBRARY AND Boost_${name}_LIBRARY_DEBUG) + SET(Boost_${name}_LIBRARIES debug ${Boost_${name}_LIBRARY_DEBUG} optimized ${Boost_${name}_LIBRARY}) + ELSE(Boost_${name}_LIBRARY AND Boost_${name}_LIBRARY_DEBUG) + MESSAGE(FATAL_ERROR "Could not find the debug and release version of Boost ${name} library.") + ENDIF(Boost_${name}_LIBRARY AND Boost_${name}_LIBRARY_DEBUG) + ELSE(MSVC_IDE) + STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + SET(Boost_${name}_LIBRARIES ${Boost_${name}_LIBRARY_DEBUG}) + ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + SET(Boost_${name}_LIBRARIES ${Boost_${name}_LIBRARY}) + ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + ENDIF(MSVC_IDE) + ELSE(WIN32 AND MSVC AND Boost_${name}_LIBRARY) + SET(Boost_${name}_LIBRARIES ${Boost_${name}_LIBRARY}) + ENDIF(WIN32 AND MSVC AND Boost_${name}_LIBRARY) + + # If we've got it setup appropriate variables or issue error message + IF(Boost_${name}_LIBRARY) + SET(Boost_${name}_FOUND 1) + SET(Boost_${name}_INCLUDE_DIRS ${Boost_INCLUDE_DIR}) + MARK_AS_ADVANCED(Boost_${name}_LIBRARY Boost_${name}_LIBRARY_DEBUG) + ELSE(Boost_${name}_LIBRARY) + IF(NOT Boost_FIND_QUIETLY) + MESSAGE(STATUS "Boost ${name} library was not found.") + ELSE(NOT Boost_FIND_QUIETLY) + IF(Boost_FIND_REQUIRED_${name}) + MESSAGE(FATAL_ERROR "Could NOT find required Boost ${name} library.") + ENDIF(Boost_FIND_REQUIRED_${name}) + ENDIF(NOT Boost_FIND_QUIETLY) + ENDIF(Boost_${name}_LIBRARY) +ENDMACRO(BOOST_FIND_LIBRARY) + +IF(Boost_LIBRARY_DIRS) + + # If the user specified required components e.g. via + # FIND_PACKAGE(Boost REQUIRED date_time regex) + # find (just) those libraries. Otherwise find all libraries. + IF(Boost_FIND_COMPONENTS) + SET(Boost_FIND_LIBRARIES ${Boost_FIND_COMPONENTS}) + ELSE(Boost_FIND_COMPONENTS) + SET(Boost_FIND_LIBRARIES ${BOOST_ALL_LIBRARIES}) + ENDIF(Boost_FIND_COMPONENTS) + + SET(Boost_LIBRARIES) + FOREACH(library ${Boost_FIND_LIBRARIES}) + BOOST_FIND_LIBRARY(${library}) + IF(Boost_${library}_FOUND) + SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${library}_LIBRARIES}) + ENDIF(Boost_${library}_FOUND) + ENDFOREACH(library) +ENDIF(Boost_LIBRARY_DIRS) + +IF(NOT Boost_FOUND) + IF(NOT Boost_FIND_QUIETLY) + MESSAGE(STATUS "Boost was not found. ${BOOST_DIR_MESSAGE}") + ELSE(NOT Boost_FIND_QUIETLY) + IF(Boost_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Boost was not found. ${BOOST_DIR_MESSAGE}") + ENDIF(Boost_FIND_REQUIRED) + ENDIF(NOT Boost_FIND_QUIETLY) +ENDIF(NOT Boost_FOUND) Modified: hugin/trunk/CMakeModules/FindOpenEXR.cmake =================================================================== --- hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-11-15 23:27:44 UTC (rev 2536) +++ hugin/trunk/CMakeModules/FindOpenEXR.cmake 2007-11-17 20:30:58 UTC (rev 2537) @@ -86,7 +86,6 @@ set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ) else (OPENEXR_ILMTHREAD_LIBRARY) set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") - MESSAGE(ERROR "Not using OpenEXR thread library") endif (OPENEXR_ILMTHREAD_LIBRARY) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) Modified: hugin/trunk/INSTALL_cmake =================================================================== --- hugin/trunk/INSTALL_cmake 2007-11-15 23:27:44 UTC (rev 2536) +++ hugin/trunk/INSTALL_cmake 2007-11-17 20:30:58 UTC (rev 2537) @@ -39,6 +39,11 @@ [some failure] $ ccmake . +If CMake failes to recognize the boost thread library, the boost library suffix +might need to be given in the Boost_LIB_SUFFIX CMake variable. For example: +$ cmake -DBoost_LIB_SUFFIX=gcc41-mt-1_34_1 +if the boost thread suffix is gcc41-mt-1_34_1 + Configuring the build ===================== @@ -55,6 +60,7 @@ functions. (Unix and OSX, Windows is always statically linked) + For distributors: ================= CMake supports the DESTDIR variable during make install, this Modified: hugin/trunk/src/CMakeLists.txt =================================================================== --- hugin/trunk/src/CMakeLists.txt 2007-11-15 23:27:44 UTC (rev 2536) +++ hugin/trunk/src/CMakeLists.txt 2007-11-17 20:30:58 UTC (rev 2537) @@ -5,22 +5,18 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/vigra ) # define common sets of libraries, used by different subdirectories -IF (WIN32 AND NOT MINGW) +IF (MSVC) # boost_thread is linked automatically # additionally link to our getopt set(common_libs huginbase huginjhead hugingetopt ${PANO_LIBRARIES} huginlevmar) include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/getopt/include ) -ELSEIF (MINGW) +ELSE (MSVC) # need to specify boost thread library - set(common_libs huginbase huginjhead boost_thread-mgw-mt - ${PANO_LIBRARIES} huginlevmar) -ELSE (WIN32 AND NOT MINGW) - # need to specify boost thread library set(common_libs huginbase huginjhead - boost_thread ${PANO_LIBRARIES} huginlevmar) + ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} huginlevmar) +ENDIF (MSVC) -ENDIF (WIN32 AND NOT MINGW) set(image_libs huginvigraimpex ${OPENEXR_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pcr...@us...> - 2007-11-26 21:53:17
|
Revision: 2542 http://hugin.svn.sourceforge.net/hugin/?rev=2542&view=rev Author: pcrowley5286 Date: 2007-11-26 13:53:15 -0800 (Mon, 26 Nov 2007) Log Message: ----------- Initial add of mac build files for release. Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CMakeLists.txt Added Paths: ----------- hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in Added: hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake =================================================================== --- hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake (rev 0) +++ hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake 2007-11-26 21:53:15 UTC (rev 2542) @@ -0,0 +1,65 @@ + +# --- If we are on OS X copy all the embedded libraries to the app bundle +IF (APPLE) + MESSAGE ( "Building Standalone release" ) +# IF ( NOT DEP_QT_LIBS ) +# SET (DEP_QT_LIBS "QtCore QtGui" ) +# +# ENDIF ( NOT DEP_QT_LIBS ) +# +# IF ( NOT QT_PREFIX ) +# SET (QT_PREFIX "") +# ENDIF ( NOT QT_PREFIX ) +# +# IF ( NOT QT_SUFFIX ) +# SET (QT_SUFFIX "framework") +# ENDIF ( NOT QT_SUFFIX ) +# +# IF ( NOT QT_VERSION ) +# SET (QT_VERSION "4.2.3") +# ENDIF ( NOT QT_VERSION ) +# +# + # -- This script will take care of files that the application is dependent on + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CMakeModules/PackageMacAppBundleLibs.sh.in + ${CMAKE_INSTALL_PREFIX}/${BINDIR}/PackageMacAppBundleLibs.sh @ONLY IMMEDIATE) + +# CONFIGURE_FILE(${CMAKE_PROJECT_DIR}/CMakeModules/PackageQt4ForOSXAppBundle.sh.in +# ${BINDIR}/PackageQt4ForOSXAppBundle.sh @ONLY IMMEDIATE) + + GET_TARGET_PROPERTY(EXE_LOC ${PROGNAME} LOCATION) + + ADD_CUSTOM_COMMAND( + TARGET ${PROGNAME} + POST_BUILD + COMMAND "/bin/chmod" + ARGS ugo+x ${CMAKE_INSTALL_PREFIX}/${BINDIR}/PackageMacAppBundleLibs.sh + ) + + #-- Copy and adjust install_names on the Supporting Libraries + # + ADD_CUSTOM_COMMAND ( + TARGET ${PROGNAME} + POST_BUILD + COMMAND ${CMAKE_INSTALL_PREFIX}/${BINDIR}/PackageMacAppBundleLibs.sh + ARGS + ) + +# ADD_CUSTOM_COMMAND( +# TARGET ${OS_X_APP_NAME} +# POST_BUILD +# COMMAND "/bin/chmod" +# ARGS ugo+x ${BINDIR}/PackageQt4ForOSXAppBundle.sh +# ) + + #-- Use the generated Shell script to copy and correct the QtLibs +# ADD_CUSTOM_COMMAND ( +# TARGET ${OS_X_APP_NAME} +# POST_BUILD +# COMMAND ${BINDIR}/PackageQt4ForOSXAppBundle.sh +# ARGS +# ) + + +ENDIF (APPLE) + Added: hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in =================================================================== --- hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in (rev 0) +++ hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in 2007-11-26 21:53:15 UTC (rev 2542) @@ -0,0 +1,88 @@ +#!/bin/bash + +# //TODO: Add Icon File and copy it to the bundle +# This script attempts to copy needed 3rd party libraries and frameworks into +# the application bundle. It will then attempt to set the 'install_name' for +# each library so that it references either the PlugIns or Frameworks directory. +# The Script will change the JPEG, TIFF, and PNG, and Boost libraries. Each of these +# libraries is assumed to have been built with some sort of rpath already. We are +# dependant on that fact. + +BASE_DIR="@CMAKE_CURRENT_BINARY_DIR@" +cd ${BASE_DIR} + +dylib=".dylib" +PLUGINS_DIR_NAME="Lib" +APPLICATION_APP_BUNDLE="@PROGNAME@.app" +APPLICATION_BINDIR="${APPLICATION_APP_BUNDLE}/Contents/MacOS" +APPLICATION_APP_NAME="${APPLICATION_BINDIR}/@PROGNAME@" +PLUGINS_PATH="${APPLICATION_APP_BUNDLE}/Contents/${PLUGINS_DIR_NAME}" +FRAMEWORKS_PATH="${APPLICATION_APP_BUNDLE}/Contents/Frameworks" +RPATH_PLUGIN_PATH="@executable_path/../${PLUGINS_DIR_NAME}" +RPATH_FRAMEWORK_PATH="@executable_path/../Frameworks" + +DEBUG=0 + +echo "*-----------------------------------------------------------*" +echo "* Copying Support Libraries for ${APPLICATION_APP_BUNDLE}" +echo "* Located in ${BASE_DIR}" + +# Create the PlugIns and Frameworks Directories +mkdir -p "${PLUGINS_PATH}" +mkdir -p "${FRAMEWORKS_PATH}" + +get_libraries() { + #echo "-----------getting libraries for $1" + LIBRARIES=$(echo $(otool -X -L $1 | grep -v ${RPATH_PLUGIN_PATH} | grep -v \/System\/Library | grep -v \/usr\/lib | sed -e 's/(.*)//' | sort -u)) + if [ -n "$LIBRARIES" ]; then + for library in $LIBRARIES + do + update_library $library $1 + done + fi + #echo "----finished getting libraries for $1" +} + +update_library() { + lib="$1" + path=$(dirname ${lib}) + file=$(basename ${lib}) + if [ ! -f "${BASE_DIR}/${PLUGINS_PATH}/${file}" ] + then + echo "* Installing Library -->$1<-- into ${APPLICATION_APP_BUNDLE} " + cp "${lib}" "${BASE_DIR}/${PLUGINS_PATH}" + #chmod 755 "${BASE_DIR}/${PLUGINS_PATH}/${file}" + install_name_tool -id "${RPATH_PLUGIN_PATH}/${file}" "${BASE_DIR}/${PLUGINS_PATH}/${file}" + install_name_tool -change "${lib}" "${RPATH_PLUGIN_PATH}/${file}" "$2" + get_libraries "${BASE_DIR}/${PLUGINS_PATH}/${file}" + else + # Change internal id of the Library + install_name_tool -id "${RPATH_PLUGIN_PATH}/${file}" "${BASE_DIR}/${PLUGINS_PATH}/${file}" + # Change the hugin executable to have the proper rpath for the Library + #echo "updating $2 to use ${RPATH_PLUGIN_PATH}/${file} for ${lib}" + install_name_tool -change "${lib}" "${RPATH_PLUGIN_PATH}/${file}" "$2" + fi +} + +add_executable() { + # ----------------------------------------------------------------------------- + # Copy the executable into the App package + # ----------------------------------------------------------------------------- + echo "* Installing Binary -->$1<-- into ${APPLICATION_APP_BUNDLE} " + cp "$1" "${BASE_DIR}/${APPLICATION_BINDIR}" + get_libraries "${BASE_DIR}/${APPLICATION_BINDIR}/$(basename $1)" +} + +get_libraries "${BASE_DIR}/${APPLICATION_BINDIR}/@PROGNAME@" +add_executable "${BASE_DIR}/../../tools/nona" +add_executable "${BASE_DIR}/../../deghosting/hugin_hdrmerge" +add_executable "$(which msgfmt)" +add_executable "$(which PTroller)" +add_executable "$(which PTmasker)" +add_executable "$(which PTtiff2psd)" +add_executable "$(which enblend)" + +echo "*-----------------------------------------------------------*" +echo "* Creating DMG file: @CMAKE_INSTALL_PREFIX@/@PROGNAME@.dmg " +mkdmg -zlib -s "${BASE_DIR}/${APPLICATION_APP_BUNDLE}" -i "@CMAKE_INSTALL_PREFIX@/@PROGNAME@.dmg" +echo "" Modified: hugin/trunk/src/hugin1/hugin/CMakeLists.txt =================================================================== --- hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2007-11-25 00:10:39 UTC (rev 2541) +++ hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2007-11-26 21:53:15 UTC (rev 2542) @@ -94,6 +94,9 @@ # install further stuff (icons etc.) IF (APPLE) + IF(${CMAKE_BUILD_TYPE} STREQUAL "Release") + INCLUDE (${CMAKE_SOURCE_DIR}/CMakeModules/AppleRELEASEOptions.cmake) + ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Release") # already done by bundle ELSEIF(UNIX) INSTALL(FILES hugin.desktop DESTINATION ${DATADIR}/applications) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-11-28 21:04:31
|
Revision: 2544 http://hugin.svn.sourceforge.net/hugin/?rev=2544&view=rev Author: dangelo Date: 2007-11-28 13:04:29 -0800 (Wed, 28 Nov 2007) Log Message: ----------- updated italian translation (Milo Casagrande). Changed paths to source files to allow usage of intltool-update. That cannot yet deal with the strings inside the .xrc files, though. Modified Paths: -------------- hugin/trunk/AUTHORS hugin/trunk/src/hugin1/hugin/po/POTFILES.in hugin/trunk/src/hugin1/hugin/po/it.po hugin/trunk/src/hugin1/hugin/xrc/data/about.htm hugin/trunk/src/hugin1/nona_gui/po/LINGUAS hugin/trunk/src/hugin1/nona_gui/po/POTFILES.in Added Paths: ----------- hugin/trunk/src/hugin1/nona_gui/po/it.po Modified: hugin/trunk/AUTHORS =================================================================== --- hugin/trunk/AUTHORS 2007-11-28 20:42:56 UTC (rev 2543) +++ hugin/trunk/AUTHORS 2007-11-28 21:04:29 UTC (rev 2544) @@ -41,6 +41,7 @@ Ulf Wilhelmson Swedish Jozef Riha Slovak Jorge González González Spanish + Milo Casagrande Italian The camera response estimation uses the EMoR response model developed at the Computer Vision Laboratory of the Columbia University. Modified: hugin/trunk/src/hugin1/hugin/po/POTFILES.in =================================================================== --- hugin/trunk/src/hugin1/hugin/po/POTFILES.in 2007-11-28 20:42:56 UTC (rev 2543) +++ hugin/trunk/src/hugin1/hugin/po/POTFILES.in 2007-11-28 21:04:29 UTC (rev 2544) @@ -1,63 +1,63 @@ # Files containing translateable strings -src/hugin/AssistantPanel.cpp -src/hugin/AutoCtrlPointCreator.cpp -src/hugin/CommandHistory.cpp -src/hugin/CPEditorPanel.cpp -src/hugin/CPFineTuneFrame.cpp -src/hugin/CPImageCtrl.cpp -src/hugin/CPListFrame.cpp -src/hugin/huginApp.cpp -src/hugin/ImageCache.cpp -src/hugin/ImagesList.cpp -src/hugin/ImagesPanel.cpp -src/hugin/LensPanel.cpp -src/hugin/MainFrame.cpp -src/hugin/MyExternalCmdExecDialog.cpp -src/hugin/MyProgressDialog.cpp -src/hugin/NonaStitcherPanel.cpp -src/hugin/OptimizePanel.cpp -src/hugin/PanoDruid.cpp -src/hugin/PanoPanel.cpp -src/hugin/Plot2D.cpp -src/hugin/PreferencesDialog.cpp -src/hugin/PreviewFrame.cpp -src/hugin/PreviewPanel.cpp -src/hugin/PTStitcherPanel.cpp -src/hugin/RunStitcherFrame.cpp -src/hugin/LocalizedFileTipProvider.cpp -src/hugin/VigCorrDialog.cpp -src/hugin/wxPanoCommand.cpp -src/include/hugin/MyProgressDialog.h -src/include/hugin/wxPanoCommand.h +AssistantPanel.cpp +AutoCtrlPointCreator.cpp +CommandHistory.cpp +CPEditorPanel.cpp +CPFineTuneFrame.cpp +CPImageCtrl.cpp +CPListFrame.cpp +huginApp.cpp +../base_wx/ImageCache.cpp +ImagesList.cpp +ImagesPanel.cpp +LensPanel.cpp +MainFrame.cpp +../base_wx/MyExternalCmdExecDialog.cpp +../base_wx/MyProgressDialog.cpp +NonaStitcherPanel.cpp +OptimizePanel.cpp +PanoDruid.cpp +PanoPanel.cpp +../base_wx/Plot2D.cpp +PreferencesDialog.cpp +PreviewFrame.cpp +PreviewPanel.cpp +PTStitcherPanel.cpp +RunStitcherFrame.cpp +LocalizedFileTipProvider.cpp +VigCorrDialog.cpp +wxPanoCommand.cpp +../base_wx/MyProgressDialog.h +wxPanoCommand.h # XRC resource files -src/hugin/xrc/assistant_panel.xrs -src/hugin/xrc/about.xrs -src/hugin/xrc/anchor_orientation.xrs -src/hugin/xrc/cp_editor_panel.xrs -src/hugin/xrc/cp_list_frame.xrs -src/hugin/xrc/crop_panel.xrs -src/hugin/xrc/edit_script_dialog.xrs -src/hugin/xrc/edit_text.xrs -src/hugin/xrc/help.xrs -src/hugin/xrc/images_panel.xrs -src/hugin/xrc/keyboard_help.xrs -src/hugin/xrc/lens_panel.xrs -src/hugin/xrc/main_frame.xrs -src/hugin/xrc/main_menubar.xrs -src/hugin/xrc/main_menu.xrs -src/hugin/xrc/main_tool.xrs -src/hugin/xrc/nona_panel.xrs -src/hugin/xrc/optimize_panel.xrs -src/hugin/xrc/pano_panel.xrs -src/hugin/xrc/pref_dialog.xrs -src/hugin/xrc/preview_frame.xrs -src/hugin/xrc/ptstitcher_panel.xrs -src/hugin/xrc/run_optimizer_frame.xrs -src/hugin/xrc/run_stitcher_frame.xrs -src/hugin/xrc/vig_corr_dlg.xrs +xrc/assistant_panel.xrs +xrc/about.xrs +xrc/anchor_orientation.xrs +xrc/cp_editor_panel.xrs +xrc/cp_list_frame.xrs +xrc/crop_panel.xrs +xrc/edit_script_dialog.xrs +xrc/edit_text.xrs +xrc/help.xrs +xrc/images_panel.xrs +xrc/keyboard_help.xrs +xrc/lens_panel.xrs +xrc/main_frame.xrs +xrc/main_menubar.xrs +xrc/main_menu.xrs +xrc/main_tool.xrs +xrc/nona_panel.xrs +xrc/optimize_panel.xrs +xrc/pano_panel.xrs +xrc/pref_dialog.xrs +xrc/preview_frame.xrs +xrc/ptstitcher_panel.xrs +xrc/run_optimizer_frame.xrs +xrc/run_stitcher_frame.xrs +xrc/vig_corr_dlg.xrs # tip of the day -src/hugin/xrc/data/tips.txt +xrc/data/tips.txt Modified: hugin/trunk/src/hugin1/hugin/po/it.po =================================================================== --- hugin/trunk/src/hugin1/hugin/po/it.po 2007-11-28 20:42:56 UTC (rev 2543) +++ hugin/trunk/src/hugin1/hugin/po/it.po 2007-11-28 21:04:29 UTC (rev 2544) @@ -2,62 +2,84 @@ # Copyright (C) 2004 Pablo dAngelo # This file is distributed under the same license as the hugin package. # Luca Vascon <cri...@ya...>, 2005. +# Milo Casagrande <mil...@ya...>, 2007 # +# stitch -> propriamente sarebbe cucire, ma indica l'azione di unire le immagini, +# visto che viene anche usato blend all'interno del file per questo ho messo 'assemblare' +# +# fine-tune -> regolazione precisa +# +# yaw -> imbardata +# pitch -> inclinazione +# roll -> rollio +# +# Ho eliminato volutamente quei riferimenti tipo (a) o cose così... +# Ce ne sono molti e a mio parere non servono a molto: in alcuni casi indicano una colonna di una tabella +# e sono riportati anche nell'opzione che li modifica, ma modificando l'opzione si modifica anche la cella +# quindi si capisce lo stesso... +# +# msgid "" msgstr "" "Project-Id-Version: hugin 0.4\n" "Report-Msgid-Bugs-To: pab...@we...\n" "POT-Creation-Date: 2007-07-17 21:08+0200\n" -"PO-Revision-Date: 2005-08-05 21:43+0100\n" -"Last-Translator: Pablo d'Angelo <pab...@ma...>\n" +"PO-Revision-Date: 2007-11-15 22:39+0100\n" +"Last-Translator: Milo Casagrande <mil...@ya...>\n" "Language-Team: Italian <tp...@li...>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/hugin/AssistantPanel.cpp:229 msgid "Please load images by pressing on the Load images button." -msgstr "" +msgstr "Caricare immagini premendo il pulsante «Carica immagini»." #: src/hugin/AssistantPanel.cpp:259 #, c-format msgid "%d images loaded." -msgstr "" +msgstr "%d immagini caricate." #: src/hugin/AssistantPanel.cpp:293 -#, fuzzy, c-format +#, c-format msgid "Images are connected by %d control points.\n" -msgstr "Eliminare veramente %d punti di controllo?" +msgstr "Le immagini sono collegate da %d punti di controllo.\n" #: src/hugin/AssistantPanel.cpp:302 #, c-format msgid "%d unconnected image groups found: " -msgstr "" +msgstr "Trovati %d gruppi non connessi: " #: src/hugin/AssistantPanel.cpp:303 msgid "" "Please use the Control Points tab to connect all images with control " "points.\n" msgstr "" +"Usare la scheda Punti di controllo per collegare tutte le immagini " +"attraverso i punti di controllo.\n" #: src/hugin/AssistantPanel.cpp:306 msgid "Images or control points have changed, new alignment is needed." msgstr "" +"Le immagini o i punti di controllo sono cambiati, è necessario un nuovo " +"allineamento." #: src/hugin/AssistantPanel.cpp:317 msgid "Very good fit." -msgstr "" +msgstr "Adattamento ottimo." #: src/hugin/AssistantPanel.cpp:319 msgid "Good fit." -msgstr "" +msgstr "Adattamento buono." #: src/hugin/AssistantPanel.cpp:321 msgid "" "Bad fit, some control points might be bad, or there are parallax and " "movement errors" msgstr "" +"Adattamento sufficiente, alcuni punti di controllo potrebbero essere errati " +"o sono presenti errori di parallasse e di movimento" #: src/hugin/AssistantPanel.cpp:323 msgid "" @@ -65,36 +87,39 @@ "parallax or movement. The optimizer might have failed. Manual intervention " "required." msgstr "" +"Adattamento insufficiente. Controllare i punti di controllo errati, i " +"parametri della lente o immagini con parallasse o movimento. L'ottimizzatore " +"potrebbe aver fallito, è necessario un intervento manuale." #: src/hugin/AssistantPanel.cpp:325 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f\n" -msgstr "" +msgstr "Errore medio dopo l'ottimizzazione: %.1f pixel, massimo: %.1f\n" #: src/hugin/AssistantPanel.cpp:362 msgid "" "At least two images are required.\n" "Please add more images." msgstr "" +"Sono richieste almeno due immagini.\n" +"Caricare altre immagini." #: src/hugin/AssistantPanel.cpp:362 src/hugin/AssistantPanel.cpp:522 msgid "Error" -msgstr "" +msgstr "Errore" #: src/hugin/AssistantPanel.cpp:382 -#, fuzzy msgid "Aligning images" -msgstr "Immagine scalata %s" +msgstr "Allineamento immagini" #: src/hugin/AssistantPanel.cpp:382 -#, fuzzy msgid "Finding corresponding points" -msgstr "Nessuna corrispondenza trovata" +msgstr "Ricerca punti corrispondenti" #: src/hugin/AssistantPanel.cpp:407 #, c-format msgid "Warning %d unconnected image groups found:" -msgstr "" +msgstr "Attenzione, trovati %d gruppi non collegati:" #: src/hugin/AssistantPanel.cpp:408 msgid "" @@ -103,20 +128,22 @@ "\n" "After adding the points, press the \"Align\" button again" msgstr "" +"Creare dei punti di controllo tra le immagini non collegate utilizzando la " +"scheda Punti di controllo.\n" +"\n" +"Fatto questo, premere nuovamente il pulsante «Allinea»" #: src/hugin/AssistantPanel.cpp:522 -#, fuzzy msgid "Error: could not load all images" -msgstr "Caricamento dll fallito" +msgstr "Errore: impossibile caricare tutte le immagini" #: src/hugin/AutoCtrlPointCreator.cpp:103 msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com" -msgstr "" -"Autopano (a partire dalla versione 1.03), da http://autopano.kolor.com" +msgstr "Autopano (versione 1.03 o superiore), http://autopano.kolor.com" #: src/hugin/AutoCtrlPointCreator.cpp:104 msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/" -msgstr "Autopano-Sift, da: http://user.cs.tu-berlin.de/~nowozin/autopano-sift/" +msgstr "Autopano-Sift, http://user.cs.tu-berlin.de/~nowozin/autopano-sift/" #: src/hugin/AutoCtrlPointCreator.cpp:106 msgid "Choose which autopano program should be used\n" @@ -128,15 +155,15 @@ #: src/hugin/AutoCtrlPointCreator.cpp:119 msgid "Autopano from http://autopano.kolor.com is not available for OSX" -msgstr "" +msgstr "Autopano non è disponibile per OSX" #: src/hugin/AutoCtrlPointCreator.cpp:120 msgid "Would you like to use Autopano-Sift instead?" -msgstr "" +msgstr "Utilizzare Autopano-Sift?" #: src/hugin/AutoCtrlPointCreator.cpp:157 msgid "Select autopano program / frontend script" -msgstr "Scegliere il programma Autopano / script" +msgstr "Scegliere il programma / script frontend di autopano" #: src/hugin/AutoCtrlPointCreator.cpp:159 #: src/hugin/AutoCtrlPointCreator.cpp:345 src/hugin/PreferencesDialog.cpp:257 @@ -149,38 +176,37 @@ #: src/hugin/AutoCtrlPointCreator.cpp:201 #: src/hugin/AutoCtrlPointCreator.cpp:351 msgid "No autopano selected" -msgstr "Non e' stata selezionata una versione di Autopano" +msgstr "Non è stata selezionata una versione di autopano" #: src/hugin/AutoCtrlPointCreator.cpp:188 msgid "Autopano-SIFT is not installed." -msgstr "" +msgstr "Autopano-SIFT non è installato." #: src/hugin/AutoCtrlPointCreator.cpp:193 msgid "Select autopano frontend script" -msgstr "Selezionare uno script per autopano-sift" +msgstr "Selezionare uno script frontend per autopano" #: src/hugin/AutoCtrlPointCreator.cpp:195 msgid "Shell Scripts (*.sh)|*.sh" -msgstr "" +msgstr "Script shell (*.sh)|*.sh" +# (ndt) non ho idea di che dicitura sia '%namefile'... #: src/hugin/AutoCtrlPointCreator.cpp:239 #, c-format msgid "Please use either %namefile or %i in the autopano-sift command line." -msgstr "" -"Per favore, usare %namefile o %i nella linea di comando di autopano-sift." +msgstr "Usare o %namefile o %i alla riga di comando di autopano-sift." #: src/hugin/AutoCtrlPointCreator.cpp:240 #: src/hugin/AutoCtrlPointCreator.cpp:245 msgid "Error in Autopano command" -msgstr "Erore di comando in Autopano" +msgstr "Errore nel comando di Autopano" #: src/hugin/AutoCtrlPointCreator.cpp:244 #, c-format msgid "" "Please use %namefile or %i to specify the input files for autopano-sift" msgstr "" -"Per favore, usare %namefile o %i per specificare i files da usare in " -"autopano-sift." +"Usare %namefile o %i per specificare i file di input per autopano-sift." #: src/hugin/AutoCtrlPointCreator.cpp:283 #: src/hugin/AutoCtrlPointCreator.cpp:389 @@ -190,10 +216,10 @@ "Please select less images, or place the images in a folder with\n" "a shorter pathname" msgstr "" -"La linea di comando per Autopano e' troppo lunga.\n" -"E' un limite di Windows.\n" -"Usare meno immagini, un nome piu' breve per l'immagine\n" -"finale, un percorso path piu' corto nell'HD." +"Riga di comando di Autopano troppo lunga.\n" +"È una limitazione di Windows.\n" +"Usare meno immagini o posizionare le immagini in una cartella\n" +"con un percorso più corto" #: src/hugin/AutoCtrlPointCreator.cpp:284 #: src/hugin/AutoCtrlPointCreator.cpp:390 src/hugin/NonaStitcherPanel.cpp:434 @@ -206,7 +232,7 @@ #: src/hugin/MyExternalCmdExecDialog.cpp:100 #: src/hugin/NonaStitcherPanel.cpp:446 src/hugin/PanoPanel.cpp:724 msgid "Could not execute command: " -msgstr "Comando non eseguito:" +msgstr "Impossibile eseguire il comando:" #: src/hugin/AutoCtrlPointCreator.cpp:299 #: src/hugin/AutoCtrlPointCreator.cpp:304 @@ -218,7 +244,7 @@ #: src/hugin/AutoCtrlPointCreator.cpp:302 #: src/hugin/AutoCtrlPointCreator.cpp:406 src/hugin/NonaStitcherPanel.cpp:449 msgid "command: " -msgstr "command:" +msgstr "Comando: " #: src/hugin/AutoCtrlPointCreator.cpp:303 #: src/hugin/AutoCtrlPointCreator.cpp:407 src/hugin/NonaStitcherPanel.cpp:450 @@ -227,12 +253,12 @@ "failed with error code: " msgstr "" "\n" -"fallito, codice errore:" +"Fallito con codice di errore:" #: src/hugin/AutoCtrlPointCreator.cpp:310 #: src/hugin/AutoCtrlPointCreator.cpp:415 msgid "Could not open " -msgstr "Apertura fallita" +msgstr "Impossibile aprire " #: src/hugin/AutoCtrlPointCreator.cpp:310 #: src/hugin/AutoCtrlPointCreator.cpp:415 @@ -243,20 +269,20 @@ "\n" "Autopano command: " msgstr "" -"per lettura\n" -"Questo indica che Autopano e' schiattato,\n" -"oppure che hai sbagliato qualcosa \n" -"nel dargli la linea di comando." +" in lettura\n" +"Questo indica che la chiamata ad autopano è fallita\n" +"oppure sono stati usati parametri per la riga di comando errati.\n" +"\n" +"Comando Autopano:" #: src/hugin/AutoCtrlPointCreator.cpp:311 #: src/hugin/AutoCtrlPointCreator.cpp:418 msgid "autopano failure" -msgstr "autopano in palla." +msgstr "Fallimento di autopano" #: src/hugin/AutoCtrlPointCreator.cpp:343 -#, fuzzy msgid "Select autopano program" -msgstr "Selezionare il tipo di autopano" +msgstr "Selezionare il programma autopano" #: src/hugin/AutoCtrlPointCreator.cpp:416 msgid "" @@ -264,15 +290,15 @@ " current directory:" msgstr "" "\n" -"directory corrente:" +"Directory attuale:" #: src/hugin/CommandHistory.cpp:94 msgid "no command in undo history" -msgstr "nessun comando da annullare" +msgstr "Nessun comando da annullare" #: src/hugin/CommandHistory.cpp:106 msgid "no command in redo history" -msgstr "Non ci sono comandi da ripristinare" +msgstr "Nessun comando da ripetere" #: src/hugin/CPEditorPanel.cpp:169 src/hugin/CPListFrame.cpp:282 #: src/hugin/CPListFrame.cpp:292 src/hugin/ImagesList.cpp:58 @@ -281,19 +307,19 @@ #: src/hugin/CPEditorPanel.cpp:170 msgid "left x" -msgstr "sinistra x" +msgstr "x sinistra" #: src/hugin/CPEditorPanel.cpp:171 msgid "left y" -msgstr "sinistra y" +msgstr "y sinistra" #: src/hugin/CPEditorPanel.cpp:172 msgid "right x" -msgstr "destra x" +msgstr "x destra" #: src/hugin/CPEditorPanel.cpp:173 msgid "right y" -msgstr "destra y" +msgstr "y destra" #: src/hugin/CPEditorPanel.cpp:174 src/hugin/CPListFrame.cpp:289 #: src/hugin/CPListFrame.cpp:295 @@ -307,11 +333,11 @@ #: src/hugin/CPEditorPanel.cpp:562 msgid "No corresponding point found" -msgstr "Nessuna corrispondenza trovata" +msgstr "Nessuna punto corrispondente trovato" #: src/hugin/CPEditorPanel.cpp:649 msgid "new control point added" -msgstr "nessun punto di controllo aggiunto." +msgstr "Aggiunto punto di controllo" #: src/hugin/CPEditorPanel.cpp:751 src/hugin/CPEditorPanel.cpp:975 msgid "searching similar point..." @@ -319,7 +345,7 @@ #: src/hugin/CPEditorPanel.cpp:770 src/hugin/CPEditorPanel.cpp:893 msgid "Error during Fine-tune" -msgstr "Errore durante la calibrazione" +msgstr "Errore durante la regolazione precisa" #: src/hugin/CPEditorPanel.cpp:784 src/hugin/CPEditorPanel.cpp:913 #: src/hugin/CPEditorPanel.cpp:1049 @@ -328,16 +354,18 @@ "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: " "%0.3f %0.3f " msgstr "" -"Punto calibrato, angolo: %.0f grad, coefficente correlazionet: %0.3f, " +"Punto calibrato, angolo: %.0f gradi, coefficiente correlazione: %0.3f, " "curvatura: %0.3f %0.3f " #: src/hugin/CPEditorPanel.cpp:787 src/hugin/CPEditorPanel.cpp:916 msgid "change points, or press right mouse button to add the pair" -msgstr "Cambiare i punti, o premere tasto DX per aggiungere la coppia" +msgstr "" +"Modificare i punti o premere il pulsante destro del mouse per aggiungere la " +"coppia" #: src/hugin/CPEditorPanel.cpp:807 msgid "Estimated point outside image" -msgstr "Punto stimato fuori dall'immagine" +msgstr "Punto stimato al di fuori dell'immagine" #: src/hugin/CPEditorPanel.cpp:1055 #, c-format @@ -347,23 +375,22 @@ "peak curvature: (%.3f, %.3f) ( should be > %.3f)" msgstr "" "Nessun punto simile trovato.\n" -"Coeff. correlazione: %.3f (dovrebbe essere > %.3f)\n" -"Curvatura picco: (%.3f, %.3f) ( dovrebbe essere > %.3f)" +"Coefficiente correlazione: %.3f (dovrebbe essere > %.3f)\n" +"Curvatura picco: (%.3f, %.3f) (dovrebbe essere > %.3f)" #: src/hugin/CPEditorPanel.cpp:1057 msgid "No similar point found" msgstr "Nessun punto simile trovato" #: src/hugin/CPEditorPanel.cpp:1209 src/hugin/CPEditorPanel.cpp:1220 -#, fuzzy msgid "Add new Line" -msgstr "Aggiungi Punto" +msgstr "Aggiungi nuova riga" #: src/hugin/CPEditorPanel.cpp:1215 src/hugin/CPEditorPanel.cpp:1218 #: src/hugin/CPEditorPanel.cpp:1496 src/hugin/CPListFrame.cpp:406 #, c-format msgid "Line %d" -msgstr "" +msgstr "Riga %d" #: src/hugin/CPEditorPanel.cpp:1487 src/hugin/CPListFrame.cpp:397 #: src/hugin/PreviewFrame.cpp:240 src/hugin/xrc/cp_editor_panel.xrs:8 @@ -372,7 +399,7 @@ #: src/hugin/CPEditorPanel.cpp:1490 src/hugin/CPListFrame.cpp:400 msgid "vert. Line" -msgstr "linea vert." +msgstr "Linea vert." #: src/hugin/CPEditorPanel.cpp:1493 src/hugin/CPListFrame.cpp:403 msgid "horiz. Line" @@ -380,7 +407,8 @@ #: src/hugin/CPEditorPanel.cpp:1795 msgid "Cannot estimate image position without control points" -msgstr "Senza punti di controllo non posso posizionare le immagini " +msgstr "" +"Impossibile stimare la posizione dell'immagine senza punti di controllo" #: src/hugin/CPEditorPanel.cpp:1816 msgid "" @@ -388,52 +416,51 @@ "To create less points,\n" "enter a higher number." msgstr "" +"Creare punti di controllo.\n" +"Per creare meno punti,\n" +"inserire un numero maggiore." #: src/hugin/CPEditorPanel.cpp:1816 -#, fuzzy msgid "Corner Detection threshold" -msgstr "Soglia di correlazione" +msgstr "Soglia rilevamento angoli" #: src/hugin/CPEditorPanel.cpp:1816 src/hugin/CPEditorPanel.cpp:1820 #: src/hugin/xrc/images_panel.xrs:23 -#, fuzzy msgid "Create control points" msgstr "Crea punti di controllo" #: src/hugin/CPEditorPanel.cpp:1820 -#, fuzzy msgid "Corner Detection scale" msgstr "Insieme immagini" #: src/hugin/CPEditorPanel.cpp:1832 -#, fuzzy msgid "Error during control point creation:\n" -msgstr "Errore durante lo Stitching" +msgstr "Errore durante la creazione dei punti di controllo:\n" #: src/hugin/CPEditorPanel.cpp:1963 msgid "Select Point in right image" -msgstr "Scelglere punto in immagine dx" +msgstr "Scegliere punto in immagine destra" #: src/hugin/CPEditorPanel.cpp:1975 msgid "Select Point in left image" -msgstr "Scelglere punto in immagine sx" +msgstr "Scegliere punto in immagine sinistra" #: src/hugin/CPFineTuneFrame.cpp:38 msgid "Control point finetune" -msgstr "Calibrazione punti di controllo" +msgstr "Regolazione precisa punti di controllo" #: src/hugin/CPImageCtrl.cpp:332 -#, fuzzy msgid "new" msgstr "Nuovo" +# (ndt) non mi viene di meglio #: src/hugin/CPImageCtrl.cpp:1143 msgid "Could not process event!" -msgstr "Could not process event!" +msgstr "Impossibile controllare l'evento." #: src/hugin/CPListFrame.cpp:283 src/hugin/CPListFrame.cpp:293 msgid "left Img." -msgstr "Imm. SX" +msgstr "Imm. sinistra" #: src/hugin/CPListFrame.cpp:284 src/hugin/CPListFrame.cpp:287 #: src/hugin/xrc/assistant_panel.xrs:14 src/hugin/xrc/assistant_panel.xrs:37 @@ -446,7 +473,7 @@ #: src/hugin/CPListFrame.cpp:286 src/hugin/CPListFrame.cpp:294 msgid "right Img." -msgstr "Imm DX" +msgstr "Imm. destra" #: src/hugin/CPListFrame.cpp:604 src/hugin/CPListFrame.cpp:613 msgid "" @@ -462,18 +489,18 @@ #: src/hugin/CPListFrame.cpp:612 msgid "Error: please enter a valid number." -msgstr "Errore: Inserire un numero valido" +msgstr "Errore: inserire un numero valido." #: src/hugin/CPListFrame.cpp:612 msgid "Could not read number" -msgstr "Numero non leggibile" +msgstr "Impossibile leggere il numero" #: src/hugin/huginApp.cpp:50 src/hugin/ImagesPanel.cpp:315 #: src/hugin/ImagesPanel.cpp:336 src/hugin/ImagesPanel.cpp:356 #: src/hugin/PanoPanel.cpp:301 src/hugin/PanoPanel.cpp:332 #: src/hugin/PreviewFrame.cpp:748 src/hugin/PreviewFrame.cpp:764 msgid "Value must be numeric." -msgstr "Il valore deve essere numerico" +msgstr "Il valore deve essere numerico." #: src/hugin/ImageCache.cpp:535 #, c-format @@ -481,28 +508,28 @@ msgstr "Caricamento immagine %s" #: src/hugin/ImageCache.cpp:679 -#, fuzzy, c-format +#, c-format msgid "Error during image reading: %s" -msgstr "Errore durante lo Stitching" +msgstr "Errore nel leggere l'immagine: %s" #: src/hugin/ImageCache.cpp:687 msgid "Cannot load image: " -msgstr "Immagine non caricata:" +msgstr "Impossibile caricare immagine: " #: src/hugin/ImageCache.cpp:715 #, c-format msgid "Scaling image %s" -msgstr "Immagine scalata %s" +msgstr "Riduzione immagine %s" #: src/hugin/ImageCache.cpp:816 #, c-format msgid "Creating grayscale %s" -msgstr "Costruzione scala di grigi %s" +msgstr "Creazione scala di grigi %s" #: src/hugin/ImageCache.cpp:834 #, c-format msgid "Creating pyramid image for %s, level %d" -msgstr "Creating pyramid image for %s, level %d" +msgstr "Creazione immagine piramide per %s, livello %d" #: src/hugin/ImagesList.cpp:307 src/hugin/ImagesList.cpp:366 msgid "Filename" @@ -510,7 +537,7 @@ #: src/hugin/ImagesList.cpp:308 msgid "width" -msgstr "largh." +msgstr "larghezza" #: src/hugin/ImagesList.cpp:309 msgid "height" @@ -518,35 +545,35 @@ #: src/hugin/ImagesList.cpp:310 msgid "yaw (y)" -msgstr "yaw (y)" +msgstr "Imbardata" #: src/hugin/ImagesList.cpp:311 msgid "pitch (p)" -msgstr "pitch (p)" +msgstr "Inclinazione" #: src/hugin/ImagesList.cpp:312 msgid "roll (r)" -msgstr "roll (r)" +msgstr "Rollio" #: src/hugin/ImagesList.cpp:313 msgid "Anchor" -msgstr "Rif." +msgstr "Ancora" #: src/hugin/ImagesList.cpp:314 msgid "# Ctrl Pnts" -msgstr "# Pnti Ctrl" +msgstr "# Punti di controllo" #: src/hugin/ImagesList.cpp:367 msgid "Lens no." -msgstr "Obiett. no." +msgstr "Obiettivo n°" #: src/hugin/ImagesList.cpp:368 msgid "Lens type (f)" -msgstr "Tipo obiett (f)" +msgstr "Tipo obiettivo" #: src/hugin/ImagesList.cpp:369 msgid "hfov (v)" -msgstr "hfov (v)" +msgstr "HFOV" #: src/hugin/ImagesList.cpp:370 msgid "a" @@ -579,7 +606,7 @@ #: src/hugin/ImagesList.cpp:399 src/hugin/xrc/assistant_panel.xrs:6 #: src/hugin/xrc/assistant_panel.xrs:25 src/hugin/xrc/lens_panel.xrs:14 msgid "Normal (rectilinear)" -msgstr "Normale (rettilineare)" +msgstr "Normale (rettilinea)" #: src/hugin/ImagesList.cpp:400 src/hugin/xrc/assistant_panel.xrs:7 #: src/hugin/xrc/assistant_panel.xrs:26 src/hugin/xrc/lens_panel.xrs:15 @@ -589,12 +616,12 @@ #: src/hugin/ImagesList.cpp:401 src/hugin/xrc/assistant_panel.xrs:8 #: src/hugin/xrc/assistant_panel.xrs:27 src/hugin/xrc/lens_panel.xrs:16 msgid "Circular fisheye" -msgstr "Fisheye circolare" +msgstr "Grandangolo circolare" #: src/hugin/ImagesList.cpp:402 src/hugin/xrc/assistant_panel.xrs:9 #: src/hugin/xrc/assistant_panel.xrs:28 src/hugin/xrc/lens_panel.xrs:17 msgid "Full frame fisheye" -msgstr "Fisheye full-frame" +msgstr "Grandangolo full-frame" #: src/hugin/ImagesList.cpp:403 src/hugin/PreviewFrame.cpp:616 #: src/hugin/xrc/assistant_panel.xrs:10 src/hugin/xrc/assistant_panel.xrs:29 @@ -605,7 +632,7 @@ #: src/hugin/ImagesList.cpp:421 src/hugin/xrc/images_panel.xrs:31 #: src/hugin/xrc/main_frame.xrs:5 msgid "Crop" -msgstr "" +msgstr "Ritaglio" #: src/hugin/ImagesPanel.cpp:294 #, c-format @@ -623,25 +650,25 @@ #: src/hugin/ImagesPanel.cpp:686 msgid "Delete Control Points" -msgstr "Eliminare Punti di Controllo" +msgstr "Elimina punti di controllo" #: src/hugin/LensPanel.cpp:827 msgid "Not a jpeg file:" -msgstr "Non e' un jpeg valido" +msgstr "Non è un file jpeg:" #: src/hugin/LensPanel.cpp:831 src/hugin/LensPanel.cpp:935 #: src/hugin/LensPanel.cpp:968 src/hugin/LensPanel.cpp:1083 #: src/hugin/LensPanel.cpp:1101 msgid "Please select an image and try again" -msgstr "Selezionare un'immagine prima di eseguire il comando" +msgstr "Selezionare un'immagine e riprovare" #: src/hugin/LensPanel.cpp:849 msgid "Save lens parameters file" -msgstr "Salva un file i parametri dell'obiettivo" +msgstr "Salva file parametri obiettivo" #: src/hugin/LensPanel.cpp:851 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" -msgstr "File parametri obiettivo (*.ini)|*.ini|Tutti i files (*)|*" +msgstr "File progetto obiettivo (*.ini)|*.ini|Tutti i file (*)|*" #: src/hugin/LensPanel.cpp:977 msgid "Load lens parameters" @@ -649,18 +676,20 @@ #: src/hugin/LensPanel.cpp:979 msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*" -msgstr "File parametri obiettivo (*.ini)|*.ini|Tutti i files (*.*)|*.*" +msgstr "File progetto obiettivo (*.ini)|*.ini|Tutti i file (*.*)|*.*" #: src/hugin/LensPanel.cpp:997 msgid "" "Incompatible lens parameter file, image sizes do not match\n" "Apply settings anyway?" msgstr "" +"File parametro obiettivo non compatibile, dimensioni immagine non " +"corrispondenti\n" +"Applicare le impostazioni?" #: src/hugin/LensPanel.cpp:997 -#, fuzzy msgid "Error loading lens parameters" -msgstr "Carica parametri obiettivo" +msgstr "Errore nel caricare i parametri dell'obiettivo" #: src/hugin/LensPanel.cpp:1091 msgid "Enter new lens number" @@ -672,7 +701,7 @@ #: src/hugin/LensPanel.cpp:1092 msgid "Change lens number" -msgstr "Cambia numetro obiettivo" +msgstr "Cambia numero obiettivo" #: src/hugin/MainFrame.cpp:225 msgid "" @@ -681,25 +710,25 @@ "Please ensure it is placed in the same directory as hugin.exe" msgstr "" "Errore di installazione fatale\n" -"Non trovata la directory xrc.\n" +"Impossibile trovare la directory xrc.\n" "Assicurarsi che sia nella stessa directory di hugin.exe" #: src/hugin/MainFrame.cpp:245 src/hugin/xrc/main_menubar.xrs:4 #: src/hugin/xrc/main_menu.xrs:33 src/hugin/xrc/main_menu.xrs:36 msgid "&Help" -msgstr "&Aiuto" +msgstr "A&iuto" #: src/hugin/MainFrame.cpp:347 msgid "Started" -msgstr "Partenza" +msgstr "Inizio" #: src/hugin/MainFrame.cpp:473 msgid "" "The panorama has been changed\n" "Save changes?" msgstr "" -"Il panorama e' stato modificato\n" -"Salvare i cambiamenti?" +"Il panorama è stato modificato\n" +"Salvare le modifiche?" #: src/hugin/MainFrame.cpp:473 msgid "Save Panorama?" @@ -707,12 +736,12 @@ #: src/hugin/MainFrame.cpp:506 msgid "forced close" -msgstr "chiusura forzata" +msgstr "Chiusura forzata" #: src/hugin/MainFrame.cpp:559 #, c-format msgid "saved project %s" -msgstr "Salva progetto %s" +msgstr "Progetto %s salvato" #: src/hugin/MainFrame.cpp:572 msgid "Save project file" @@ -720,7 +749,7 @@ #: src/hugin/MainFrame.cpp:574 msgid "Project files (*.pto)|*.pto|All files (*)|*" -msgstr "files di progetto (*.pto)|*.pto|All files (*)|*" +msgstr "File progetto (*.pto)|*.pto|Tutti i file (*)|*" #: src/hugin/MainFrame.cpp:595 msgid "Save PTStitcher script file" @@ -728,11 +757,11 @@ #: src/hugin/MainFrame.cpp:597 msgid "PTStitcher files (*.txt)|*.txt" -msgstr "Files di PTStitcher (*.txt)|*.txt" +msgstr "File di PTStitcher (*.txt)|*.txt" #: src/hugin/MainFrame.cpp:626 msgid "Open project: " -msgstr "Apri progetto:" +msgstr "Apri progetto: " #: src/hugin/MainFrame.cpp:638 msgid "Project opened" @@ -740,7 +769,7 @@ #: src/hugin/MainFrame.cpp:648 msgid "Error opening project: " -msgstr "Errore nell'aprire il progetto" +msgstr "Errore nell'aprire il progetto: " #: src/hugin/MainFrame.cpp:680 msgid "Open project file" @@ -751,8 +780,8 @@ "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files " "(*)|*" msgstr "" -"Files progetto (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files " -"(*)|*" +"File progetto (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|Tutti i " +"file (*)|*" #: src/hugin/MainFrame.cpp:696 msgid "Open project: cancel" @@ -765,6 +794,9 @@ "BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg)|*." "jpg;*.JPG;*.jpeg;*.JPEG|All files (*)|*" msgstr "" +"Tutti file immagini|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;" +"*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|File JPEG (*.jpg,*.jpeg)|*." +"jpg;*.JPG;*.jpeg;*.JPEG|Tutti i file (*)|*" #: src/hugin/MainFrame.cpp:725 src/hugin/wxPanoCommand.cpp:304 #: src/hugin/wxPanoCommand.cpp:370 @@ -777,18 +809,18 @@ #: src/hugin/MainFrame.cpp:1125 msgid "Choose template project" -msgstr "" +msgstr "Scelta modello progetto" #: src/hugin/MainFrame.cpp:1177 msgid "Fine-tuning all points" -msgstr "Ricalibra tutti i punti " +msgstr "Regolazione precisa di tutti i punti " #: src/hugin/MainFrame.cpp:1179 msgid "Finetuning" -msgstr "Calibrazione" +msgstr "Regolazione precisa" #: src/hugin/MainFrame.cpp:1267 -#, fuzzy, c-format +#, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" "\n" @@ -802,113 +834,113 @@ "\n" "Use the Control Point list (F3) to see all point of the current project\n" msgstr "" -"%d punti calibrati, %d punti non modificati per corrispondenza " -"insufficiente\n" +"%d punti regolati precisamente, %d punti non modificati per corrispondenze " +"insufficienti\n" "\n" -"Hint: The errors of the fine-tuned points have been set to the, correlation " -"coefficient\n" -"Problematic point can be spotted (just after fine-tune, before optimizing)\n" -"by an error <= %.3f.\n" -"The error of points without a well defined peak (typically in regions with " -"uniform color)\n" -"will be set to 0\n" +"Suggerimento: gli errori dei punti di regolazione precisa sono stati " +"impostati al coefficiente di correlazione\n" +"I punti problematici possono essere rilevati (subito dopo la regolazione, " +"prima dell'ottimizzazione)\n" +"con un errore <= %.3f.\n" +"Gli errori dei punti senza un picco ben definito (di solito in regioni con " +"colori uniformi)\n" +"saranno impostati a zero\n" "\n" -"Use the Control Point list (F3) to see all point of the current project\n" +"Usare l'elenco Punto di controllo (F3) per visualizzare tutti i punti del " +"progetto attuale.\n" #: src/hugin/MainFrame.cpp:1269 msgid "Fine-tune result" -msgstr "Risultato calibrazione" +msgstr "Risultati regolazione precisa" #: src/hugin/MyExternalCmdExecDialog.cpp:62 src/hugin/PanoPanel.cpp:724 msgid "ShellExecuteEx failed" -msgstr "ShellExecuteEx fallito" +msgstr "ShellExecuteEx fallita" #: src/hugin/MyExternalCmdExecDialog.cpp:100 msgid "CreateProcess Error" -msgstr "CreateProcess Error" +msgstr "Errore CreateProcess" #: src/hugin/MyExternalCmdExecDialog.cpp:115 -#, fuzzy, c-format +#, c-format msgid "Running %s" -msgstr "Enblend in esecuzione" +msgstr "Esecuzione di %s" #: src/hugin/MyExternalCmdExecDialog.cpp:115 -#, fuzzy msgid "You can watch the enblend progress in the command window" msgstr "" -"Enblend impiegher\xE0 del tempo a terminare il panorama\n" -"e' possibile sorvegliare il processo nella finestra di comando" +"È possibile visualizzare l'avanzamento di enblend nella finestra dei comandi" #: src/hugin/MyExternalCmdExecDialog.cpp:119 msgid "" "Could not execute enblend, system() failed: \n" "Command was :" msgstr "" -"Enblend non eseguito, system() failed: \n" -"Il comando era :" +"Impossibile eseguire enblend, system() fallita:\n" +"Il comando era: " #: src/hugin/MyExternalCmdExecDialog.cpp:120 msgid "Error returned was :" -msgstr "L'errore riportato e' :" +msgstr "Errore restituito: " #: src/hugin/MyProgressDialog.cpp:36 msgid "Elapsed time : " -msgstr "Tempo trascorso :" +msgstr "Tempo trascorso: " #: src/hugin/NonaStitcherPanel.cpp:307 msgid "Stitching Panorama" -msgstr "Stitching del Panorama" +msgstr "Assemblatura panorama" #: src/hugin/NonaStitcherPanel.cpp:344 msgid "" "Out of memory.\n" "Try again with a smaller panorama image size\n" msgstr "" +"Memoria esaurita.\n" +"Provare con un'immagine panoramica più piccola\n" #: src/hugin/NonaStitcherPanel.cpp:345 src/hugin/NonaStitcherPanel.cpp:350 -#, fuzzy msgid "Error during stitching" -msgstr "Errore durante lo Stitching" +msgstr "Errore durante l'assemblatura" #: src/hugin/NonaStitcherPanel.cpp:365 msgid "Select enblend.exe" -msgstr "Seleziona Enblend.exe" +msgstr "Seleziona enblend.exe" #: src/hugin/NonaStitcherPanel.cpp:373 msgid "No enblend.exe selected" -msgstr "Non hai selezionato il percorso di Enblend.exe" +msgstr "Nessun enblend.exe selezionato" #: src/hugin/NonaStitcherPanel.cpp:384 msgid "Select enblend commandline tool" -msgstr "Imposta una linea di comando per Enblend" +msgstr "Imposta uno strumento a riga di comando enblend" #: src/hugin/NonaStitcherPanel.cpp:392 msgid "No enblend commandline tool selected" -msgstr "Non e' stato impostato alcun comando per Enblend" +msgstr "Nessun strumento a riga di comando enblend selezionato" #: src/hugin/NonaStitcherPanel.cpp:433 -#, fuzzy msgid "" "Can not call enblend with a command line > 32766 characters.\n" "This is a Windows limitation\n" "Please use less images, or place the images in a folder with\n" "a shorter pathname" msgstr "" -"La linea di comando per Autopano e' troppo lunga > 2000 caratteri.\n" -"E' un limite di Windows.\n" -"Usare meno immagini, un nome piu' breve per l'immagine\n" -"finale, un percorso path piu' corto nell'HD." +"Impossibile invocare enblend con una riga di comando maggiore di 32766 " +"caratteri.\n" +"È una limitazione di Windows.\n" +"Usare meno immagini o posizionare le immagini in una cartella\n" +"con un percorso minore" #: src/hugin/NonaStitcherPanel.cpp:451 msgid "enblend error" -msgstr "errore in Enblend" +msgstr "Errore di enblend" #: src/hugin/NonaStitcherPanel.cpp:525 src/hugin/PTStitcherPanel.cpp:310 msgid "gamma must be a number" msgstr "Il valore gamma deve essere numerico" #: src/hugin/OptimizePanel.cpp:553 -#, fuzzy msgid "" "Optimizer run finished.\n" "WARNING: a very small Field of View (v) has been estimated\n" @@ -921,15 +953,15 @@ "\n" "Apply the changes anyway?" msgstr "" -"Otttimizzazione completata.\n" -"ATTENZIONE: e' stato stimato un angolo di campo (v) molto piccolo\n" +"Ottimizzazione completata.\n" +"Attenzione: è stato stimato un campo inquadrato molto piccolo\n" "\n" -"I risultati sono probabilmente scorretti.\n" -"Ottimizzate (v) solo per panorami completi, con piu' punti di controllo.\n" +"I risultati non sono probabilmente validi.\n" +"L'ottimizzazione del campo inquadrato di panorami parziali può portare a " +"risultati non corretti.\n" +"Provare ad aggiungere più immagini e punti di controllo.\n" "\n" -"The Field of View (v) can sometimes be optimized for partial panoramas as " -"well,\n" -"when the images are already aligned well." +"Applicare le modifiche in ogni caso?" #: src/hugin/OptimizePanel.cpp:556 #, c-format @@ -948,6 +980,19 @@ "\n" "Apply the changes anyway?" msgstr "" +"Ottimizzazione completata.\n" +"Risultati:\n" +" distanza media punti di controllo: %f\n" +" deviazione standard: %f\n" +" massimo: %f\n" +"\n" +"Attenzione: sono stati stimati coefficienti di distorsione molto elevati.\n" +"I risultati probabilmente non sono validi.\n" +"Ottimizzare i parametri di distorsione solo quando sono usati punti di " +"controllo ben distanziati.\n" +"Reimpostare i parametri a zero e aggiungere ulteriori punti di controllo\n" +"\n" +"Applicare le modifiche in ogni caso?" #: src/hugin/OptimizePanel.cpp:560 #, c-format @@ -962,23 +1007,23 @@ msgstr "" "Ottimizzazione completata.\n" "Risultati:\n" -" distanza media tra punti di controllo: %f\n" +" distanza media punti di controllo: %f\n" " deviazione standard: %f\n" -" distanza massima: %f\n" +" massimo: %f\n" "\n" -"Applicare i cambiamenti?" +"Applicare le modifiche in ogni caso?" #: src/hugin/OptimizePanel.cpp:565 msgid "Optimisation result" -msgstr "" +msgstr "Risultati ottimizzazione" #: src/hugin/PanoDruid.cpp:43 msgid "The druid has no advice." -msgstr "Il Druido scuote la testa." +msgstr "L'assistente non ha alcun consiglio." #: src/hugin/PanoDruid.cpp:53 src/hugin/PanoDruid.cpp:423 msgid "The druid finds no problems with your panorama." -msgstr "Il druido non ha rilevato problemi nel tuo panorama." +msgstr "L'assistente non ha rilevato alcun problema nel panorama." #: src/hugin/PanoDruid.cpp:54 src/hugin/PanoDruid.cpp:424 msgid "" @@ -986,12 +1031,12 @@ "such as the GNU Image Manipulation Program (the GIMP)\n" "to add any finishing touches." msgstr "" -"Assembla ora l'immagine panoramica finale, usa poi un editor\n" -"di immagini come GIMP per fare gli ultimi ritocchi." +"Assemblare ora l'immagine panoramica finale, usare poi un editor\n" +"di immagini come GIMP per fare gli ultimi ritocchi.\n" #: src/hugin/PanoDruid.cpp:63 src/hugin/PanoDruid.cpp:443 msgid "Warning: you haven't saved the current project." -msgstr "Attenzione: il progetto corrente non e' stato salvato." +msgstr "Attenzione: il progetto attuale non è stato salvato." #: src/hugin/PanoDruid.cpp:64 src/hugin/PanoDruid.cpp:444 msgid "" @@ -999,16 +1044,15 @@ "don't forget to save your project file so you can\n" "experiment or adjust the settings later." msgstr "" -"Quando tutto sembra pronto per lo stitch,\n" -"non dimenticare di salvare il file di progetto\n" -"per poter correggere i valori in un secondo tempo." +"Quando tutto sembra pronto per l'assemblatura,\n" +"non dimenticarsi di salvare il file del progetto\n" +"per poter regolare i valori in un secondo tempo." #: src/hugin/PanoDruid.cpp:73 src/hugin/PanoDruid.cpp:439 msgid "Warning: current stitch has huge dimensions." -msgstr "Attenzione : il file da assemblare ha dimensioni considerevoli." +msgstr "Attenzione: il file da assemblare ha dimensioni considerevoli." #: src/hugin/PanoDruid.cpp:74 -#, fuzzy msgid "" "Very large pixel dimensions are currently entered.\n" "Some computers may take an excessively long time\n" @@ -1018,15 +1062,15 @@ "pixel dimensions which will give the best quality." msgstr "" "Le dimensioni in pixel impostate sono molto elevate.\n" -"Alcuni computer possono impiegere tempi biblici\n" -"per renderizzare un'immagine cosi' grande.\n" -"Per un risultato migliore usate il pulsante di calcolo\n" -"automatico nelle Opzioni Panorama per determinare\n" -"le dimensioni in pixel che daranno la qualit\xE0 migliore." +"Alcuni computer potrebbero impiegare molto tempo\n" +"per rendere un'immagine così grande.\n" +"Per un risultato migliore usare il pulsante di calcolo\n" +"automatico nelle opzioni per determinare le dimensioni\n" +"in pixel che daranno la qualità migliore." #: src/hugin/PanoDruid.cpp:104 src/hugin/PanoDruid.cpp:435 msgid "The Horizontal Field of View (HFOV) may be too low." -msgstr "L' Angolo di campo orizzontale (HFOV) potrebbe essere troppo piccolo" +msgstr "L'angolo di campo orizzontale (HFOV) potrebbe essere troppo basso." #: src/hugin/PanoDruid.cpp:105 src/hugin/PanoDruid.cpp:436 msgid "" @@ -1037,17 +1081,16 @@ "5 and 120 degrees per image unless using specialized\n" "lenses." msgstr "" -"Controllare che le lunghezze focali e/o hfov di ogni\n" -"immagine siano corrispondenti.\n" -"Poi ricalcolare l'angolo di campo visibile.\n" -"HFOV e' espresso in gradi, di solito tra 5 e 120\n" -"gradi per immagine, salvo l'uso di ottiche particolari." +"Controllare che le lunghezze focali e/o HFOV di ogni\n" +"immagine siano corretti per le impostazioni della fotocamera.\n" +"Quindi calcolare il campo inquadrato nuovamente.\n" +"HFOV è misurato in gradi d'arco, di solito tra 5 e 120\n" +"gradi per immagine, a meno che non siano usate ottiche\n" +"particolari." #: src/hugin/PanoDruid.cpp:114 msgid "Consider adding a vertical or horizontal guide." -msgstr "" -"Si consideri se e' il caso di aggiungere dei riferimenti verticali o " -"orizzontali." +msgstr "Considerare l'aggiunta di una guida verticale od orizzontale." #: src/hugin/PanoDruid.cpp:115 msgid "" @@ -1056,14 +1099,14 @@ "appear vertical in the final result. A horizontal\n" "guide can help ensure that a horizon does not bend." msgstr "" -"Aggiungendo riferimenti verticali, l'optimizer assicura\n" -"la verticalit\xE0 di edifici, alberi ecc. nell'immagine finale\n" -"Un riferimento orizzontale puo' aiutare a correggere\n" -"la linea dell'orizzonte." +"Aggiungendo riferimenti verticali, l'ottimizzatore assicura\n" +"la verticalità di edifici, alberi o altro nell'immagine finale.\n" +"Un riferimento orizzontale può aiutare affinché l'orizzonte\n" +"non risulti inclinato." #: src/hugin/PanoDruid.cpp:137 msgid "Run the Optimizer to estimate the image positions." -msgstr "Ottimizza per stimare il posizionamento delle immagini." +msgstr "Eseguire l'ottimizzatore per stimare le posizioni dell'immagine." #: src/hugin/PanoDruid.cpp:138 msgid "" @@ -1072,15 +1115,15 @@ "\n" "The optimizer can be invoked in the Optimizer tab.\n" msgstr "" -"L' Optimizer si basa sui punti di contollo per stimare\n" -"le posizioni delle immagini bel panorama finale\n" +"L'ottimizzatore si basa sui punti di controllo per stimare\n" +"le posizioni delle immagini nel panorama finale\n" "\n" -"L'optimizer puo' essere richiamato nel pannello Optimizer.\n" +"L'ottimizzatore può essere richiamato nella scheda Ottimizzatore.\n" #: src/hugin/PanoDruid.cpp:165 msgid "Add more control points to improve the stitch quality." msgstr "" -"Aggiungere piu' punti di controllo per aumentare la qualit\xE0 del risultato." +"Aggiungere più punti di controllo per aumentare la qualità del risultato." #: src/hugin/PanoDruid.cpp:166 msgid "" @@ -1091,11 +1134,11 @@ "Per migliorare i risultati ci dovrebbero essere almeno\n" "quattro coppie di punti di controllo per ogni coppia\n" "di immagini. Un numero maggiore di punti, accuratamente\n" -"posizionati, migliorer\xE0 la sovrapposizione." +"posizionati, migliorerà la corrispondenza." #: src/hugin/PanoDruid.cpp:184 msgid "At least one image has no control points at all." -msgstr "Almeno una immagine e' priva di punti di controllo." +msgstr "Almeno un'immagine è priva di punti di controllo." #: src/hugin/PanoDruid.cpp:185 msgid "" @@ -1105,8 +1148,8 @@ msgstr "" "Per migliorare i risultati ci dovrebbero essere almeno\n" "quattro coppie di punti di controllo per ogni coppia\n" -"di immagini. Un'immagine senza punti di controllo non\n" -"puo' essere posizionata." +"di immagini. Un'immagine senza punti di controllo non \n" +"può essere allineata." #: src/hugin/PanoDruid.cpp:203 msgid "Add stitching control points to each pair of images." @@ -1119,10 +1162,10 @@ "tab, add pairs of points that correspond to identical\n" "visual features in each pair of overlapping images." msgstr "" -"L' Optimizer si basa sui punti di contollo per posizionare\n" -"ed unire le immagini nel migliore dei modi. Nel pannello\n" -"dei punti di controllo, si aggiungano coppie di punti che\n" -"indichino luoghi di sovrapposizione tra immagini contigue." +"L'ottimizzatore si basa sui punti di controllo per posizionare\n" +"e unire le immagini nel migliore dei modi. Nella scheda Punti\n" +"di controllo, aggiungere coppie di punti che corrispondano a\n" +"caratteristiche identiche per ogni immagini sovrapposta." #: src/hugin/PanoDruid.cpp:213 src/hugin/PanoDruid.cpp:431 msgid "Add at least one more image." @@ -1130,25 +1173,25 @@ #: src/hugin/PanoDruid.cpp:214 src/hugin/PanoDruid.cpp:432 msgid "You should have at least two files listed in the Images tab." -msgstr "E' necesario avere almeno due files selezionati nella tab immagini." +msgstr "È necessario avere almeno due file presenti nella scheda Immagini." #: src/hugin/PanoDruid.cpp:228 src/hugin/PanoDruid.cpp:427 msgid "To get started, add some image files." -msgstr "Per cominciare, aggiungere delle immagini da file." +msgstr "Per iniziare, aggiungere delle immagini." #: src/hugin/PanoDruid.cpp:229 src/hugin/PanoDruid.cpp:428 msgid "You can add any number of images using the Images tab." msgstr "" -"E' possibile aggiungere immagini in qualsiasi numero, usando il pannello " -"immagini" +"È possibile aggiungere un numero qualsiasi di immagini utilizzando la scheda " +"Immagini." #: src/hugin/PanoDruid.cpp:276 msgid "the Panorama druid" -msgstr "il druido Panoramix" +msgstr "L'assistente panoramico" #: src/hugin/PanoDruid.cpp:420 msgid "The druid has no advice at this time." -msgstr "Il Druido non sa che pesci pigliare, stavolta." +msgstr "L'assistente non ha alcun consiglio da dare." #: src/hugin/PanoDruid.cpp:440 msgid "" @@ -1160,34 +1203,33 @@ "pixel dimensions which will give the best quality." msgstr "" "Le dimensioni in pixel impostate sono molto elevate.\n" -"Alcuni computer possono impiegere tempi biblici\n" -"per renderizzare un'immagine cosi' grande.\n" -"Per un risultato migliore usate il pulsante di calcolo\n" -"automatico nelle Opzioni Panorama per determinare\n" -"le dimensioni in pixel che daranno la qualit\xE0 migliore." +"Alcuni computer potrebbero impiegare molto tempo\n" +"per rendere un'immagine così grande.\n" +"Per un risultato migliore usare il pulsante di calcolo\n" +"automatico nelle opzioni, per determinare le dimensioni\n" +"in pixel che daranno la qualità migliore." #: src/hugin/PanoPanel.cpp:307 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." -msgstr "" +msgstr "Valore HFOV non valido. Il valore massimo per questa proiezione è %lf." #: src/hugin/PanoPanel.cpp:338 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." -msgstr "" +msgstr "Valore VFOV non valido. Il valore massimo per questa proiezione è %lf." #: src/hugin/PanoPanel.cpp:384 msgid "width needs to be an integer bigger than 0" -msgstr "la larghezza deve essere un intero maggiore di 0" +msgstr "La larghezza deve essere un intero maggiore di 0" #: src/hugin/PanoPanel.cpp:401 -#, fuzzy msgid "height needs to be an integer bigger than 0" -msgstr "la larghezza deve essere un intero maggiore di 0" +msgstr "L'altezza deve essere un intero maggiore di 0" #: src/hugin/PanoPanel.cpp:666 msgid "Create panorama image" -msgstr "Crea l'immagine panoramica" +msgstr "Crea immagine panoramica" #: src/hugin/PanoPanel.cpp:681 #, c-format @@ -1196,31 +1238,34 @@ "\n" "Overwrite?" msgstr "" +"Il file %s esiste già\n" +"\n" +"Sovrascriverlo?" #: src/hugin/PanoPanel.cpp:682 msgid "Overwrite file?" -msgstr "" +msgstr "Sovrascrivere file?" +# (ndt) intende la lingua del programma #: src/hugin/PreferencesDialog.cpp:124 msgid "System default" -msgstr "default di sistema" +msgstr "Predefinita di sistema" #: src/hugin/PreferencesDialog.cpp:127 -#, fuzzy msgid "Catalan" -msgstr "Italiano" +msgstr "Catalano" #: src/hugin/PreferencesDialog.cpp:130 msgid "Chinese (Simplified)" -msgstr "" +msgstr "Cinese (semplificato)" #: src/hugin/PreferencesDialog.cpp:133 msgid "Czech" -msgstr "" +msgstr "Ceco" #: src/hugin/PreferencesDialog.cpp:136 msgid "Dutch" -msgstr "" +msgstr "Olandese" #: src/hugin/PreferencesDialog.cpp:139 msgid "English" @@ -1236,7 +1281,7 @@ #: src/hugin/PreferencesDialog.cpp:148 msgid "Hungarian" -msgstr "" +msgstr "Ungherese" #: src/hugin/PreferencesDialog.cpp:151 msgid "Italian" @@ -1244,7 +1289,7 @@ #: src/hugin/PreferencesDialog.cpp:154 msgid "Japanese" -msgstr "" +msgstr "Giapponese" #: src/hugin/PreferencesDialog.cpp:157 msgid "Polish" @@ -1252,36 +1297,36 @@ #: src/hugin/PreferencesDialog.cpp:160 msgid "Portuguese (Brazilian)" -msgstr "" +msgstr "Portoghese (brasiliano)" #: src/hugin/PreferencesDialog.cpp:163 msgid "Russian" -msgstr "" +msgstr "Russo" #: src/hugin/PreferencesDialog.cpp:166 msgid "Slovak" -msgstr "" +msgstr "Slovacco" #: src/hugin/PreferencesDialog.cpp:169 msgid "Spanish" -msgstr "" +msgstr "Spagnolo" #: src/hugin/PreferencesDialog.cpp:172 msgid "Swedish" -msgstr "" +msgstr "Svedese" #: src/hugin/PreferencesDialog.cpp:175 msgid "Ukrainian" -msgstr "" +msgstr "Ucraino" +# (ndt) titolo #: src/hugin/PreferencesDialog.cpp:253 msgid "Select PTStitcher" -msgstr "Seleziona PTStitcher.exe" +msgstr "Seleziona PTStitcher" #: src/hugin/PreferencesDialog.cpp:272 -#, fuzzy msgid "Select image editor" -msgstr "coppia succ." +msgstr "Seleziona editor immagini" #: src/hugin/PreferencesDialog.cpp:289 msgid "Select Enblend" @@ -1292,9 +1337,8 @@ msgstr "Seleziona Autopano" #: src/hugin/PreferencesDialog.cpp:321 -#, fuzzy msgid "Select Autopano-SIFT" -msgstr "Seleziona Autopano" +msgstr "Seleziona Autopano-SIFT" #: src/hugin/PreferencesDialog.cpp:324 msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd" @@ -1302,7 +1346,7 @@ #: src/hugin/PreferencesDialog.cpp:363 msgid "Panotools details" -msgstr "Panotools, dettagli." +msgstr "Dettagli Panotools" #: src/hugin/PreferencesDialog.cpp:745 msgid "Unknown Version" @@ -1310,11 +1354,11 @@ #: src/hugin/PreferencesDialog.cpp:755 msgid "Really reset displayed preferences to default values?" -msgstr "" +msgstr "Ripristinare le preferenze visualizzate ai valori predefiniti?" #: src/hugin/PreferencesDialog.cpp:755 src/hugin/xrc/pref_dialog.xrs:95 msgid "Load Defaults" -msgstr "Carica Defaults" +msgstr "Carica predefiniti" #: src/hugin/PreviewFrame.cpp:110 msgid "Panorama preview" @@ -1322,36 +1366,37 @@ #: src/hugin/PreviewFrame.cpp:125 msgid "displayed images" -msgstr "immagini visibili" +msgstr "Immagini visualizzate" #: src/hugin/PreviewFrame.cpp:160 msgid "VFOV" msgstr "VFOV" +# (ndt) suggerimento su un controllo scorrevole #: src/hugin/PreviewFrame.cpp:164 msgid "drag to change the vertical field of view" -msgstr "trascina per cambiare l'angolo di campo vert." +msgstr "Trascinare per modificare il campo inquadrato verticalmente" #: src/hugin/PreviewFrame.cpp:173 msgid "HFOV" msgstr "HFOV" +# (ndt) suggerimento su un controllo scorrevole #: src/hugin/PreviewFrame.cpp:178 msgid "drag to change the horizontal field of view" -msgstr "trascina per cambiare l'angolo di campo orizz." +msgstr "Trascinare per modificare il campo inquadrato orizzontale" #: src/hugin/PreviewFrame.cpp:189 msgid "Preview Options" -msgstr "Opzioni Anteprima" +msgstr "Opzioni anteprima" #: src/hugin/PreviewFrame.cpp:192 src/hugin/xrc/pano_panel.xrs:2 -#, fuzzy msgid "projection (f):" -msgstr "Approssimazione (f)" +msgstr "Proiezione:" #: src/hugin/PreviewFrame.cpp:235 msgid "Blend mode:" -msgstr "Unione:" +msgstr "Modalità unione:" #: src/hugin/PreviewFrame.cpp:241 msgid "difference" @@ -1359,70 +1404,68 @@ #: src/hugin/PreviewFrame.cpp:257 msgid "Output:" -msgstr "" +msgstr "Output:" #: src/hugin/PreviewFrame.cpp:262 msgid "LDR" -msgstr "" +msgstr "LDR" #: src/hugin/PreviewFrame.cpp:263 src/hugin/xrc/nona_panel.xrs:20 msgid "HDR" -msgstr "" +msgstr "HDR" #: src/hugin/PreviewFrame.cpp:275 msgid "EV:" -msgstr "" +msgstr "EV:" #: src/hugin/PreviewFrame.cpp:288 src/hugin/PreviewFrame.cpp:322 msgid "0" msgstr "0" #: src/hugin/PreviewFrame.cpp:308 -#, fuzzy msgid "Projection Parameters" -msgstr "Parametri di correzione obiettivo" +msgstr "Parametri di proiezione" #: src/hugin/PreviewFrame.cpp:317 msgid "param:" -msgstr "" +msgstr "Parametro:" +# (ndt) sarebbe da tenere il più corto possibile... #: src/hugin/PreviewFrame.cpp:349 src/hugin/PreviewPanel.cpp:663 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" +"Clic sinistro definisce nuovo punto centrale, destro sposta il punto " +"all'orizzonte." #: src/hugin/PreviewFrame.cpp:384 src/hugin/PreviewFrame.cpp:499 -#, fuzzy msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" -"Imposta Yaw e Pitch col tasto sx. Usa il tasto dx per impostare il Roll" +"Centra il panorama col pulsante sinistro, imposta l'orizzonte col destro" #: src/hugin/PreviewFrame.cpp:614 msgid "Rectilinear" -msgstr "Rettilineare" +msgstr "Rettilinea" #: src/hugin/PreviewFrame.cpp:615 msgid "Cylindrical" msgstr "Cilindrica" #: src/hugin/PreviewFrame.cpp:713 -#, fuzzy msgid "Yaw value must be numeric." -msgstr "Il valore deve essere numerico" +msgstr "Il valore dell'imbardata deve essere numerico." #: src/hugin/PreviewFrame.cpp:719 -#, fuzzy msgid "Pitch value must be numeric." -msgstr "Il valore deve essere numerico" +msgstr "Il valore dell'inclinazione deve essere numerico." #: src/hugin/PreviewFrame.cpp:725 -#, fuzzy msgid "Roll value must be numeric." -msgstr "Il valore deve essere numerico" +msgstr "Il valore del rollio deve essere numerico." #: src/hugin/PreviewPanel.cpp:467 msgid "Error during Stitching" -msgstr "Errore durante lo Stitching" +msgstr "Errore durante l'assemblatura" #: src/hugin/PTStitcherPanel.cpp:279 msgid "Bicubic" @@ -1471,11 +1514,14 @@ "\n" "Do you want to continue anyway?" msgstr "" +"PTStitcher non supporta nomi di file con un carattere punto (.).\n" +"Salvare i progetti in una directory senza un punto nel nome.\n" +"\n" +"Continuare?" #: src/hugin/PTStitcherPanel.cpp:451 -#, fuzzy msgid "PTStitcher problem" -msgstr "nota PTStitcher" +msgstr "Problema di PTStitcher" #: src/hugin/PTStitcherPanel.cpp:460 msgid "PTStitcher.exe does not support QTVR output on Windows and Linux" @@ -1483,25 +1529,23 @@ #: src/hugin/PTStitcherPanel.cpp:460 msgid "PTStitcher note" -msgstr "nota PTStitcher" +msgstr "Nota PTStitcher" #: src/hugin/PTStitcherPanel.cpp:481 msgid "Select PTStitcher.exe" -msgstr "Cerca PTStitcher.exe" +msgstr "Seleziona PTStitcher.exe" #: src/hugin/PTStitcherPanel.cpp:489 msgid "No PTStitcher.exe selected" -msgstr "Non hai selezionato il percorso di PTStitcher.exe" +msgstr "Nessun PTStitcher.exe selezionato" #: src/hugin/PTStitcherPanel.cpp:498 -#, fuzzy msgid "Select PTStitcher commandline tool" -msgstr "Imposta una linea di comando per Enblend" +msgstr "Seleziona strumento riga di comando PTStitcher" #: src/hugin/PTStitcherPanel.cpp:506 -#, fuzzy msgid "No PTStitcher commandline tool selected" -msgstr "Non e' stato impostato alcun comando per Enblend" +msgstr "Nessun strumento a riga di comando PTStitcher selezionato" #: src/hugin/PTStitcherPanel.cpp:518 msgid "" @@ -1512,10 +1556,16 @@ "\n" "Continue anyway?" msgstr "" +"Attenzione: PTmender (da panotools 2.9 o superiore) supporta solamente " +"l'output TIFF_m.\n" +"Per la regolazione del colore e della luminosità, il file risultante deve " +"essere processato con PTblender.\n" +"\n" +"Continuare?" #: src/hugin/PTStitcherPanel.cpp:519 msgid "PTmender creates only plain TIFF_m files" -msgstr "" +msgstr "PTmender crea solamente file TIFF_m normali" #: src/hugin/RunStitcherFrame.cpp:127 msgid "Failed to launch the PTStitcher." @@ -1523,55 +1573,55 @@ #: src/hugin/RunStitcherFrame.cpp:141 msgid "Could not obtain PTStitcher output" -msgstr "PTStitcher output non ottenuto" +msgstr "Impossibile ottenere l'output di PTStitcher" #: src/hugin/RunStitcherFrame.cpp:270 msgid "" "Stitching failed\n" "PTStitcher exited with nonzero error code." msgstr "" -"Stitching fallito\n" -"PTStitcher exited with nonzero error code\n" -"cazzi tuoi." +"Assemblatura fallita\n" +"PTStitcher è uscito con un codice di errore diverso da zero." #: src/hugin/RunStitcherFrame.cpp:271 -#, fuzzy, c-format +#, c-format msgid "Error executing %s" -msgstr "Errore di esecuzione PTStitcher.exe" +msgstr "Errore nell'eseguire %s" #: src/hugin/LocalizedFileTipProvider.cpp:48 msgid "Tips not available, sorry!" -msgstr "" +msgstr "Suggerimenti non disponibili." #: src/hugin/VigCorrDialog.cpp:174 -#, fuzzy msgid "Select flatfield image" -msgstr "Scelglere punto in immagine sx" +msgstr "Scegliere immagine flatfield" #: src/hugin/VigCorrDialog.cpp:267 msgid "Error: could not find flatfile image file." -msgstr "" +msgstr "Errore: impossibile trovare immagine flatfile." #: src/hugin/VigCorrDialog.cpp:267 -#, fuzzy msgid "File not found" -msgstr "Immagine non trovata" +msgstr "File non trovato" #: src/hugin/wxPanoCommand.cpp:188 -#, fuzzy, c-format +#, c-format msgid "" "Could not decode image:\n" "%s\n" "Abort" -msgstr "Dimensioni immagine sconosciute" +msgstr "" +"Impossibile decodificare l'immagine:\n" +"%s\n" +"Terminato" #: src/hugin/wxPanoCommand.cpp:188 msgid "Unsupported image file format" -msgstr "" +msgstr "Formato immagine non supportato" #: src/hugin/wxPanoCommand.cpp:224 msgid "Could not read image size" -msgstr "Dimensioni immagine sconosciute" +msgstr "Impossibile leggere la dimensione dell'immagine" #: src/hugin/wxPanoCommand.cpp:297 #, c-format @@ -1582,7 +1632,7 @@ msgstr "" "Immagine non trovata:\n" "%s\n" -"Scegli l'immagine giusta" +"Selezionare l'immagine corretta" #: src/hugin/wxPanoCommand.cpp:297 msgid "Image file not found" @@ -1594,6 +1644,9 @@ "BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg)|*.jpg;*." "JPG;*.jpeg;*.jpg|All files (*)|*" msgstr "" +"Tutti i file immagine|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*." +"bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|File JPEG (*.jpg)|*.jpg;" +"*.JPG;*.jpeg;*.jpg|Tutti i file (*)|*" #: src/hugin/wxPanoCommand.cpp:428 #, c-format @@ -1601,72 +1654,71 @@ "Error, template expects %d images,\n" "current project contains %d images\n" msgstr "" +"Errore, il modello attende %d immagini,\n" +"il progetto attuale ne contiene %d\n" #: src/hugin/wxPanoCommand.cpp:429 src/hugin/wxPanoCommand.cpp:455 -#, fuzzy msgid "Could not apply template" -msgstr "Numero non leggibile" +msgstr "Impossibile applicare il modello" #: src/hugin/wxPanoCommand.cpp:455 -#, fuzzy msgid "Error loading project file" -msgstr "Errore nell'aprire il progetto" +msgstr "Errore nel caricare il progetto" #: src/include/hugin/MyProgressDialog.h:98 msgid "Optimizing Panorama" -msgstr "Ottimizzazione del Panorama" +msgstr "Ottimizzazione del panorama" #: src/hugin/xrc/assistant_panel.xrs:1 -#, fuzzy msgid "1. Load images..." -msgstr "Caricamento immagine %s" +msgstr "1. Carica immagini..." #: src/hugin/xrc/assistant_panel.xrs:2 msgid "load a series of photos" -msgstr "" +msgstr "Carica una serie di fotografie" #: src/hugin/xrc/assistant_panel.xrs:3 msgid "no images loaded" -msgstr "" +msgstr "Nessuna immagine caricata" #: src/hugin/xrc/assistant_panel.xrs:4 msgid "Automatic (use EXIF data)" -msgstr "" +msgstr "Automatico (usare dati EXIF)" #: src/hugin/xrc/assistant_panel.xrs:5 src/hugin/xrc/assistant_panel.xrs:24 msgid "Lens type:" -msgstr "Tipo di obiettivo" +msgstr "Tipo obiettivo:" #: src/hugin/xrc/assistant_panel.xrs:11 src/hug... [truncated message content] |
From: <ip...@us...> - 2007-12-06 21:41:46
|
Revision: 2552 http://hugin.svn.sourceforge.net/hugin/?rev=2552&view=rev Author: ippei Date: 2007-12-06 13:41:39 -0800 (Thu, 06 Dec 2007) Log Message: ----------- Mac: compile fix Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h hugin/trunk/src/hugin1/base_wx/platform.cpp hugin/trunk/src/hugin1/base_wx/platform.h Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2007-12-06 18:00:07 UTC (rev 2551) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2007-12-06 21:41:39 UTC (rev 2552) @@ -42,7 +42,6 @@ 57E3472B0C4A8EB6006AA781 /* PBXTargetDependency */, 57E347270C4A8EB6006AA781 /* PBXTargetDependency */, 57E3472D0C4A8EB6006AA781 /* PBXTargetDependency */, - 57E347250C4A8EB6006AA781 /* PBXTargetDependency */, 57E347230C4A8EB6006AA781 /* PBXTargetDependency */, 57E347210C4A8EB6006AA781 /* PBXTargetDependency */, 57E3471F0C4A8EB6006AA781 /* PBXTargetDependency */, @@ -120,7 +119,6 @@ 57023BA20C42816A008A44D6 /* PTScriptParsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */; }; 57023BA30C42816A008A44D6 /* SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EEE10C32AE100043F754 /* SrcPanoImage.h */; }; 57023D980C428BF6008A44D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 57023D9A0C428C26008A44D6 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F7450C30202B00736343 /* libboost_thread.a */; }; 57023D9D0C428C4B008A44D6 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; 57023D9E0C428C4B008A44D6 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; 57023D9F0C428C4B008A44D6 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; @@ -202,7 +200,6 @@ 57525A4D0C54BCEA00BF8096 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; 57525A4E0C54BCEA00BF8096 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; 57525A4F0C54BCEA00BF8096 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 57525A500C54BCEA00BF8096 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F7450C30202B00736343 /* libboost_thread.a */; }; 57525A510C54BCEA00BF8096 /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; 57525A520C54BCEA00BF8096 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 57525A530C54BCEA00BF8096 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; @@ -216,6 +213,25 @@ 57525A5B0C54BCEA00BF8096 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; 57525A5C0C54BCEA00BF8096 /* libhuginapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhuginapp.a */; }; 57525A5D0C54BCEA00BF8096 /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */; }; + 57565A4D0D088CFD00344F55 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A3F0D088CFD00344F55 /* ImageCache.cpp */; }; + 57565A4E0D088CFD00344F55 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A400D088CFD00344F55 /* ImageCache.h */; }; + 57565A4F0D088CFD00344F55 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A410D088CFD00344F55 /* MyExternalCmdExecDialog.cpp */; }; + 57565A500D088CFD00344F55 /* MyExternalCmdExecDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A420D088CFD00344F55 /* MyExternalCmdExecDialog.h */; }; + 57565A510D088CFD00344F55 /* MyProgressDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A430D088CFD00344F55 /* MyProgressDialog.cpp */; }; + 57565A520D088CFD00344F55 /* MyProgressDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A440D088CFD00344F55 /* MyProgressDialog.h */; }; + 57565A530D088CFD00344F55 /* PTWXDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A450D088CFD00344F55 /* PTWXDlg.cpp */; }; + 57565A540D088CFD00344F55 /* PTWXDlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A460D088CFD00344F55 /* PTWXDlg.h */; }; + 57565A550D088CFD00344F55 /* Plot2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A470D088CFD00344F55 /* Plot2D.cpp */; }; + 57565A560D088CFD00344F55 /* Plot2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A480D088CFD00344F55 /* Plot2D.h */; }; + 57565A570D088CFD00344F55 /* huginConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A490D088CFD00344F55 /* huginConfig.cpp */; }; + 57565A580D088CFD00344F55 /* huginConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A4A0D088CFD00344F55 /* huginConfig.h */; }; + 57565A590D088CFD00344F55 /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A4B0D088CFD00344F55 /* platform.cpp */; }; + 57565A5A0D088CFD00344F55 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A4C0D088CFD00344F55 /* platform.h */; }; + 57565A650D088DAD00344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */; }; + 57565A660D088DAD00344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */; }; + 57565A740D088EA600344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */; }; + 57565A7C0D088F2E00344F55 /* ComputeImageROI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A790D088F2E00344F55 /* ComputeImageROI.cpp */; }; + 57565A7D0D088F2E00344F55 /* ComputeImageROI.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A7A0D088F2E00344F55 /* ComputeImageROI.h */; }; 5759D9C20C3271640043F754 /* Command.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B50C3271640043F754 /* Command.h */; }; 5759D9C30C3271640043F754 /* CommandHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B60C3271640043F754 /* CommandHistory.h */; }; 5759D9C40C3271640043F754 /* DocumentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B70C3271640043F754 /* DocumentData.h */; }; @@ -319,19 +335,6 @@ 5771F75B0C30205600736343 /* ransac.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7380C301FC100736343 /* ransac.h */; }; 5771F75C0C30205600736343 /* tiffUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7390C301FC100736343 /* tiffUtils.h */; }; 5771F75D0C30205600736343 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F73A0C301FC100736343 /* utils.h */; }; - 5771F75E0C30206600736343 /* barrier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709209A12DE400FAF325 /* barrier.cpp */; }; - 5771F75F0C30206600736343 /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709309A12DE400FAF325 /* condition.cpp */; }; - 5771F7600C30206600736343 /* exceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709409A12DE400FAF325 /* exceptions.cpp */; }; - 5771F7610C30206600736343 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709509A12DE400FAF325 /* mutex.cpp */; }; - 5771F7620C30206600736343 /* once.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709609A12DE400FAF325 /* once.cpp */; }; - 5771F7630C30206600736343 /* recursive_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709709A12DE400FAF325 /* recursive_mutex.cpp */; }; - 5771F7640C30206600736343 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709809A12DE400FAF325 /* thread.cpp */; }; - 5771F7650C30206600736343 /* tss_dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709909A12DE400FAF325 /* tss_dll.cpp */; }; - 5771F7660C30206600736343 /* tss_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709A09A12DE400FAF325 /* tss_hooks.cpp */; }; - 5771F7670C30206600736343 /* tss_null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709B09A12DE400FAF325 /* tss_null.cpp */; }; - 5771F7680C30206600736343 /* tss_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709C09A12DE400FAF325 /* tss_pe.cpp */; }; - 5771F7690C30206600736343 /* tss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709D09A12DE400FAF325 /* tss.cpp */; }; - 5771F76A0C30206600736343 /* xtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709E09A12DE400FAF325 /* xtime.cpp */; }; 5771F7C90C3021B000736343 /* Matrix3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C00C3021B000736343 /* Matrix3.h */; }; 5771F7CA0C3021B000736343 /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C10C3021B000736343 /* Vector3.h */; }; 5771F7CB0C3021B000736343 /* eig_jacobi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C20C3021B000736343 /* eig_jacobi.cpp */; }; @@ -411,11 +414,8 @@ 57E346A70C4A89E6006AA781 /* LensPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311F0C4A8859006AA781 /* LensPanel.cpp */; }; 57E346A90C4A89E6006AA781 /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331210C4A8859006AA781 /* LocalizedFileTipProvider.cpp */; }; 57E346AB0C4A89E6006AA781 /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331230C4A8859006AA781 /* MainFrame.cpp */; }; - 57E346AD0C4A89E6006AA781 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331260C4A8859006AA781 /* MyExternalCmdExecDialog.cpp */; }; - 57E346B10C4A89E6006AA781 /* NonaStitcherPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312A0C4A8859006AA781 /* NonaStitcherPanel.cpp */; }; 57E346B30C4A89E6006AA781 /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */; }; 57E346B50C4A89E6006AA781 /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312E0C4A8859006AA781 /* OptimizePhotometricPanel.cpp */; }; - 57E346B70C4A89E6006AA781 /* PTStitcherPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331300C4A8859006AA781 /* PTStitcherPanel.cpp */; }; 57E346BB0C4A89E6006AA781 /* PanoDruid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331340C4A8859006AA781 /* PanoDruid.cpp */; }; 57E346BD0C4A89E6006AA781 /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331360C4A8859006AA781 /* PanoPanel.cpp */; }; 57E346C10C4A89E6006AA781 /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */; }; @@ -447,7 +447,6 @@ 57E346EC0C4A8AC2006AA781 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; 57E346ED0C4A8AC2006AA781 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; 57E346EE0C4A8AC2006AA781 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 57E346EF0C4A8AE2006AA781 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F7450C30202B00736343 /* libboost_thread.a */; }; 57E346F00C4A8AE2006AA781 /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; 57E346F10C4A8AE2006AA781 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; 57E346F20C4A8AE2006AA781 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; @@ -463,14 +462,6 @@ 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 */; }; - 57E34A680C4ACB0F006AA781 /* Plot2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E34A660C4ACB0F006AA781 /* Plot2D.cpp */; }; - 57E34A690C4ACB0F006AA781 /* Plot2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E34A670C4ACB0F006AA781 /* Plot2D.h */; }; - 57E34A6C0C4ACB24006AA781 /* PTWXDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E34A6A0C4ACB24006AA781 /* PTWXDlg.cpp */; }; - 57E34A6D0C4ACB24006AA781 /* PTWXDlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E34A6B0C4ACB24006AA781 /* PTWXDlg.h */; }; - 57E34A720C4ACB39006AA781 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331180C4A8859006AA781 /* ImageCache.cpp */; }; - 57E34A730C4ACB39006AA781 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E331190C4A8859006AA781 /* ImageCache.h */; }; - 57E34A780C4ACB43006AA781 /* MyProgressDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331280C4A8859006AA781 /* MyProgressDialog.cpp */; }; - 57E34A790C4ACB43006AA781 /* MyProgressDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E331290C4A8859006AA781 /* MyProgressDialog.h */; }; 57E34AAA0C4ACBD6006AA781 /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331120C4A8859006AA781 /* CommandHistory.cpp */; }; 57E34AD90C4ACF51006AA781 /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */; }; 57E350F70C4BD48B006AA781 /* libhuginapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhuginapp.a */; }; @@ -821,13 +812,6 @@ remoteGlobalIDString = 5720E4720BD456CD00E63404; remoteInfo = levmar; }; - 5771F76B0C30206E00736343 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F7440C30202B00736343; - remoteInfo = boost_thread; - }; 579610B30C43C066006B7C6E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -895,7 +879,7 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5796FA730C4395CC006B7C6E /* tools nona */; + remoteGlobalIDString = 5796FA730C4395CC006B7C6E; remoteInfo = "tools nona"; }; 57A60E930C400272007B5462 /* PBXContainerItemProxy */ = { @@ -982,13 +966,6 @@ remoteGlobalIDString = 57C1705809A125DE00FAF325; remoteInfo = vigra_ext; }; - 57E347240C4A8EB6006AA781 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F7440C30202B00736343; - remoteInfo = boost_thread; - }; 57E347260C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1193,9 +1170,6 @@ 573C3861067C789F00A5DBE0 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = System/Library/Frameworks/System.framework; sourceTree = "<group>"; }; 573C3862067C789F00A5DBE0 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = "<group>"; }; 573E2E470B76AC8900E86281 /* howto.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = howto.txt; sourceTree = "<group>"; }; - 573E2E5B0B76ACDB00E86281 /* build_using_cmdline.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = build_using_cmdline.sh; sourceTree = "<group>"; }; - 573E2E5C0B76ACDB00E86281 /* build_using_cmdline.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = build_using_cmdline.txt; sourceTree = "<group>"; }; - 573E2E5D0B76ACDB00E86281 /* install2bundle.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = install2bundle.sh; sourceTree = "<group>"; }; 573E2E5F0B76AD0100E86281 /* HOWTO-autopanosift.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "HOWTO-autopanosift.txt"; sourceTree = "<group>"; }; 573E2E600B76AD0100E86281 /* ReadMe-HuginOSX.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "ReadMe-HuginOSX.txt"; sourceTree = "<group>"; }; 573F32B109F79B730088B333 /* accessor.hxx */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = accessor.hxx; sourceTree = "<group>"; }; @@ -1304,6 +1278,24 @@ 574F3EBC081FF2350086E561 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = "<group>"; }; 574F3F2E082005980086E561 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; 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>"; }; + 57565A400D088CFD00344F55 /* ImageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageCache.h; sourceTree = "<group>"; }; + 57565A410D088CFD00344F55 /* MyExternalCmdExecDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MyExternalCmdExecDialog.cpp; sourceTree = "<group>"; }; + 57565A420D088CFD00344F55 /* MyExternalCmdExecDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyExternalCmdExecDialog.h; sourceTree = "<group>"; }; + 57565A430D088CFD00344F55 /* MyProgressDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MyProgressDialog.cpp; sourceTree = "<group>"; }; + 57565A440D088CFD00344F55 /* MyProgressDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyProgressDialog.h; sourceTree = "<group>"; }; + 57565A450D088CFD00344F55 /* PTWXDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PTWXDlg.cpp; sourceTree = "<group>"; }; + 57565A460D088CFD00344F55 /* PTWXDlg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTWXDlg.h; sourceTree = "<group>"; }; + 57565A470D088CFD00344F55 /* Plot2D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Plot2D.cpp; sourceTree = "<group>"; }; + 57565A480D088CFD00344F55 /* Plot2D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Plot2D.h; sourceTree = "<group>"; }; + 57565A490D088CFD00344F55 /* huginConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = huginConfig.cpp; sourceTree = "<group>"; }; + 57565A4A0D088CFD00344F55 /* huginConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = huginConfig.h; sourceTree = "<group>"; }; + 57565A4B0D088CFD00344F55 /* platform.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = platform.cpp; sourceTree = "<group>"; }; + 57565A4C0D088CFD00344F55 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = platform.h; sourceTree = "<group>"; }; + 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_thread-mt-1_34_1.a"; path = "lib/libboost_thread-mt-1_34_1.a"; sourceTree = "<group>"; }; + 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>"; }; 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>"; }; @@ -1385,7 +1377,6 @@ 5771F7380C301FC100736343 /* ransac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ransac.h; sourceTree = "<group>"; }; 5771F7390C301FC100736343 /* tiffUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tiffUtils.h; sourceTree = "<group>"; }; 5771F73A0C301FC100736343 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; }; - 5771F7450C30202B00736343 /* libboost_thread.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboost_thread.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5771F77A0C30216F00736343 /* libhugin_math.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_math.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5771F7C00C3021B000736343 /* Matrix3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Matrix3.h; sourceTree = "<group>"; }; 5771F7C10C3021B000736343 /* Vector3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Vector3.h; sourceTree = "<group>"; }; @@ -1441,19 +1432,6 @@ 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTScriptParsing.h; sourceTree = "<group>"; }; 57B8C693083AB7F400283C06 /* localised.sh */ = {isa = PBXFileReference; fileEncoding = 30; languageSpecificationIdentifier = shell.sh; lastKnownFileType = text.script.sh; path = localised.sh; sourceTree = "<group>"; }; 57C1706C09A125DE00FAF325 /* libvigra_ext.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libvigra_ext.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 57C1709209A12DE400FAF325 /* barrier.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = barrier.cpp; sourceTree = "<group>"; }; - 57C1709309A12DE400FAF325 /* condition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = condition.cpp; sourceTree = "<group>"; }; - 57C1709409A12DE400FAF325 /* exceptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = exceptions.cpp; sourceTree = "<group>"; }; - 57C1709509A12DE400FAF325 /* mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mutex.cpp; sourceTree = "<group>"; }; - 57C1709609A12DE400FAF325 /* once.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = once.cpp; sourceTree = "<group>"; }; - 57C1709709A12DE400FAF325 /* recursive_mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = recursive_mutex.cpp; sourceTree = "<group>"; }; - 57C1709809A12DE400FAF325 /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = thread.cpp; sourceTree = "<group>"; }; - 57C1709909A12DE400FAF325 /* tss_dll.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tss_dll.cpp; sourceTree = "<group>"; }; - 57C1709A09A12DE400FAF325 /* tss_hooks.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tss_hooks.cpp; sourceTree = "<group>"; }; - 57C1709B09A12DE400FAF325 /* tss_null.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tss_null.cpp; sourceTree = "<group>"; }; - 57C1709C09A12DE400FAF325 /* tss_pe.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tss_pe.cpp; sourceTree = "<group>"; }; - 57C1709D09A12DE400FAF325 /* tss.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tss.cpp; sourceTree = "<group>"; }; - 57C1709E09A12DE400FAF325 /* xtime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = xtime.cpp; sourceTree = "<group>"; }; 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PTScriptParsing.cpp; sourceTree = "<group>"; }; 57C4868D0C31299E002D79F1 /* hugin_math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin_math.h; sourceTree = "<group>"; }; 57C486C50C312BA8002D79F1 /* Vector3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Vector3.cpp; sourceTree = "<group>"; }; @@ -1553,8 +1531,6 @@ 57E331150C4A8859006AA781 /* CropPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CropPanel.h; sourceTree = "<group>"; }; 57E331160C4A8859006AA781 /* HFOVDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HFOVDialog.cpp; sourceTree = "<group>"; }; 57E331170C4A8859006AA781 /* HFOVDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HFOVDialog.h; sourceTree = "<group>"; }; - 57E331180C4A8859006AA781 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; }; - 57E331190C4A8859006AA781 /* ImageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageCache.h; sourceTree = "<group>"; }; 57E3311A0C4A8859006AA781 /* ImageProcessing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageProcessing.h; sourceTree = "<group>"; }; 57E3311B0C4A8859006AA781 /* ImagesList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImagesList.cpp; sourceTree = "<group>"; }; 57E3311C0C4A8859006AA781 /* ImagesList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImagesList.h; sourceTree = "<group>"; }; @@ -1566,10 +1542,6 @@ 57E331220C4A8859006AA781 /* LocalizedFileTipProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LocalizedFileTipProvider.h; sourceTree = "<group>"; }; 57E331230C4A8859006AA781 /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; }; 57E331240C4A8859006AA781 /* MainFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MainFrame.h; sourceTree = "<group>"; }; - 57E331260C4A8859006AA781 /* MyExternalCmdExecDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MyExternalCmdExecDialog.cpp; sourceTree = "<group>"; }; - 57E331270C4A8859006AA781 /* MyExternalCmdExecDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyExternalCmdExecDialog.h; sourceTree = "<group>"; }; - 57E331280C4A8859006AA781 /* MyProgressDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MyProgressDialog.cpp; sourceTree = "<group>"; }; - 57E331290C4A8859006AA781 /* MyProgressDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyProgressDialog.h; sourceTree = "<group>"; }; 57E3312A0C4A8859006AA781 /* NonaStitcherPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NonaStitcherPanel.cpp; sourceTree = "<group>"; }; 57E3312B0C4A8859006AA781 /* NonaStitcherPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NonaStitcherPanel.h; sourceTree = "<group>"; }; 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OptimizePanel.cpp; sourceTree = "<group>"; }; @@ -1606,10 +1578,6 @@ 57E3467E0C4A89B0006AA781 /* Hugin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hugin.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57E347610C4A8F7D006AA781 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginwxutils.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 57E34A660C4ACB0F006AA781 /* Plot2D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Plot2D.cpp; sourceTree = "<group>"; }; - 57E34A670C4ACB0F006AA781 /* Plot2D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Plot2D.h; sourceTree = "<group>"; }; - 57E34A6A0C4ACB24006AA781 /* PTWXDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PTWXDlg.cpp; sourceTree = "<group>"; }; - 57E34A6B0C4ACB24006AA781 /* PTWXDlg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTWXDlg.h; sourceTree = "<group>"; }; 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>"; }; @@ -1653,7 +1621,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 57023D9A0C428C26008A44D6 /* libboost_thread.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1709,7 +1676,6 @@ 57525A4D0C54BCEA00BF8096 /* libIlmThread.a in Frameworks */, 57525A4E0C54BCEA00BF8096 /* libImath.a in Frameworks */, 57525A4F0C54BCEA00BF8096 /* libHalf.a in Frameworks */, - 57525A500C54BCEA00BF8096 /* libboost_thread.a in Frameworks */, 57525A510C54BCEA00BF8096 /* liblevmar.a in Frameworks */, 57525A520C54BCEA00BF8096 /* libjhead.a in Frameworks */, 57525A530C54BCEA00BF8096 /* libvigra_impex.a in Frameworks */, @@ -1723,6 +1689,7 @@ 57525A5B0C54BCEA00BF8096 /* libhugin_algorithms.a in Frameworks */, 57525A5C0C54BCEA00BF8096 /* libhuginapp.a in Frameworks */, 57525A5D0C54BCEA00BF8096 /* libhuginwxutils.a in Frameworks */, + 57565A660D088DAD00344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1802,6 +1769,7 @@ 5796FD9E0C43AC50006B7C6E /* libhugin_appbase.a in Frameworks */, 5796FD9F0C43AC50006B7C6E /* libhugin_nona.a in Frameworks */, 579610D20C43C541006B7C6E /* libhugin_algorithms.a in Frameworks */, + 57565A740D088EA600344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1831,7 +1799,6 @@ 57E346EC0C4A8AC2006AA781 /* libIlmThread.a in Frameworks */, 57E346ED0C4A8AC2006AA781 /* libImath.a in Frameworks */, 57E346EE0C4A8AC2006AA781 /* libHalf.a in Frameworks */, - 57E346EF0C4A8AE2006AA781 /* libboost_thread.a in Frameworks */, 57E346F00C4A8AE2006AA781 /* liblevmar.a in Frameworks */, 57E346F10C4A8AE2006AA781 /* libjhead.a in Frameworks */, 57E346F20C4A8AE2006AA781 /* libvigra_impex.a in Frameworks */, @@ -1845,6 +1812,7 @@ 57E346FA0C4A8AE2006AA781 /* libhugin_algorithms.a in Frameworks */, 57E350F70C4BD48B006AA781 /* libhuginapp.a in Frameworks */, 57E34AD90C4ACF51006AA781 /* libhuginwxutils.a in Frameworks */, + 57565A650D088DAD00344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1871,9 +1839,6 @@ 57B8C693083AB7F400283C06 /* localised.sh */, 573E2E440B76AC5100E86281 /* ExternalPrograms */, 573E2E5E0B76AD0100E86281 /* Documents */, - 573E2E5C0B76ACDB00E86281 /* build_using_cmdline.txt */, - 573E2E5B0B76ACDB00E86281 /* build_using_cmdline.sh */, - 573E2E5D0B76ACDB00E86281 /* install2bundle.sh */, ); name = mac; sourceTree = "<group>"; @@ -2105,7 +2070,6 @@ 573B8F3F067BA2F900B7B355 /* lib */ = { isa = PBXGroup; children = ( - 5771F7450C30202B00736343 /* libboost_thread.a */, 5771F8150C30268F00736343 /* libPTLensDB.a */, 5720E47A0BD456CD00E63404 /* liblevmar.a */, 5749F8A3067B60CA00A6EDD4 /* libjhead.a */, @@ -2178,6 +2142,7 @@ isa = PBXGroup; children = ( 570D581A082A9ED50030E768 /* enblend */, + 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */, 573B8F85067BAAB900B7B355 /* libpano13.a */, 577092FA06BD7388004058A1 /* libpng.a */, 577092FB06BD7388004058A1 /* libtiff.a */, @@ -2250,6 +2215,35 @@ name = test; sourceTree = "<group>"; }; + 57565A3D0D088CFD00344F55 /* base_wx */ = { + isa = PBXGroup; + children = ( + 57565A3F0D088CFD00344F55 /* ImageCache.cpp */, + 57565A400D088CFD00344F55 /* ImageCache.h */, + 57565A410D088CFD00344F55 /* MyExternalCmdExecDialog.cpp */, + 57565A420D088CFD00344F55 /* MyExternalCmdExecDialog.h */, + 57565A430D088CFD00344F55 /* MyProgressDialog.cpp */, + 57565A440D088CFD00344F55 /* MyProgressDialog.h */, + 57565A450D088CFD00344F55 /* PTWXDlg.cpp */, + 57565A460D088CFD00344F55 /* PTWXDlg.h */, + 57565A470D088CFD00344F55 /* Plot2D.cpp */, + 57565A480D088CFD00344F55 /* Plot2D.h */, + 57565A490D088CFD00344F55 /* huginConfig.cpp */, + 57565A4A0D088CFD00344F55 /* huginConfig.h */, + 57565A4B0D088CFD00344F55 /* platform.cpp */, + 57565A4C0D088CFD00344F55 /* platform.h */, + ); + path = base_wx; + sourceTree = "<group>"; + }; + 575670960D089B1F00344F55 /* stitch_project */ = { + isa = PBXGroup; + children = ( + 575670980D089B1F00344F55 /* hugin_stitch_project.cpp */, + ); + path = stitch_project; + sourceTree = "<group>"; + }; 5759D9B40C3271640043F754 /* appbase */ = { isa = PBXGroup; children = ( @@ -2462,6 +2456,8 @@ 5785A30C0C3BE6DD00DD8BD8 /* CalculateFOV.h */, 5785A30B0C3BE6DD00DD8BD8 /* CenterHorizontally.cpp */, 5785A30E0C3BE6DD00DD8BD8 /* CenterHorizontally.h */, + 57565A790D088F2E00344F55 /* ComputeImageROI.cpp */, + 57565A7A0D088F2E00344F55 /* ComputeImageROI.h */, 5785A39F0C3BED7F00DD8BD8 /* FitPanorama.cpp */, 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */, 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */, @@ -2503,51 +2499,6 @@ name = "Mac OS X"; sourceTree = "<group>"; }; - 57C1708E09A12D7500FAF325 /* boost */ = { - isa = PBXGroup; - children = ( - 57C1708F09A12D9300FAF325 /* libs */, - ); - name = boost; - path = ExternalPrograms/boost_1_34_0; - sourceTree = "<group>"; - }; - 57C1708F09A12D9300FAF325 /* libs */ = { - isa = PBXGroup; - children = ( - 57C1709009A12D9700FAF325 /* thread */, - ); - path = libs; - sourceTree = "<group>"; - }; - 57C1709009A12D9700FAF325 /* thread */ = { - isa = PBXGroup; - children = ( - 57C1709109A12DAF00FAF325 /* src */, - ); - path = thread; - sourceTree = "<group>"; - }; - 57C1709109A12DAF00FAF325 /* src */ = { - isa = PBXGroup; - children = ( - 57C1709209A12DE400FAF325 /* barrier.cpp */, - 57C1709309A12DE400FAF325 /* condition.cpp */, - 57C1709409A12DE400FAF325 /* exceptions.cpp */, - 57C1709509A12DE400FAF325 /* mutex.cpp */, - 57C1709609A12DE400FAF325 /* once.cpp */, - 57C1709709A12DE400FAF325 /* recursive_mutex.cpp */, - 57C1709809A12DE400FAF325 /* thread.cpp */, - 57C1709909A12DE400FAF325 /* tss_dll.cpp */, - 57C1709A09A12DE400FAF325 /* tss_hooks.cpp */, - 57C1709B09A12DE400FAF325 /* tss_null.cpp */, - 57C1709C09A12DE400FAF325 /* tss_pe.cpp */, - 57C1709D09A12DE400FAF325 /* tss.cpp */, - 57C1709E09A12DE400FAF325 /* xtime.cpp */, - ); - path = src; - sourceTree = "<group>"; - }; 57CCCC23086C9530000EBC4A /* attached */ = { isa = PBXGroup; children = ( @@ -2568,10 +2519,12 @@ 57E347610C4A8F7D006AA781 /* config.h */, 57E330D20C4A87F2006AA781 /* panoinc.h */, 57E330D30C4A87F2006AA781 /* panoinc_WX.h */, + 57565A3D0D088CFD00344F55 /* base_wx */, 57E32FBD0C4A87F1006AA781 /* common */, 57E32FAE0C4A87F1006AA781 /* PT */, 57E330FE0C4A8859006AA781 /* hugin */, 57E330BB0C4A87F2006AA781 /* nona_gui */, + 575670960D089B1F00344F55 /* stitch_project */, 57E330E70C4A87F2006AA781 /* tools */, 57E330F90C4A87F2006AA781 /* tools_vips */, 57E330D40C4A87F2006AA781 /* tests */, @@ -2730,8 +2683,6 @@ 57E331170C4A8859006AA781 /* HFOVDialog.h */, 57E3314F0C4A8859006AA781 /* huginApp.cpp */, 57E331500C4A8859006AA781 /* huginApp.h */, - 57E331180C4A8859006AA781 /* ImageCache.cpp */, - 57E331190C4A8859006AA781 /* ImageCache.h */, 57E3311A0C4A8859006AA781 /* ImageProcessing.h */, 57E3311B0C4A8859006AA781 /* ImagesList.cpp */, 57E3311C0C4A8859006AA781 /* ImagesList.h */, @@ -2743,10 +2694,6 @@ 57E331220C4A8859006AA781 /* LocalizedFileTipProvider.h */, 57E331230C4A8859006AA781 /* MainFrame.cpp */, 57E331240C4A8859006AA781 /* MainFrame.h */, - 57E331260C4A8859006AA781 /* MyExternalCmdExecDialog.cpp */, - 57E331270C4A8859006AA781 /* MyExternalCmdExecDialog.h */, - 57E331280C4A8859006AA781 /* MyProgressDialog.cpp */, - 57E331290C4A8859006AA781 /* MyProgressDialog.h */, 57E3312A0C4A8859006AA781 /* NonaStitcherPanel.cpp */, 57E3312B0C4A8859006AA781 /* NonaStitcherPanel.h */, 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */, @@ -2759,16 +2706,12 @@ 57E331350C4A8859006AA781 /* PanoDruid.h */, 57E331360C4A8859006AA781 /* PanoPanel.cpp */, 57E331370C4A8859006AA781 /* PanoPanel.h */, - 57E34A660C4ACB0F006AA781 /* Plot2D.cpp */, - 57E34A670C4ACB0F006AA781 /* Plot2D.h */, 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */, 57E3313B0C4A8859006AA781 /* PreferencesDialog.h */, 57E3313C0C4A8859006AA781 /* PreviewFrame.cpp */, 57E3313D0C4A8859006AA781 /* PreviewFrame.h */, 57E3313E0C4A8859006AA781 /* PreviewPanel.cpp */, 57E3313F0C4A8859006AA781 /* PreviewPanel.h */, - 57E34A6A0C4ACB24006AA781 /* PTWXDlg.cpp */, - 57E34A6B0C4ACB24006AA781 /* PTWXDlg.h */, 57E331400C4A8859006AA781 /* RunStitcherFrame.cpp */, 57E331410C4A8859006AA781 /* RunStitcherFrame.h */, 57E331420C4A8859006AA781 /* StitcherPanel.h */, @@ -2838,7 +2781,6 @@ 57E34AC90C4ACE1C006AA781 /* math.h */, 579D36060C0EFD4D00BFC58C /* src */, 57114E9E06BC2301004F4FA7 /* mac */, - 57C1708E09A12D7500FAF325 /* boost */, 5745FC05094E1D5400E6B672 /* External */, 57CCCC23086C9530000EBC4A /* attached */, 573B8F3E067BA2EB00B7B355 /* Product */, @@ -2962,13 +2904,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5771F7410C30202B00736343 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5771F7460C30204A00736343 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -3023,10 +2958,13 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 57E34A690C4ACB0F006AA781 /* Plot2D.h in Headers */, - 57E34A6D0C4ACB24006AA781 /* PTWXDlg.h in Headers */, - 57E34A730C4ACB39006AA781 /* ImageCache.h in Headers */, - 57E34A790C4ACB43006AA781 /* MyProgressDialog.h in Headers */, + 57565A4E0D088CFD00344F55 /* ImageCache.h in Headers */, + 57565A500D088CFD00344F55 /* MyExternalCmdExecDialog.h in Headers */, + 57565A520D088CFD00344F55 /* MyProgressDialog.h in Headers */, + 57565A540D088CFD00344F55 /* PTWXDlg.h in Headers */, + 57565A560D088CFD00344F55 /* Plot2D.h in Headers */, + 57565A580D088CFD00344F55 /* huginConfig.h in Headers */, + 57565A5A0D088CFD00344F55 /* platform.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3053,6 +2991,7 @@ 576EDDAA0C3FFF820076A417 /* ImageGraph.h in Headers */, 576EDDAC0C3FFF820076A417 /* PTOptimizer.h in Headers */, 576EDDAE0C3FFF820076A417 /* PhotometricOptimizer.h in Headers */, + 57565A7D0D088F2E00344F55 /* ComputeImageROI.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3326,22 +3265,6 @@ productReference = 5771F5D70C3006E900736343 /* libhugin_utils.a */; productType = "com.apple.product-type.library.static"; }; - 5771F7440C30202B00736343 /* boost_thread */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5771F76E0C30208F00736343 /* Build configuration list for PBXNativeTarget "boost_thread" */; - buildPhases = ( - 5771F7410C30202B00736343 /* Headers */, - 5771F7420C30202B00736343 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = boost_thread; - productName = boost_thread; - productReference = 5771F7450C30202B00736343 /* libboost_thread.a */; - productType = "com.apple.product-type.library.static"; - }; 5771F7790C30216F00736343 /* hugin_math */ = { isa = PBXNativeTarget; buildConfigurationList = 5771F7BA0C3021AD00736343 /* Build configuration list for PBXNativeTarget "hugin_math" */; @@ -3413,7 +3336,6 @@ ); dependencies = ( 5737BC410C4CF7E500A61778 /* PBXTargetDependency */, - 5771F76C0C30206E00736343 /* PBXTargetDependency */, ); name = vigra_ext; productName = vigra_impex; @@ -3507,7 +3429,6 @@ 5720E4720BD456CD00E63404 /* levmar */, 5771F8140C30268F00736343 /* PTLensDB */, 5749F8A2067B60CA00A6EDD4 /* jhead */, - 5771F7440C30202B00736343 /* boost_thread */, 57C1705809A125DE00FAF325 /* vigra_ext */, 5771F5D60C3006E900736343 /* hugin_utils */, 5771F7790C30216F00736343 /* hugin_math */, @@ -3727,26 +3648,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5771F7420C30202B00736343 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5771F75E0C30206600736343 /* barrier.cpp in Sources */, - 5771F75F0C30206600736343 /* condition.cpp in Sources */, - 5771F7600C30206600736343 /* exceptions.cpp in Sources */, - 5771F7610C30206600736343 /* mutex.cpp in Sources */, - 5771F7620C30206600736343 /* once.cpp in Sources */, - 5771F7630C30206600736343 /* recursive_mutex.cpp in Sources */, - 5771F7640C30206600736343 /* thread.cpp in Sources */, - 5771F7650C30206600736343 /* tss_dll.cpp in Sources */, - 5771F7660C30206600736343 /* tss_hooks.cpp in Sources */, - 5771F7670C30206600736343 /* tss_null.cpp in Sources */, - 5771F7680C30206600736343 /* tss_pe.cpp in Sources */, - 5771F7690C30206600736343 /* tss.cpp in Sources */, - 5771F76A0C30206600736343 /* xtime.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5771F7770C30216F00736343 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3802,11 +3703,8 @@ 57E346A70C4A89E6006AA781 /* LensPanel.cpp in Sources */, 57E346A90C4A89E6006AA781 /* LocalizedFileTipProvider.cpp in Sources */, 57E346AB0C4A89E6006AA781 /* MainFrame.cpp in Sources */, - 57E346AD0C4A89E6006AA781 /* MyExternalCmdExecDialog.cpp in Sources */, - 57E346B10C4A89E6006AA781 /* NonaStitcherPanel.cpp in Sources */, 57E346B30C4A89E6006AA781 /* OptimizePanel.cpp in Sources */, 57E346B50C4A89E6006AA781 /* OptimizePhotometricPanel.cpp in Sources */, - 57E346B70C4A89E6006AA781 /* PTStitcherPanel.cpp in Sources */, 57E346BB0C4A89E6006AA781 /* PanoDruid.cpp in Sources */, 57E346BD0C4A89E6006AA781 /* PanoPanel.cpp in Sources */, 57E346C10C4A89E6006AA781 /* PreferencesDialog.cpp in Sources */, @@ -3823,10 +3721,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 57E34A680C4ACB0F006AA781 /* Plot2D.cpp in Sources */, - 57E34A6C0C4ACB24006AA781 /* PTWXDlg.cpp in Sources */, - 57E34A720C4ACB39006AA781 /* ImageCache.cpp in Sources */, - 57E34A780C4ACB43006AA781 /* MyProgressDialog.cpp in Sources */, + 57565A4D0D088CFD00344F55 /* ImageCache.cpp in Sources */, + 57565A4F0D088CFD00344F55 /* MyExternalCmdExecDialog.cpp in Sources */, + 57565A510D088CFD00344F55 /* MyProgressDialog.cpp in Sources */, + 57565A530D088CFD00344F55 /* PTWXDlg.cpp in Sources */, + 57565A550D088CFD00344F55 /* Plot2D.cpp in Sources */, + 57565A570D088CFD00344F55 /* huginConfig.cpp in Sources */, + 57565A590D088CFD00344F55 /* platform.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3851,6 +3752,7 @@ 576EDDA90C3FFF820076A417 /* ImageGraph.cpp in Sources */, 576EDDAB0C3FFF820076A417 /* PTOptimizer.cpp in Sources */, 576EDDAD0C3FFF820076A417 /* PhotometricOptimizer.cpp in Sources */, + 57565A7C0D088F2E00344F55 /* ComputeImageROI.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4097,11 +3999,6 @@ target = 5720E4720BD456CD00E63404 /* levmar */; targetProxy = 576484140C46AF49003AFC2F /* PBXContainerItemProxy */; }; - 5771F76C0C30206E00736343 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F7440C30202B00736343 /* boost_thread */; - targetProxy = 5771F76B0C30206E00736343 /* PBXContainerItemProxy */; - }; 579610B40C43C066006B7C6E /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57EA83850C3A798A00E4965E /* algorithms */; @@ -4212,11 +4109,6 @@ target = 57C1705809A125DE00FAF325 /* vigra_ext */; targetProxy = 57E347220C4A8EB6006AA781 /* PBXContainerItemProxy */; }; - 57E347250C4A8EB6006AA781 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F7440C30202B00736343 /* boost_thread */; - targetProxy = 57E347240C4A8EB6006AA781 /* PBXContainerItemProxy */; - }; 57E347270C4A8EB6006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5749F8A2067B60CA00A6EDD4 /* jhead */; @@ -4705,6 +4597,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Nona; }; name = Debug; @@ -4733,6 +4630,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Nona; }; name = Development; @@ -4761,6 +4663,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Nona; }; name = "Development ZeroLink"; @@ -4789,6 +4696,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Nona; }; name = Release; @@ -4797,6 +4709,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", ); @@ -4808,6 +4721,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", ); @@ -4819,6 +4733,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", ); @@ -4830,6 +4745,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", ); @@ -5233,34 +5149,6 @@ }; name = "Development ZeroLink"; }; - 5771F76F0C30208F00736343 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = boost_thread; - }; - name = Debug; - }; - 5771F7700C30208F00736343 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = boost_thread; - }; - name = Development; - }; - 5771F7710C30208F00736343 /* Development ZeroLink */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = boost_thread; - }; - name = "Development ZeroLink"; - }; - 5771F7720C30208F00736343 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = boost_thread; - }; - name = Release; - }; 5771F7BB0C3021AD00736343 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -5349,7 +5237,11 @@ ../src/hugin_base, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona; }; name = Debug; @@ -5363,6 +5255,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona; }; name = Development; @@ -5375,7 +5272,11 @@ ../src/hugin_base, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona; }; name = "Development ZeroLink"; @@ -5388,7 +5289,11 @@ ../src/hugin_base, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = nona; }; name = Release; @@ -5533,6 +5438,11 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Hugin; }; name = Debug; @@ -5560,6 +5470,11 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Hugin; }; name = Development; @@ -5587,6 +5502,11 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Hugin; }; name = "Development ZeroLink"; @@ -5615,6 +5535,11 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = Hugin; }; name = Release; @@ -6063,17 +5988,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 5771F76E0C30208F00736343 /* Build configuration list for PBXNativeTarget "boost_thread" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5771F76F0C30208F00736343 /* Debug */, - 5771F7700C30208F00736343 /* Development */, - 5771F7710C30208F00736343 /* Development ZeroLink */, - 5771F7720C30208F00736343 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 5771F7BA0C3021AD00736343 /* Build configuration list for PBXNativeTarget "hugin_math" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2007-12-06 18:00:07 UTC (rev 2551) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2007-12-06 21:41:39 UTC (rev 2552) @@ -307,12 +307,12 @@ void MyExecDialog::OnProcessTerminated(MyPipedProcess *process, int pid, int status) { // show the rest of the output - wxString stderr, stdout; - while ( process->HasInput(stdout, stderr) ) { - if (stdout.length() > 0) AddToOutput(stdout); - if (stderr.length() > 0) AddToOutput(stderr); - stdout.clear(); - stderr.clear(); + wxString my_stderr, my_stdout; + while ( process->HasInput(my_stdout, my_stderr) ) { + if (my_stdout.length() > 0) AddToOutput(my_stdout); + if (my_stderr.length() > 0) AddToOutput(my_stderr); + my_stdout.clear(); + my_stderr.clear(); } RemoveAsyncProcess(process); @@ -340,7 +340,7 @@ // MyPipedProcess // ---------------------------------------------------------------------------- -bool MyPipedProcess::HasInput(wxString & stdout, wxString & stderr) +bool MyPipedProcess::HasInput(wxString & my_stdout, wxString & my_stderr) { bool hasInput = false; @@ -350,8 +350,8 @@ // this assumes that the output is always line buffered wxString msg; - //msg << m_cmd << _T(" (stdout): ") << tis.ReadLine(); - stdout << tis.ReadLine(); + //msg << m_cmd << _T(" (my_stdout): ") << tis.ReadLine(); + my_stdout << tis.ReadLine(); // m_parent->GetLogListBox()->Append(msg); @@ -365,7 +365,7 @@ // this assumes that the output is always line buffered wxString msg; //msg << m_cmd << _T(" (stderr): ") << tis.ReadLine(); - stderr << tis.ReadLine(); + my_stderr << tis.ReadLine(); // m_parent->GetLogListBox()->Append(msg); Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2007-12-06 18:00:07 UTC (rev 2551) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2007-12-06 21:41:39 UTC (rev 2552) @@ -138,7 +138,7 @@ virtual void OnTerminate(int pid, int status); - virtual bool HasInput(wxString & stdout, wxString & stderr); + virtual bool HasInput(wxString& my_stdout, wxString& my_stderr); }; Modified: hugin/trunk/src/hugin1/base_wx/platform.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.cpp 2007-12-06 18:00:07 UTC (rev 2551) +++ hugin/trunk/src/hugin1/base_wx/platform.cpp 2007-12-06 21:41:39 UTC (rev 2552) @@ -24,11 +24,10 @@ * */ -#include <config.h> - -#include "panoinc.h" #include "platform.h" +#include <CoreFoundation/CFBundle.h> +#include <hugin_utils/utils.h> #ifdef __WXMAC__ wxString MacGetPathTOBundledResourceFile(CFStringRef filename) Modified: hugin/trunk/src/hugin1/base_wx/platform.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.h 2007-12-06 18:00:07 UTC (rev 2551) +++ hugin/trunk/src/hugin1/base_wx/platform.h 2007-12-06 21:41:39 UTC (rev 2552) @@ -30,8 +30,8 @@ #include "panoinc_WX.h" #ifdef __WXMAC__ -#include <CoreFoundation/CFBundle.h> -#include "wx/mac/private.h" +#include <CoreFoundation/CFString.h> +#include <wx/mac/private.h> wxString MacGetPathTOBundledResourceFile(CFStringRef filename); wxString MacGetPathTOBundledExecutableFile(CFStringRef filename); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-12-14 09:31:16
|
Revision: 2563 http://hugin.svn.sourceforge.net/hugin/?rev=2563&view=rev Author: dangelo Date: 2007-12-14 01:31:08 -0800 (Fri, 14 Dec 2007) Log Message: ----------- updates for compiling with MSVC, and building an installer with Warsetup Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindPANO13.cmake hugin/trunk/src/deghosting/hugin_hdrmerge.cpp hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp hugin/trunk/src/hugin1/base_wx/huginConfig.cpp hugin/trunk/src/hugin1/hugin/CMakeLists.txt hugin/trunk/src/hugin1/hugin/PanoPanel.cpp hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp hugin/trunk/src/hugin1/hugin/config_defaults.h hugin/trunk/src/hugin1/hugin/huginApp.cpp hugin/trunk/src/hugin1/hugin/huginApp.h hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp hugin/trunk/src/hugin_config.h.in.cmake hugin/trunk/src/tools/autooptimiser.cpp hugin/trunk/src/tools/fulla.cpp hugin/trunk/src/tools/nona.cpp hugin/trunk/src/tools/vig_optimize.cpp Added Paths: ----------- hugin/trunk/CMakeModules/win_bundle.cmake hugin/trunk/platforms/windows/msi/hugin.warsetup Removed Paths: ------------- hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/CMakeLists.txt 2007-12-14 09:31:08 UTC (rev 2563) @@ -10,6 +10,18 @@ set(V_MAJOR 0) set(V_MINOR 7) set(V_PATCH 0) +# TODO: automatically set the revision on windows +IF(WIN32) + set(HUGIN_WC_REVISION 0) +ELSE (WIN32) + FIND_PACKAGE(Subversion) + IF(Subversion_FOUND) + Subversion_WC_INFO(${PROJECT_SOURCE_DIR} HUGIN) + MESSAGE("Current revision is ${HUGIN_WC_REVISION}") + ELSE(Subversion_FOUND) + SET(HUGIN_WC_REVISION 0) + ENDIF(Subversion_FOUND) +ENDIF(WIN32) # version for internal libraries. set(HUGIN_LIB_VERSION 0.0) @@ -22,6 +34,9 @@ FIND_PACKAGE(PkgConfig) ENDIF (UNIX) + + +IF (WIN32) ## ## The directory that contains the hugin source root is a good ## place to look for support packages, so post it in cache. @@ -34,6 +49,16 @@ # create the cache entry SET( SOURCE_BASE_DIR ${work} CACHE FILEPATH "parent dir of hugin source root" ) +# search boost there +SET(CMAKE_INCLUDE_PATH ${SOURCE_BASE_DIR}/boost_1_34_1) +SET(Boost_LIB_PREFIX lib) +SET(Boost_LIB_SUFFIX vc71-mt vc80-mt) +SET(Boost_LIB_SUFFIX_DEBUG vc71-mt-gd vc80-mt-gd) +SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxMSW-2.8.6) + + +ENDIF(WIN32) + ## ## wxWidgets ## @@ -123,23 +148,18 @@ ENDIF(UNIX) ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") -#IF(UNIX) -# SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall" CACHE) -# SET(CMAKE_C_FLAGS_RELEASE "-O2 -Wall" CACHE) -# SET(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 -Wall -DDEBUG" qCACHE) -# SET(CMAKE_C_FLAGS_DEBUG "-g3 -O0 -Wall -DDEBUG" CACHE) -#ENDIF(UNIX) +# define destination dirs (relative to prefix) +SET(HUGINDATADIR share/hugin) +SET(DATADIR share) +SET(BINDIR bin) +SET(LOCALEDIR share/locale) +SET(ICONDIR share/icons) +SET(LINKDIR share/applications) +SET(LIBDIR lib${LIB_SUFFIX}) +SET(INSTALL_XRC_DIR ${CMAKE_INSTALL_PREFIX}/share/hugin/xrc) + IF (UNIX) - # define destination dirs (relative to prefix) - SET(HUGINDATADIR share/hugin) - SET(DATADIR share) - SET(BINDIR bin) - SET(LOCALEDIR share/locale) - SET(ICONDIR share/icons) - SET(LINKDIR share/applications) - SET(LIBDIR lib${LIB_SUFFIX}) - SET(INSTALL_XRC_DIR ${CMAKE_INSTALL_PREFIX}/share/hugin/xrc) IF (${HUGIN_SHARED}) # use shared internal libraries @@ -147,17 +167,28 @@ ENDIF (${HUGIN_SHARED}) MESSAGE("Using shared libraries") ELSE (UNIX) - # Windows - SET(BINDIR ${CMAKE_INSTALL_PREFIX}) - SET(DATADIR ${CMAKE_INSTALL_PREFIX}) - SET(HUGINDATADIR ${CMAKE_INSTALL_PREFIX}) - SET(LIBDIR ${CMAKE_INSTALL_PREFIX}) - SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) # no shared libs DLL on windows. The code is just # not set up for that.. ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) + # Windows installer packaging related stuff + # unfortunately, CMake/CPack does not support Warsetup directly. + # prepare files here... + IF(WIN32) + # install into place in build-dir + SET( CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/FILES CACHE FILEPATH "install prefix" FORCE) + + INCLUDE (win_bundle) + + # copy installer files + CONFIGURE_FILE(platforms/windows/msi/WixFragmentRegistry.wxs ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/WixFragmentRegistry.wxs COPYONLY) + CONFIGURE_FILE(platforms/windows/msi/hugin.warsetup ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/hugin.warsetup) + CONFIGURE_FILE(platforms/windows/msi/top_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/top_banner.bmp) + CONFIGURE_FILE(platforms/windows/msi/big_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/big_banner.bmp) + ENDIF(WIN32) + + IF (MSVC) # Stop MSVC8 from bitching about the C library ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) @@ -209,6 +240,7 @@ LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} ) + add_subdirectory(src) add_subdirectory(doc) Modified: hugin/trunk/CMakeModules/FindPANO13.cmake =================================================================== --- hugin/trunk/CMakeModules/FindPANO13.cmake 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/CMakeModules/FindPANO13.cmake 2007-12-14 09:31:08 UTC (rev 2563) @@ -24,7 +24,7 @@ # code will also find them in pano13 or in pano13/lib, and # with names pano13 or pano13d. FIND_LIBRARY(PANO13_LIBRARIES - NAMES Panotools pano13 + NAMES pano13 PATHS /usr/lib /usr/local/lib ${PANO13_INCLUDE_DIR}/pano13/Release ${SOURCE_BASE_DIR}/pano13/lib Added: hugin/trunk/CMakeModules/win_bundle.cmake =================================================================== --- hugin/trunk/CMakeModules/win_bundle.cmake (rev 0) +++ hugin/trunk/CMakeModules/win_bundle.cmake 2007-12-14 09:31:08 UTC (rev 2563) @@ -0,0 +1,50 @@ + +IF(WIN32) + + # copy installer files + CONFIGURE_FILE(platforms/windows/msi/WixFragmentRegistry.wxs ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/WixFragmentRegistry.wxs COPYONLY) + CONFIGURE_FILE(platforms/windows/msi/hugin.warsetup ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/hugin.warsetup ) + CONFIGURE_FILE(platforms/windows/msi/top_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/top_banner.bmp COPYONLY) + CONFIGURE_FILE(platforms/windows/msi/big_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/big_banner.bmp COPYONLY) + + # find the path to enblend and panotools build directories + # and copy required binaries into hugin installation folder + FIND_PATH(PANO13_EXE_DIR PTmender.exe + ${SOURCE_BASE_DIR}/libpano/pano13/tools + ${SOURCE_BASE_DIR}/libpano/pano13/tools/Release + DOC "Location of pano13 executables" + NO_DEFAULT_PATH) + FILE(GLOB PANO13_EXECUTABLES ${PANO13_EXE_DIR}/*.exe) + INSTALL(FILES ${PANO13_EXECUTABLES} DESTINATION ${BINDIR}) + + # TODO: install documentation for panotools? + + FIND_PATH(ENBLEND_EXE_DIR enblend.exe + ${SOURCE_BASE_DIR}/enblend-3.1 + DOC "Location of enblend executables" + NO_DEFAULT_PATH + ) + FILE(GLOB ENBLEND_EXECUTABLES ${ENBLEND_EXE_DIR}/*.exe) + SET(ENBLEND_DOC_FILES ${ENBLEND_EXE_DIR}/AUTHORS + ${ENBLEND_EXE_DIR}/ChangeLog + ${ENBLEND_EXE_DIR}/COPYING + ${ENBLEND_EXE_DIR}/INSTALL + ${ENBLEND_EXE_DIR}/NEWS + ${ENBLEND_EXE_DIR}/README + ${ENBLEND_EXE_DIR}/READMEWIN + ${ENBLEND_EXE_DIR}/TODO + ${ENBLEND_EXE_DIR}/VIGRA_LICENSE) + + INSTALL(FILES ${ENBLEND_EXECUTABLES} DESTINATION ${BINDIR}) + INSTALL(FILES ${ENBLEND_DOC_FILES} DESTINATION doc/enblend) + + # install make + FIND_PATH(MAKE_EXE_DIR make.exe + ${SOURCE_BASE_DIR}/tools/ + ${SOURCE_BASE_DIR}/make/ + DOC "Location of GNU make executable" + NO_DEFAULT_PATH) + INSTALL(FILES ${MAKE_EXE_DIR}/make.exe DESTINATION ${BINDIR}) + +ENDIF(WIN32) + Deleted: hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup =================================================================== --- hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/platforms/windows/msi/hugin 0.7 beta 4.warsetup 2007-12-14 09:31:08 UTC (rev 2563) @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<WarSetup-Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" projectName="hugin" projectUuid="5a8e802a-894f-4b11-988a-bc966ce021c0" projectUpgradeUuid="a8245656-ca56-43a9-a642-f0e3e4da47a0" projectVersion="0.7.0.4" projectOrganization="hugin" projectMustBeAdministratorToInstall="false" project64BitTarget="false" projectTargetDirectory="C:\Documents and Settings\John\Desktop\Hugin Setup" projectTargetName="hugin 0.7 beta 4 Win Setup" projectType="0" projectUserInterface="WixUI_FeatureTree" projectLicense="GNU General Public License (GPL) 2.0"> - <projectFeatures featureId="HUGINFEATURE" featureName="hugin" featureDescription="The complete hugin package, including panorama tools suite and nona" configurableDirectory="APPLICATIONFOLDER" configurableDirectoryDefaultPath="[ProjectName]" enableInDefaultInstall="true" enableInMinimalInstall="true" excludeFromBuild="false"> - <childFeatures featureId="ENBLENDFEATURE" featureName="Enblend" featureDescription="Image blending with multiresolution splines" enableInDefaultInstall="true" enableInMinimalInstall="true" excludeFromBuild="false"> - <defaultInstallMode>3</defaultInstallMode> - <directories dirId="ENBLENDDIRECTORY" srcPath=".\FILES\enblend" dstPath="enblend" patterns=".*" excludePatterns="" recurse="true" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> - <pathComponent componentId="ID497055DE5088861E71FB85D6F1D71C01" componentGuid="fe489b5c-d51d-4ab4-9a10-7aa3cef52f18" /> - </directories> - </childFeatures> - <components componentId="IDBF4899A74E15532C8301A5EA0BB1C71A" componentGuid="1411189e-d988-42b1-a303-817c19a2f49c"> - <componentFiles fileId="ID_58fe01e0_611f_4fd6_a5c1_16e42e8d159e" srcName="AUTHORS.txt" srcDirectory=".\FILES" dstName="AUTHORS.txt" dstPath="" isComModule="false" typelibGuid="" menuName="AUTHORS" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID74B87E265F3F9B9CA107E61132D005D6" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="ID6E398BC7A76B2B4498B3661E5BE17A58" componentGuid="64ec7935-952d-4af2-80e8-d9d4c388e022"> - <componentFiles fileId="ID_dcb7b614_6df6_4a42_832d_8e406aa75158" srcName="autooptimiser.exe" srcDirectory=".\FILES" dstName="autooptimiser.exe" dstPath="" isComModule="false" typelibGuid="" menuName="autooptimiser" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID52FA3D9EEA852B02CD53AF7C41DC163E" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="IDB1654923AA84D4832AC7AE5825B0F9F9" componentGuid="066d8d90-4689-4874-9528-4f029f809d86"> - <componentFiles fileId="ID_92c71837_6947_4f89_896c_ac35dd5902f6" srcName="ChangeLog" srcDirectory=".\FILES" dstName="ChangeLog" dstPath="" isComModule="false" typelibGuid="" menuName="ChangeLog" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="IDED5FFAA90892C4A3C5E888CA3326A163" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="ID210012EBDB2835A34420C2821FE200E4" componentGuid="aa2f47e8-89f5-41f2-a224-d1a416a18bf5"> - <componentFiles fileId="ID_15dfa904_a1fc_45e7_811a_7f229991d6ad" srcName="fulla.exe" srcDirectory=".\FILES" dstName="fulla.exe" dstPath="" isComModule="false" typelibGuid="" menuName="fulla" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="IDA2AD5AD67D8E8F10CB7A6686C499358D" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="ID7C319EF3F0A196B70A3B77E64843B8D9" componentGuid="37bd6cb8-766e-4030-a8df-0682eb6bfec1"> - <componentFiles fileId="HUGINEXECUTABLE" srcName="hugin.exe" srcDirectory=".\FILES" dstName="hugin.exe" dstPath="" isComModule="false" typelibGuid="" menuName="hugin" shortcutInProgramFilesMenu="true" shortcutOnDesktop="true" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription="GUI for panorama tools suite
 and some included programs"> - <service StartWhenInstalled="true" Remove="both" id="ID1E6153524ED691E865C0324F8B286436" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="ID5B5ACB9A77C30DBB991101CC4A1E302A" componentGuid="edb7c923-c6db-4ab5-9630-e82bacfca62b"> - <componentFiles fileId="ID_6e37eba2_e8a0_4c04_acd3_db335b6ac198" srcName="hugin.nsi" srcDirectory=".\FILES" dstName="hugin.nsi" dstPath="" isComModule="false" typelibGuid="" menuName="hugin" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID5F531008ECFE965913D3669A59BD1AE4" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="IDFF36E688A16C91889B2F8F6C1C514E42" componentGuid="4bd5af7f-f44e-4827-aecf-8fc2cc588e41"> - <componentFiles fileId="ID_688dbc52_2768_4e3e_8d4e_6123648056e7" srcName="LICENCE.txt" srcDirectory=".\FILES" dstName="LICENCE.txt" dstPath="" isComModule="false" typelibGuid="" menuName="LICENCE" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID87099F7DDF91453A7A1FC639690811B0" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="IDE08D724ADA7E41B330C3A109909E15C6" componentGuid="93f5a10f-6cb6-44ba-8ccc-1e2c15edad40"> - <componentFiles fileId="ID_26253371_0299_4ae5_917c_a4abd5817a6b" srcName="LICENCE_JHEAD.txt" srcDirectory=".\FILES" dstName="LICENCE_JHEAD.txt" dstPath="" isComModule="false" typelibGuid="" menuName="LICENCE_JHEAD" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="IDD5EE9915D60CA7B7D5F0B279B68B62E3" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="IDF59A88A5FA3B91DA7DDC061EED41CC12" componentGuid="4f2f48d9-1733-49ef-af5c-f8e17b094b6e"> - <componentFiles fileId="ID_dfd60d20_e27c_4627_b939_8eed99e8e268" srcName="LICENCE_VIGRA.txt" srcDirectory=".\FILES" dstName="LICENCE_VIGRA.txt" dstPath="" isComModule="false" typelibGuid="" menuName="LICENCE_VIGRA" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID816D5250724105755FA4DFAA956BA029" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="IDAC295338BB774B2290C96FFEC57B5292" componentGuid="5b969a15-7519-4799-b7e3-19b3d9dfed22"> - <componentFiles fileId="ID_22b5689d_ebec_45e2_9405_7e806f91fb73" srcName="NEWS.txt" srcDirectory=".\FILES" dstName="NEWS.txt" dstPath="" isComModule="false" typelibGuid="" menuName="NEWS" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID4562EB49AA8CBF57BC8EC15981C03871" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="IDF99BC5877C66564FD6DAFE3C86605C1E" componentGuid="75fe917f-2009-4e2e-9044-0a8b3340bb07"> - <componentFiles fileId="ID_e8859b25_289c_4e4b_b141_b7a0465d4219" srcName="nona.exe" srcDirectory=".\FILES" dstName="nona.exe" dstPath="" isComModule="false" typelibGuid="" menuName="nona" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID3611D0B5421CB7BE067838B43DD25522" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="ID0D55843DE31BC853CCC73E35D291C762" componentGuid="5fcde545-d399-40c0-8b0f-2b7513687d9c"> - <componentFiles fileId="ID_dca96fb2_bfb6_4484_93ea_cbdc24a7525b" srcName="nona_gui.exe" srcDirectory=".\FILES" dstName="nona_gui.exe" dstPath="" isComModule="false" typelibGuid="" menuName="nona_gui" shortcutInProgramFilesMenu="true" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription="GUI with graphical progress bar for nona stitcher"> - <service StartWhenInstalled="true" Remove="both" id="ID1CA9BA758A8FABD61CFEE9ABACA077E3" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="ID3AF4EE1681A705331737A9BFC33CC26D" componentGuid="431d2e78-d281-4971-a061-0b84446368f6"> - <componentFiles fileId="ID_480913d2_a3a3_4e67_aed2_8427dd035e66" srcName="panoglview.exe" srcDirectory=".\FILES" dstName="panoglview.exe" dstPath="" isComModule="false" typelibGuid="" menuName="panoglview" shortcutInProgramFilesMenu="true" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription="Fast OpenGL accelerated viewer for spherical
 panoramas"> - <service StartWhenInstalled="true" Remove="both" id="IDDB40690C6DAC99D606D741AB4A91C354" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <components componentId="ID81E35471807FAFB882ADB516814D587E" componentGuid="0ec88767-81ba-4b19-b237-0bb9a3f42007"> - <componentFiles fileId="ID_adfccecf_f176_4002_985f_5ce1f2f455c1" srcName="README_WINDOWS.txt" srcDirectory=".\FILES" dstName="README_WINDOWS.txt" dstPath="" isComModule="false" typelibGuid="" menuName="README" shortcutInProgramFilesMenu="true" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> - <service StartWhenInstalled="true" Remove="both" id="ID3A8E42B7C33D3B364D2B1C4FFAB32C9E" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> - </componentFiles> - </components> - <defaultInstallMode>3</defaultInstallMode> - <directories dirId="ID6B7D8162DC1CB5C10D1FD32878E7D8CC" srcPath=".\FILES\locale" dstPath="locale" patterns=".*" excludePatterns="" recurse="true" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> - <pathComponent componentId="ID2FAA96D4FC356F6DF9645DF9A00931E8" componentGuid="1104e94b-d09e-4d69-a313-9eda7ce88aba" /> - </directories> - <directories dirId="ID22C8736068977CE9F393F4E3A19C0F13" srcPath=".\FILES\panotools" dstPath="panotools" patterns=".*" excludePatterns="" recurse="true" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> - <pathComponent componentId="ID1DCA0D12560B7B5873246640AB785965" componentGuid="c2b1d09e-01ea-4ca6-aa3a-68ec88b3412d" /> - </directories> - <directories dirId="ID5119445B68A8D7EEABAF78C7F88EB605" srcPath=".\FILES\xrc" dstPath="xrc" patterns=".*" excludePatterns="" recurse="true" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> - <pathComponent componentId="ID2471C1AA60E7A31ECB154DC16A2A8F82" componentGuid="718f611c-9b13-4461-9ebf-da374b046e1e" /> - </directories> - <directories dirId="IDE93D33B9F52D73756F3497BAB16A316C" srcPath=".\FILES\doc" dstPath="doc" patterns=".*" excludePatterns="" recurse="true" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> - <pathComponent componentId="ID829FA14E62DD6B590A18A2A0D664D803" componentGuid="8e33edd2-c23e-477a-be4e-75c869d445b4" /> - </directories> - </projectFeatures> - <projectWixModules Id="ID63684778A9088FE5CD3DD81609B10E0C" Compile="Auto" Name="EnblendFragment" Path=".\WixFragmentEnblend.wxs" ReferenceType="Feature" ReferenceId="EnblendRegistryFeature" /> - <projectWixModules Id="IDEAE2ADFC42C474CD214980C1250BC2A6" Compile="Auto" Name="RegistryFragment" Path=".\WixFragmentRegistry.wxs" ReferenceType="Feature" ReferenceId="HuginRegistryFeature" /> - <buildNoValidiation>true</buildNoValidiation> - <projectInstallForCurrentOrAllUsers>1</projectInstallForCurrentOrAllUsers> - <projectProperties TopBanner=".\top_banner.bmp" BigBanner=".\big_banner.bmp" ExclamationIcon="" InfoIcon="" NewIcon="" UpIcon="" VS2003Integration="VS2003_INTEGRATION" VS2005Integration="VS2005_INTEGRATION" UseRelativePaths="true" UseWixUI_ErrorProgressText="true" UseWixUI="true" Codepage="1252" ProductLanguage="1033" AlwaysMajorUpgrade="true" Compress="true" BuildTarget="true" PublisherUrl="http://hugin.sourceforge.net/" SupportContact="" SupportUrl="http://hugin.sourceforge.net/tutorials/" SupportPhone="" ReadMeFile="[APPLICATIONFOLDER]README_WINDOWS.txt" UpdateUrl="http://hugin.sourceforge.net/download/" Comments="Panorama photo stitcher" Icon="[APPLICATIONFOLDER]xrc\data\icon.ico" EmbedCab="true" MaxCabSize="0" CabCompressionLevel="mszip"> - <UiCultures Name="en-US" Enabled="true" /> - <UiCultures Name="de-de" Enabled="false" /> - <UiCultures Name="es-es" Enabled="false" /> - <UiCultures Name="nl-nl" Enabled="false" /> - </projectProperties> -</WarSetup-Project> \ No newline at end of file Added: hugin/trunk/platforms/windows/msi/hugin.warsetup =================================================================== --- hugin/trunk/platforms/windows/msi/hugin.warsetup (rev 0) +++ hugin/trunk/platforms/windows/msi/hugin.warsetup 2007-12-14 09:31:08 UTC (rev 2563) @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="utf-8"?> +<WarSetup-Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" nextUniqueId="1141" projectName="hugin" projectUuid="6cf5fb2f-3021-4ce8-9dfe-386da066c31a" projectUpgradeUuid="a8245656-ca56-43a9-a642-f0e3e4da47a0" projectVersion="${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}" projectOrganization="hugin" projectMustBeAdministratorToInstall="false" project64BitTarget="false" projectTargetDirectory="C:\Documents and Settings\padange_adm\Desktop" projectTargetName="hugin_${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}_install" projectType="0" projectUserInterface="WixUI_InstallDir"> + <projectFeatures featureId="HUGINFEATURE" featureName="hugin" featureDescription="The complete hugin package, including panorama tools suite and enblend" configurableDirectory="APPLICATIONFOLDER" configurableDirectoryDefaultPath="[ProjectName]" enableInDefaultInstall="true" enableInMinimalInstall="true" excludeFromBuild="false"> + <components componentId="ID1018" componentGuid="8069d261-a1d9-4803-ac63-5dc632b6186c"> + <componentFiles fileId="ID_b72a681c_2075_4b50_bbd7_70ff663ef31f" srcName="PTuncrop.exe" srcDirectory=".\FILES\bin" dstName="PTuncrop.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTuncrop" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1017" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1020" componentGuid="e85e1f5f-db77-453c-8f92-4702f02c2d61"> + <componentFiles fileId="ID_2b685c3c_464a_4d2c_9572_2deebb5239d0" srcName="vig_optimize.exe" srcDirectory=".\FILES\bin" dstName="vig_optimize.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="vig_optimize" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1019" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1022" componentGuid="527bc52f-d632-411b-a51b-e274bb386727"> + <componentFiles fileId="ID_b0488c58_60dc_49aa_8d15_ab24a3694025" srcName="autooptimiser.exe" srcDirectory=".\FILES\bin" dstName="autooptimiser.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="autooptimiser" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1021" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1024" componentGuid="d546f680-d5e7-49fb-af75-605481ccced0"> + <componentFiles fileId="ID_4d1de072_c51d_4ae8_aba6_511434b44faf" srcName="enblend.exe" srcDirectory=".\FILES\bin" dstName="enblend.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="enblend" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1023" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1026" componentGuid="43fb9855-0299-40b4-bd41-feab539a6278"> + <componentFiles fileId="ID_3917af63_d946_4af6_9e74_b39d33bb7bff" srcName="enfuse.exe" srcDirectory=".\FILES\bin" dstName="enfuse.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="enfuse" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1025" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1028" componentGuid="861c49b0-7078-42af-912a-b9f73f7f00f7"> + <componentFiles fileId="ID_8f0ee8cd_8644_469d_8a8b_8e1c86346c15" srcName="fulla.exe" srcDirectory=".\FILES\bin" dstName="fulla.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="fulla" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1027" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1030" componentGuid="5ac7a3da-3ee0-4151-8828-9bc9c7639b28"> + <componentFiles fileId="HUGINEXECUTABLE" srcName="hugin.exe" srcDirectory=".\FILES\bin" dstName="hugin.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="hugin" shortcutInProgramFilesMenu="true" shortcutOnDesktop="true" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1029" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1032" componentGuid="ee646f92-cc31-4a29-8e79-bbe2d4a86ab4"> + <componentFiles fileId="ID_11d451f4_9b2b_4d3f_b04e_3b29c8e112b9" srcName="hugin_hdrmerge.exe" srcDirectory=".\FILES\bin" dstName="hugin_hdrmerge.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="hugin_hdrmerge" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1031" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1034" componentGuid="ac98cbcd-0176-47d2-bc1c-35bc1274cfc1"> + <componentFiles fileId="HUGINSTITCHEXECUTABLE" srcName="hugin_stitch_project.exe" srcDirectory=".\FILES\bin" dstName="hugin_stitch_project.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="hugin_stitch_project" shortcutInProgramFilesMenu="true" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1033" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1036" componentGuid="e99f2042-c654-4573-b1c1-c79db7352e9c"> + <componentFiles fileId="ID_ff0d8788_260e_4054_81d1_1a7282c33ee2" srcName="make.exe" srcDirectory=".\FILES\bin" dstName="make.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="make" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1035" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1038" componentGuid="febefab5-721c-4631-b913-8c875a2130b4"> + <componentFiles fileId="ID_3ee89065_0046_4ddd_b3d0_2e74040d942c" srcName="nona.exe" srcDirectory=".\FILES\bin" dstName="nona.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="nona" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1037" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1040" componentGuid="a88260aa-b21f-4337-8075-31b9766b7bac"> + <componentFiles fileId="ID_919ba03f_ef0f_4050_b086_bd8097bd8b62" srcName="nona_gui.exe" srcDirectory=".\FILES\bin" dstName="nona_gui.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="nona_gui" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1039" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1042" componentGuid="7b7fadcb-e3e3-4d93-9b78-53bd282ae3a1"> + <componentFiles fileId="ID_f1f5bd00_0e98_4b12_bac0_14b89a86c81e" srcName="PTblender.exe" srcDirectory=".\FILES\bin" dstName="PTblender.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTblender" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1041" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1044" componentGuid="cb90501d-1b1c-47e5-b2ba-3af100e1fd9b"> + <componentFiles fileId="ID_b1b95473_ae17_4056_95e7_36f9c27ea282" srcName="PTcrop.exe" srcDirectory=".\FILES\bin" dstName="PTcrop.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTcrop" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1043" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1046" componentGuid="65cbf6da-ca45-4d0e-9247-7c768100633c"> + <componentFiles fileId="ID_f6d0ea56_061f_4b3f_8a45_2d72d5590bd8" srcName="PTinfo.exe" srcDirectory=".\FILES\bin" dstName="PTinfo.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTinfo" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1045" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1048" componentGuid="fc03a6af-f98b-4e3f-9572-49887f558d14"> + <componentFiles fileId="ID_7abf8036_bb9e_48cd_9db6_5d1b77dbad20" srcName="PTmasker.exe" srcDirectory=".\FILES\bin" dstName="PTmasker.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTmasker" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1047" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1050" componentGuid="e522e0bc-6411-4ab6-96a1-da4c81bee035"> + <componentFiles fileId="ID_1992148c_eba5_4438_87f0_4b5a01974387" srcName="PTmender.exe" srcDirectory=".\FILES\bin" dstName="PTmender.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTmender" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1049" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1052" componentGuid="8d75f874-0a31-458f-be87-05066506e97d"> + <componentFiles fileId="ID_e48aca07_1b8d_4cf1_a29a_eec73078ef40" srcName="PTOptimizer.exe" srcDirectory=".\FILES\bin" dstName="PTOptimizer.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTOptimizer" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1051" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1054" componentGuid="a2889d73-6bf4-41e1-bc8f-b7355ec75ce8"> + <componentFiles fileId="ID_2c81928c_4a5f_41cd_a28c_46b9cc3f7f77" srcName="PTroller.exe" srcDirectory=".\FILES\bin" dstName="PTroller.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTroller" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1053" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1056" componentGuid="af268c78-a18f-4c4d-b037-58a3b4f55c8d"> + <componentFiles fileId="ID_9923cdf9_7ea3_4c46_bb6d_29af5cb9560f" srcName="PTtiff2psd.exe" srcDirectory=".\FILES\bin" dstName="PTtiff2psd.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTtiff2psd" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1055" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <components componentId="ID1058" componentGuid="3c20238c-f6e6-41f1-831b-4ab4ade5bf31"> + <componentFiles fileId="ID_e75f7560_ece1_4fbc_8982_8b16e3cb12c2" srcName="PTtiffdump.exe" srcDirectory=".\FILES\bin" dstName="PTtiffdump.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTtiffdump" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1057" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> + <defaultInstallMode>3</defaultInstallMode> + <directories dirId="ID1060" srcPath=".\FILES\doc" dstPath="doc" patterns=".*" excludePatterns="" recurse="false" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> + <pathComponent componentId="ID1059" componentGuid="eafe398a-6bc5-4da5-9857-3a31e22b85bc" /> + </directories> + <directories dirId="ID1062" srcPath=".\FILES\share" dstPath="share" patterns=".*" excludePatterns="" recurse="false" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> + <pathComponent componentId="ID1061" componentGuid="a257d367-c707-4def-9899-2c8e3d82e9dd" /> + </directories> + </projectFeatures> + <projectWixModules Id="IDEAE2ADFC42C474CD214980C1250BC2A6" Compile="Auto" Name="RegistryFragment" Path=".\WixFragmentRegistry.wxs" ReferenceType="Feature" ReferenceId="HuginRegistryFeature" /> + <buildNoValidiation>true</buildNoValidiation> + <projectInstallForCurrentOrAllUsers>1</projectInstallForCurrentOrAllUsers> + <License> + <System>true</System> + <Name>GNU General Public License (GPL) 2.0</Name> + </License> + <projectProperties TopBanner=".\top_banner.bmp" BigBanner=".\big_banner.bmp" ExclamationIcon="" InfoIcon="" NewIcon="" UpIcon="" VS2003Integration="VS2003_INTEGRATION" VS2005Integration="VS2005_INTEGRATION" UseRelativePaths="true" UseWixUI_ErrorProgressText="true" UseWixUI="true" Codepage="1252" ProductLanguage="1033" AlwaysMajorUpgrade="true" Compress="true" BuildTarget="true" PublisherUrl="http://hugin.sourceforge.net/" SupportContact="" SupportUrl="http://hugin.sourceforge.net/tutorials/" SupportPhone="" ReadMeFile="[APPLICATIONFOLDER]\doc\hugin\README_WINDOWS.txt" UpdateUrl="http://hugin.sourceforge.net/download/" Comments="Panorama photo stitcher" Icon="[APPLICATIONFOLDER]\share\hugin\xrc\data\icon.ico" EmbedCab="true" MaxCabSize="0" CabCompressionLevel="mszip"> + <UiCultures Name="en-US" Enabled="true" /> + <UiCultures Name="de-de" Enabled="false" /> + <UiCultures Name="es-es" Enabled="false" /> + <UiCultures Name="nl-nl" Enabled="false" /> + </projectProperties> +</WarSetup-Project> \ No newline at end of file Modified: hugin/trunk/src/deghosting/hugin_hdrmerge.cpp =================================================================== --- hugin/trunk/src/deghosting/hugin_hdrmerge.cpp 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/src/deghosting/hugin_hdrmerge.cpp 2007-12-14 09:31:08 UTC (rev 2563) @@ -123,6 +123,8 @@ { cerr << name << ": merge overlapping images" << std::endl << std::endl + << "hugin_hdrmerge version " << PACKAGE_VERSION << std::endl + << std::endl << "Usage: " << name << " [options] -o output.exr <input-files>" << std::endl << "Valid options are:" << std::endl << " -o prefix output file" << std::endl Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2007-12-14 09:31:08 UTC (rev 2563) @@ -216,9 +216,11 @@ m_lbox->SetString(m_lbox->GetCount()-1, m_currLine); #else + bool lastCR= false; while(s.CanRead()) { wxChar c = ts.GetChar(); if (c == '\b') { + lastCR=false; // backspace if (m_textctrl->GetLastPosition() != m_lastLineStart) { m_textctrl->Remove(m_textctrl->GetLastPosition(), m_textctrl->GetLastPosition()+1); @@ -228,8 +230,12 @@ m_output.RemoveLast(); }*/ } else if (c == 0x0d) { + lastCR=true; +#ifdef __WXMSW__ +#else // back to start of line m_textctrl->Remove(m_lastLineStart, m_textctrl->GetLastPosition()+1); +#endif /* if (m_output.Last() != '\n') { m_output = m_output.BeforeLast('\n') + wxT("\n"); @@ -238,8 +244,16 @@ } else if (c == '\n') { (*m_textctrl) << c; m_lastLineStart = m_textctrl->GetLastPosition(); + lastCR=false; } else { +#ifdef __WXMSW__ + if (lastCR) { + // need to move to front? + m_textctrl->Remove(m_lastLineStart, m_textctrl->GetLastPosition()+1); + } +#endif (*m_textctrl) << c; + lastCR=false; } } #endif Modified: hugin/trunk/src/hugin1/base_wx/huginConfig.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2007-12-14 09:31:08 UTC (rev 2563) @@ -29,67 +29,51 @@ using namespace PT; -PTPrograms getPTProgramsConfig(wxString huginRoot, wxConfigBase * config) +std::string getProgram(wxConfigBase * config, wxString bindir, wxString file, wxString name) { - PTPrograms progs; - - std::string root = (const char *) huginRoot.mb_str(); - std::string enblendroot; - std::string ptroot; - -#if defined __WXMSW__ - enblendroot = root + "/enblend/"; - ptroot = root + "/panotools/"; - -#elif defined __WXMAC__ - // dangelo: on OSX, the tools are inside the application bundle, but I don't know - // where. - root = ""; - enblendroot = ""; - ptroot = ""; -#else - // on unix, custom tools don't make any sense, since on linux, hugin is never - // bundled. Just just the executables in the path - root = ""; - enblendroot = ""; - ptroot = ""; -#endif - - if (config->Read(wxT("/Panotools/PTmenderExeCustom"),0l)) { - progs.PTmender = config->Read(wxT("/PanoTools/PTmender"),wxT(HUGIN_PT_MENDER_EXE)).mb_str(); + std::string pname; + if (config->Read(name + wxT("/Custom"), 0l)) { + wxString fn = config->Read(name + wxT("/Exe"),wxT("")); + if (wxFileName::FileExists(fn)) { + pname = fn.mb_str(); + } else { + wxMessageBox(wxString::Format(_("External program %s not found, reverting to bundled version"), file.c_str()), _("Error")); + pname = (bindir + file).mb_str(); + } } else { - progs.PTmender = ptroot + "PTmender"; + pname = file.mb_str(); } + return pname; +} - if (config->Read(wxT("/Panotools/PTblenderExeCustom"),0l)) { - progs.PTblender = config->Read(wxT("/PanoTools/PTblender"),wxT(HUGIN_PT_BLENDER_EXE)).mb_str(); - } else { - progs.PTblender = ptroot + "PTblender"; - } - if (config->Read(wxT("/Panotools/PTmaskerExeCustom"),0l)) { - progs.PTmasker = config->Read(wxT("/PanoTools/PTmasker"),wxT(HUGIN_PT_MASKER_EXE)).mb_str(); - } else { - progs.PTmasker = ptroot + "PTmasker"; - } +PTPrograms getPTProgramsConfig(wxString bundledBinDir, wxConfigBase * config) +{ + PTPrograms progs; - if (config->Read(wxT("/Panotools/PTrollerExeCustom"),0l)) { - progs.PTroller = config->Read(wxT("/PanoTools/PTroller"),wxT(HUGIN_PT_ROLLER_EXE)).mb_str(); - } else { - progs.PTroller = ptroot + "PTroller"; - } + wxString bindir; +#ifndef __WXGTK__ + // add trailing directory separator, if needed + wxFileName bindirFN = wxFileName::DirName(bundledBinDir); + bindir = bindirFN.GetPath(); + wxMessageBox(bindir, wxT("bindir")); +#endif + // on unix, custom tools don't make any sense, since on unix, hugin is never + // bundled. Just just the executables in the path - // enblend - if (config->Read(wxT("/Enblend/EnblendExeCustom"),0l)) { - progs.enblend = config->Read(wxT("/Enblend/EnblendExe"),wxT(HUGIN_ENBLEND_EXE)).mb_str(); - } else { - progs.enblend = enblendroot + "enblend"; - } - progs.enblend_opts = config->Read(wxT("/Enblend/EnblendArgs"), wxT(HUGIN_ENBLEND_ARGS)).mb_str(); + progs.PTmender = getProgram(config,bindir, wxT("PTmender"), wxT("PTmender")); + progs.PTblender= getProgram(config,bindir, wxT("PTblender"), wxT("PTblender")); + progs.PTmasker= getProgram(config,bindir, wxT("PTmasker"), wxT("PTmasker")); + progs.PTroller= getProgram(config,bindir, wxT("PTroller"), wxT("PTroller")); + progs.enblend = getProgram(config,bindir, wxT("enblend"), wxT("Enblend")); + progs.enblend_opts = config->Read(wxT("/Enblend/Args"), wxT(HUGIN_ENBLEND_ARGS)).mb_str(); + progs.enfuse = getProgram(config,bindir, wxT("enfuse"), wxT("Enfuse")); + progs.enfuse_opts = config->Read(wxT("/Enfuse/Args"), wxT(HUGIN_ENFUSE_ARGS)).mb_str(); + // smartblend (never bundled) - progs.smartblend = config->Read(wxT("/Smartblend/SmartblendExe"),wxT(HUGIN_SMARTBLEND_EXE)).mb_str(); + progs.smartblend = config->Read(wxT("/Smartblend/SmartblendExe"),wxT("smartblend.exe")).mb_str(); progs.smartblend_opts = config->Read(wxT("/Smartblend/SmartblendArgs"),wxT(HUGIN_SMARTBLEND_ARGS)).mb_str(); return progs; Modified: hugin/trunk/src/hugin1/hugin/CMakeLists.txt =================================================================== --- hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2007-12-14 09:31:08 UTC (rev 2563) @@ -26,9 +26,9 @@ MainFrame.cpp CPImageCtrl.cpp CPEditorPanel.cpp LensPanel.cpp ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp NonaOptionsDialog.cpp PreviewFrame.cpp PreviewPanel.cpp CropPanel.cpp OptimizePhotometricPanel.cpp -OptimizePanel.cpp RunStitcherFrame.cpp CPListFrame.cpp +OptimizePanel.cpp CPListFrame.cpp TextKillFocusHandler.cpp PanoDruid.cpp PreferencesDialog.cpp -LocalizedFileTipProvider.cpp VigCorrDialog.cpp +LocalizedFileTipProvider.cpp wxPanoCommand.cpp AssistantPanel.cpp HFOVDialog.cpp) IF( APPLE ) Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2007-12-14 09:31:08 UTC (rev 2563) @@ -747,7 +747,6 @@ opts.outputLDRExposureBlended = e.IsChecked(); } else if (id == XRCID("pano_cb_ldr_output_exposure_remapped") ) { opts.outputLDRExposureRemapped = e.IsChecked(); - wxMessageBox(wxT("Setting exp remapped")); } else if (id == XRCID("pano_cb_hdr_output_blended") ) { opts.outputHDRBlended = e.IsChecked(); } else if (id == XRCID("pano_cb_hdr_output_stacks") ) { Modified: hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2007-12-14 09:31:08 UTC (rev 2563) @@ -250,9 +250,9 @@ void PreferencesDialog::OnPTStitcherExe(wxCommandEvent & e) { - wxFileDialog dlg(this,_("Select PTStitcher"), + wxFileDialog dlg(this,_("Select PTmender"), wxT(""), - wxT(HUGIN_PT_STITCHER_EXE), + wxT(HUGIN_PT_MENDER_EXE), #ifdef __WXMSW__ _("Executables (*.exe)|*.exe"), #else @@ -569,11 +569,9 @@ wxConfigBase *cfg = wxConfigBase::Get(); // Panotools settings - MY_STR_VAL("prefs_pt_PTStitcherEXE", cfg->Read(wxT("/Panotools/PTStitcherExe"),wxT(HUGIN_PT_STITCHER_EXE))); - //bool customPTStitcherExe = HUGIN_PT_STITCHER_EXE_CUSTOM; - bool customPTStitcherExe = //TODO: compatibility mode; to be fixed - (wxT(HUGIN_PT_STITCHER_EXE) != cfg->Read(wxT("/Panotools/PTStitcherExe"),wxT(HUGIN_PT_STITCHER_EXE))); - cfg->Read(wxT("/Panotools/PTStitcherExeCustom"), &customPTStitcherExe); + MY_STR_VAL("prefs_pt_PTStitcherEXE", cfg->Read(wxT("/PTmender/Exe"),wxT(HUGIN_PT_MENDER_EXE))); + bool customPTStitcherExe = HUGIN_PT_MENDER_EXE_CUSTOM; + cfg->Read(wxT("/PTmender/Custom"), &customPTStitcherExe); MY_BOOL_VAL("prefs_pt_PTStitcherEXE_custom", customPTStitcherExe); XRCCTRL(*this, "prefs_pt_PTStitcherEXE", wxTextCtrl)->Enable(customPTStitcherExe); XRCCTRL(*this, "prefs_ptstitcher_select", wxButton)->Enable(customPTStitcherExe); @@ -716,23 +714,16 @@ ///// /// ENBLEND - MY_STR_VAL("prefs_enblend_EnblendExe", cfg->Read(wxT("/Enblend/EnblendExe"), + MY_STR_VAL("prefs_enblend_EnblendExe", cfg->Read(wxT("/Enblend/Exe"), wxT(HUGIN_ENBLEND_EXE))); - //bool customEnblendExe = HUGIN_ENBLEND_EXE_CUSTOM; - bool customEnblendExe = - (wxT(HUGIN_ENBLEND_EXE) != cfg->Read(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE))); - cfg->Read(wxT("/Enblend/EnblendExeCustom"), &customEnblendExe); + bool customEnblendExe = HUGIN_ENBLEND_EXE_CUSTOM; + cfg->Read(wxT("/Enblend/Custom"), &customEnblendExe); MY_BOOL_VAL("prefs_enblend_Custom", customEnblendExe); XRCCTRL(*this, "prefs_enblend_EnblendExe", wxTextCtrl)->Enable(customEnblendExe); XRCCTRL(*this, "prefs_enblend_select", wxButton)->Enable(customEnblendExe); - MY_STR_VAL("prefs_enblend_EnblendArgs", cfg->Read(wxT("/Enblend/EnblendArgs"), + MY_STR_VAL("prefs_enblend_EnblendArgs", cfg->Read(wxT("/Enblend/Args"), wxT(HUGIN_ENBLEND_ARGS))); - t = cfg->Read(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES) == 1; - MY_BOOL_VAL("prefs_enblend_DeleteRemapped", t); - t = cfg->Read(wxT("/Enblend/UseCroppedFiles"), HUGIN_ENBLEND_USE_CROPPED_FILES) == 1; - MY_BOOL_VAL("prefs_enblend_UseCroppedFiles", t); - ///// /// Display Panotools version if we can @@ -757,8 +748,8 @@ if ( really == wxYES) { if (noteb->GetSelection() == 0) { - cfg->Write(wxT("/Panotools/PTStitcherExe"), wxT(HUGIN_PT_STITCHER_EXE) ); - cfg->Write(wxT("/Panotools/PTStitcherExeCustom"),HUGIN_PT_STITCHER_EXE_CUSTOM); + cfg->Write(wxT("/PTmender/Exe"), wxT(HUGIN_PT_MENDER_EXE) ); + cfg->Write(wxT("/PTmender/Custom"),HUGIN_PT_MENDER_EXE_CUSTOM); cfg->Write(wxT("/PanoTools/ScriptFile"), wxT("PT_script.txt")); } if (noteb->GetSelection() == 1) { @@ -816,11 +807,9 @@ } if (noteb->GetSelection() == 5) { /// ENBLEND - cfg->Write(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE)); - cfg->Write(wxT("/Enblend/EnblendExeCustom"), HUGIN_ENBLEND_EXE_CUSTOM); - cfg->Write(wxT("/Enblend/EnblendArgs"), wxT(HUGIN_ENBLEND_ARGS)); - cfg->Write(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES); - cfg->Write(wxT("/Enblend/UseCroppedFiles"), HUGIN_ENBLEND_USE_CROPPED_FILES); + cfg->Write(wxT("/Enblend/Exe"), wxT(HUGIN_ENBLEND_EXE)); + cfg->Write(wxT("/Enblend/Custom"), HUGIN_ENBLEND_EXE_CUSTOM); + cfg->Write(wxT("/Enblend/Args"), wxT(HUGIN_ENBLEND_ARGS)); } UpdateDisplayData(); } @@ -832,11 +821,8 @@ wxConfigBase *cfg = wxConfigBase::Get(); // Panotools settings - cfg->Write(wxT("/Panotools/PTStitcherExeCustom"),MY_G_BOOL_VAL("prefs_pt_PTStitcherEXE_custom")); - if(!MY_G_BOOL_VAL("prefs_pt_PTStitcherEXE_custom")) //TODO: compatibility mode; to be fixed. - cfg->Write(wxT("/Panotools/PTStitcherExe"), wxT(HUGIN_PT_STITCHER_EXE)); - else - cfg->Write(wxT("/Panotools/PTStitcherExe"), MY_G_STR_VAL("prefs_pt_PTStitcherEXE")); + cfg->Write(wxT("/PTmender/Custom"),MY_G_BOOL_VAL("prefs_pt_PTStitcherEXE_custom")); + cfg->Write(wxT("/Panotools/PTStitcherExe"), MY_G_STR_VAL("prefs_pt_PTStitcherEXE")); cfg->Write(wxT("/PanoTools/ScriptFile"), MY_G_STR_VAL("prefs_pt_ScriptFile")); // Assistant @@ -920,14 +906,9 @@ ///// /// ENBLEND - cfg->Write(wxT("/Enblend/EnblendExeCustom"), MY_G_BOOL_VAL("prefs_enblend_Custom")); - if(!MY_G_BOOL_VAL("prefs_enblend_Custom")) //TODO: compatibility mode; to be fixed. - cfg->Write(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE)); - else - cfg->Write(wxT("/Enblend/EnblendExe"), MY_G_STR_VAL("prefs_enblend_EnblendExe")); - cfg->Write(wxT("/Enblend/EnblendArgs"), MY_G_STR_VAL("prefs_enblend_EnblendArgs")); - cfg->Write(wxT("/Enblend/DeleteRemappedFiles"), MY_G_BOOL_VAL("prefs_enblend_DeleteRemapped")); - cfg->Write(wxT("/Enblend/UseCroppedFiles"), MY_G_BOOL_VAL("prefs_enblend_UseCroppedFiles")); + cfg->Write(wxT("/Enblend/Custom"), MY_G_BOOL_VAL("prefs_enblend_Custom")); + cfg->Write(wxT("/Enblend/Exe"), MY_G_STR_VAL("prefs_enblend_EnblendExe")); + cfg->Write(wxT("/Enblend/Args"), MY_G_STR_VAL("prefs_enblend_EnblendArgs")); UpdateDisplayData(); } Modified: hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp 2007-12-11 17:19:20 UTC (rev 2562) +++ hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp 2007-12-14 09:31:08 UTC (rev 2563) @@ -80,7 +80,7 @@ assert(m_abort); wxConfigBase* config = wxConfigBase::Get(); - wxString stitcherExe = config->Read(wxT("/PanoTools/PTStitcherExe"),wxT(HUGIN_PT_STITCHER_EXE)); + wxString stitcherExe = config->Read(wxT("/PTmender/PTStitcherExe"),wxT(HUGIN_PT_STITCHER_EXE)); wxString PTSc... [truncated message content] |
From: <da...@us...> - 2007-12-17 08:23:11
|
Revision: 2567 http://hugin.svn.sourceforge.net/hugin/?rev=2567&view=rev Author: dangelo Date: 2007-12-17 00:23:07 -0800 (Mon, 17 Dec 2007) Log Message: ----------- updated msi installer Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/platforms/windows/msi/hugin.warsetup Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-12-17 08:22:27 UTC (rev 2566) +++ hugin/trunk/CMakeLists.txt 2007-12-17 08:23:07 UTC (rev 2567) @@ -12,14 +12,14 @@ set(V_PATCH 0) # TODO: automatically set the revision on windows IF(WIN32) - set(HUGIN_WC_REVISION 0) + set(HUGIN_WC_REVISION svn) ELSE (WIN32) FIND_PACKAGE(Subversion) IF(Subversion_FOUND) Subversion_WC_INFO(${PROJECT_SOURCE_DIR} HUGIN) MESSAGE("Current revision is ${HUGIN_WC_REVISION}") ELSE(Subversion_FOUND) - SET(HUGIN_WC_REVISION 0) + SET(HUGIN_WC_REVISION svn) ENDIF(Subversion_FOUND) ENDIF(WIN32) Modified: hugin/trunk/platforms/windows/msi/hugin.warsetup =================================================================== --- hugin/trunk/platforms/windows/msi/hugin.warsetup 2007-12-17 08:22:27 UTC (rev 2566) +++ hugin/trunk/platforms/windows/msi/hugin.warsetup 2007-12-17 08:23:07 UTC (rev 2567) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<WarSetup-Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" nextUniqueId="1141" projectName="hugin" projectUuid="6cf5fb2f-3021-4ce8-9dfe-386da066c31a" projectUpgradeUuid="a8245656-ca56-43a9-a642-f0e3e4da47a0" projectVersion="${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}" projectOrganization="hugin" projectMustBeAdministratorToInstall="false" project64BitTarget="false" projectTargetDirectory="C:\Documents and Settings\padange_adm\Desktop" projectTargetName="hugin_${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}_install" projectType="0" projectUserInterface="WixUI_InstallDir"> +<WarSetup-Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" nextUniqueId="1144" projectName="Hugin" projectUuid="6cf5fb2f-3021-4ce8-9dfe-386da066c31a" projectUpgradeUuid="a8245656-ca56-43a9-a642-f0e3e4da47a0" projectVersion="${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}" projectOrganization="hugin" projectMustBeAdministratorToInstall="false" project64BitTarget="false" projectTargetDirectory="${CMAKE_INSTALL_PREFIX}/../" projectTargetName="hugin_${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}_install" projectType="0" projectUserInterface="WixUI_InstallDir"> <projectFeatures featureId="HUGINFEATURE" featureName="hugin" featureDescription="The complete hugin package, including panorama tools suite and enblend" configurableDirectory="APPLICATIONFOLDER" configurableDirectoryDefaultPath="[ProjectName]" enableInDefaultInstall="true" enableInMinimalInstall="true" excludeFromBuild="false"> <components componentId="ID1018" componentGuid="8069d261-a1d9-4803-ac63-5dc632b6186c"> <componentFiles fileId="ID_b72a681c_2075_4b50_bbd7_70ff663ef31f" srcName="PTuncrop.exe" srcDirectory=".\FILES\bin" dstName="PTuncrop.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTuncrop" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> @@ -57,7 +57,7 @@ </componentFiles> </components> <components componentId="ID1040" componentGuid="a88260aa-b21f-4337-8075-31b9766b7bac"> - <componentFiles fileId="ID_919ba03f_ef0f_4050_b086_bd8097bd8b62" srcName="nona_gui.exe" srcDirectory=".\FILES\bin" dstName="nona_gui.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="nona_gui" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <componentFiles fileId="ID_919ba03f_ef0f_4050_b086_bd8097bd8b62" srcName="nona_gui.exe" srcDirectory=".\FILES\bin" dstName="nona_gui.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="nona_gui" shortcutInProgramFilesMenu="true" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> <service StartWhenInstalled="true" Remove="both" id="ID1039" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> </componentFiles> </components> @@ -106,11 +106,16 @@ <service StartWhenInstalled="true" Remove="both" id="ID1057" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> </componentFiles> </components> + <components componentId="ID1142" componentGuid="01f2aaa2-46ed-4c02-aabd-1b8f00fe5b06"> + <componentFiles fileId="ID_64087428_b2cc_4dd6_87ad_aacd036ba912" srcName="align_image_stack.exe" srcDirectory=".\FILES\bin" dstName="align_image_stack.exe" dstPath="" isComModule="false" typelibGuid="" menuName="align_image_stack" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> + <service StartWhenInstalled="true" Remove="both" id="ID1141" isService="false" userAccount="" userPassword="" cmdLineArguments="" errorControl="normal" interactive="false" loadOrderGroup="" serviceName="" startMode="auto" vital="true" /> + </componentFiles> + </components> <defaultInstallMode>3</defaultInstallMode> - <directories dirId="ID1060" srcPath=".\FILES\doc" dstPath="doc" patterns=".*" excludePatterns="" recurse="false" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> + <directories dirId="ID1060" srcPath=".\FILES\doc" dstPath="doc" patterns=".*" excludePatterns="" recurse="true" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> <pathComponent componentId="ID1059" componentGuid="eafe398a-6bc5-4da5-9857-3a31e22b85bc" /> </directories> - <directories dirId="ID1062" srcPath=".\FILES\share" dstPath="share" patterns=".*" excludePatterns="" recurse="false" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> + <directories dirId="ID1062" srcPath=".\FILES\share" dstPath="share" patterns=".*" excludePatterns="" recurse="true" preventEmptyDirectories="false" addToPath="false" ideHeaderFiles="false" ideExecutables="false" ideLibrary="false" ideMicrosoftVisualStudio2003="false" ideMicrosoftVisualStudio2005="false"> <pathComponent componentId="ID1061" componentGuid="a257d367-c707-4def-9899-2c8e3d82e9dd" /> </directories> </projectFeatures> @@ -121,7 +126,7 @@ <System>true</System> <Name>GNU General Public License (GPL) 2.0</Name> </License> - <projectProperties TopBanner=".\top_banner.bmp" BigBanner=".\big_banner.bmp" ExclamationIcon="" InfoIcon="" NewIcon="" UpIcon="" VS2003Integration="VS2003_INTEGRATION" VS2005Integration="VS2005_INTEGRATION" UseRelativePaths="true" UseWixUI_ErrorProgressText="true" UseWixUI="true" Codepage="1252" ProductLanguage="1033" AlwaysMajorUpgrade="true" Compress="true" BuildTarget="true" PublisherUrl="http://hugin.sourceforge.net/" SupportContact="" SupportUrl="http://hugin.sourceforge.net/tutorials/" SupportPhone="" ReadMeFile="[APPLICATIONFOLDER]\doc\hugin\README_WINDOWS.txt" UpdateUrl="http://hugin.sourceforge.net/download/" Comments="Panorama photo stitcher" Icon="[APPLICATIONFOLDER]\share\hugin\xrc\data\icon.ico" EmbedCab="true" MaxCabSize="0" CabCompressionLevel="mszip"> + <projectProperties TopBanner="./top_banner.bmp" BigBanner="./big_banner.bmp" ExclamationIcon="" InfoIcon="" NewIcon="" UpIcon="" VS2003Integration="VS2003_INTEGRATION" VS2005Integration="VS2005_INTEGRATION" UseRelativePaths="true" UseWixUI_ErrorProgressText="true" UseWixUI="true" Codepage="1252" ProductLanguage="1033" AlwaysMajorUpgrade="true" Compress="true" BuildTarget="true" PublisherUrl="http://hugin.sourceforge.net/" SupportContact="" SupportUrl="http://hugin.sourceforge.net/tutorials/" SupportPhone="" ReadMeFile="[APPLICATIONFOLDER]\doc\hugin\README_WINDOWS.txt" UpdateUrl="http://hugin.sourceforge.net/download/" Comments="Panorama photo stitcher" Icon="[APPLICATIONFOLDER]\share\hugin\xrc\data\icon.ico" EmbedCab="true" MaxCabSize="0" CabCompressionLevel="mszip"> <UiCultures Name="en-US" Enabled="true" /> <UiCultures Name="de-de" Enabled="false" /> <UiCultures Name="es-es" Enabled="false" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-12-18 21:00:11
|
Revision: 2571 http://hugin.svn.sourceforge.net/hugin/?rev=2571&view=rev Author: dangelo Date: 2007-12-18 13:00:00 -0800 (Tue, 18 Dec 2007) Log Message: ----------- only embedd svn version if .svn directory exists. (partly based on patch by GWP) Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/platforms/windows/msi/hugin.warsetup hugin/trunk/src/hugin1/hugin/xrc/data/CMakeLists.txt hugin/trunk/src/hugin_config.h.in.cmake hugin/trunk/src/tools/align_image_stack.cpp Added Paths: ----------- hugin/trunk/src/hugin1/hugin/xrc/data/.about.htm.in.swp Removed Paths: ------------- hugin/trunk/src/hugin1/hugin/xrc/data/about.htm hugin/trunk/src/hugin1/hugin/xrc/data/about_fr.htm hugin/trunk/src/hugin1/hugin/xrc/data/about_pl.htm Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/CMakeLists.txt 2007-12-18 21:00:00 UTC (rev 2571) @@ -10,19 +10,26 @@ set(V_MAJOR 0) set(V_MINOR 7) set(V_PATCH 0) -# TODO: automatically set the revision on windows -IF(WIN32) - set(HUGIN_WC_REVISION svn) -ELSE (WIN32) - FIND_PACKAGE(Subversion) - IF(Subversion_FOUND) - Subversion_WC_INFO(${PROJECT_SOURCE_DIR} HUGIN) - MESSAGE("Current revision is ${HUGIN_WC_REVISION}") - ELSE(Subversion_FOUND) - SET(HUGIN_WC_REVISION svn) - ENDIF(Subversion_FOUND) -ENDIF(WIN32) +IF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) + # TODO: automatically set the revision on windows + IF(WIN32) + set(HUGIN_WC_REVISION svn) + ELSE (WIN32) + FIND_PACKAGE(Subversion REQUIRED) + IF(Subversion_FOUND) + Subversion_WC_INFO(${PROJECT_SOURCE_DIR} HUGIN) + MESSAGE("Current revision is ${HUGIN_WC_REVISION}") + ELSE(Subversion_FOUND) + SET(HUGIN_WC_REVISION svn) + ENDIF(Subversion_FOUND) + ENDIF(WIN32) + + SET(HUGIN_PACKAGE_VERSION ${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}) +ELSE (EXISTS ${PROJECT_SOURCE_DIR}/.svn) + SET(HUGIN_PACKAGE_VERSION ${V_MAJOR}.${V_MINOR}.${V_PATCH}) +ENDIF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) + # version for internal libraries. set(HUGIN_LIB_VERSION 0.0) Modified: hugin/trunk/platforms/windows/msi/hugin.warsetup =================================================================== --- hugin/trunk/platforms/windows/msi/hugin.warsetup 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/platforms/windows/msi/hugin.warsetup 2007-12-18 21:00:00 UTC (rev 2571) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<WarSetup-Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" nextUniqueId="1144" projectName="Hugin" projectUuid="6cf5fb2f-3021-4ce8-9dfe-386da066c31a" projectUpgradeUuid="a8245656-ca56-43a9-a642-f0e3e4da47a0" projectVersion="${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}" projectOrganization="hugin" projectMustBeAdministratorToInstall="false" project64BitTarget="false" projectTargetDirectory="${CMAKE_INSTALL_PREFIX}/../" projectTargetName="hugin_${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}_install" projectType="0" projectUserInterface="WixUI_InstallDir"> +<WarSetup-Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" nextUniqueId="1144" projectName="Hugin" projectUuid="6cf5fb2f-3021-4ce8-9dfe-386da066c31a" projectUpgradeUuid="a8245656-ca56-43a9-a642-f0e3e4da47a0" projectVersion="${HUGIN_PACKAGE_VERSION}" projectOrganization="hugin" projectMustBeAdministratorToInstall="false" project64BitTarget="false" projectTargetDirectory="${CMAKE_INSTALL_PREFIX}/../" projectTargetName="hugin_${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}_install" projectType="0" projectUserInterface="WixUI_InstallDir"> <projectFeatures featureId="HUGINFEATURE" featureName="hugin" featureDescription="The complete hugin package, including panorama tools suite and enblend" configurableDirectory="APPLICATIONFOLDER" configurableDirectoryDefaultPath="[ProjectName]" enableInDefaultInstall="true" enableInMinimalInstall="true" excludeFromBuild="false"> <components componentId="ID1018" componentGuid="8069d261-a1d9-4803-ac63-5dc632b6186c"> <componentFiles fileId="ID_b72a681c_2075_4b50_bbd7_70ff663ef31f" srcName="PTuncrop.exe" srcDirectory=".\FILES\bin" dstName="PTuncrop.exe" dstPath="bin" isComModule="false" typelibGuid="" menuName="PTuncrop" shortcutInProgramFilesMenu="false" shortcutOnDesktop="false" shortcutInQuickLaunch="false" shortcutWorkingDirectory="" shortcutCommandArguments="" shortcutDescription=""> Added: hugin/trunk/src/hugin1/hugin/xrc/data/.about.htm.in.swp =================================================================== (Binary files differ) Property changes on: hugin/trunk/src/hugin1/hugin/xrc/data/.about.htm.in.swp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: hugin/trunk/src/hugin1/hugin/xrc/data/CMakeLists.txt =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/data/CMakeLists.txt 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/src/hugin1/hugin/xrc/data/CMakeLists.txt 2007-12-18 21:00:00 UTC (rev 2571) @@ -2,6 +2,10 @@ FILE(GLOB DATAFILES *.htm *.html *.ico *.jpg *.png *.xpm *.txt *.mk) INSTALL(FILES ${DATAFILES} DESTINATION ${HUGINDATADIR}/xrc/data) + +configure_file(about.htm.in ${CMAKE_BINARY_DIR}/src/hugin1/hugin/xrc/data/about.htm) +INSTALL(FILES ${CMAKE_BINARY_DIR}/src/hugin1/hugin/xrc/data/about.htm DESTINATION ${HUGINDATADIR}/xrc/data) + IF (UNIX) INSTALL(FILES hugin.png DESTINATION ${DATADIR}/pixmaps) ENDIF (UNIX) Deleted: hugin/trunk/src/hugin1/hugin/xrc/data/about.htm =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/data/about.htm 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/src/hugin1/hugin/xrc/data/about.htm 2007-12-18 21:00:00 UTC (rev 2571) @@ -1,44 +0,0 @@ -<html> - <head> - <title>Hugin</title> - </head> - <body bgcolor="#FFFFFF"> - <center> - <img src="splash.png"></img><p> - <font size=+2>hugin</font><br> - <font size=-1>(http://hugin.sourceforge.net)</font> - <br> - by Pablo d'Angelo - <p> - <b>Additional Authors: </b> - Kai-Uwe Behrmann, Douglas Wilkins, Ed Halley, Ippei Ukai, - Bruno Postle, Alexandre Jenny, Ziv Yaniv, Marek Januszewski<br> - <b>Translators:</b> - Jean-Luc Coulon, - Marek Januszewski, - Lorenz Trischberger, - Luca Vascon, - Alexandre Prokoudine, - Ademar de Souza Reis - Harry van der Wolf - Lu Fang - György Balló - Albert Capellades Badia - Jiri Slaby - Serhij Dubyk - Ulf Wilhelmson - Jozef Riha - Jorge González González - Milo Casagrande - <p> - Hugin uses the EMoR response model from the Computer Vision Lab at Columbia University. - </p> - <b>Thanks to:</b> - Luca Vascon for the logo, - and all members of the PTX email list.<p> - Hugin is licenced under the GPL 2<br> - <b>Copyright (C) 2004-2007</b> by the authors. - </center> - - </body> -</html> Deleted: hugin/trunk/src/hugin1/hugin/xrc/data/about_fr.htm =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/data/about_fr.htm 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/src/hugin1/hugin/xrc/data/about_fr.htm 2007-12-18 21:00:00 UTC (rev 2571) @@ -1,41 +0,0 @@ -<html> - <head> - <title>Hugin</title> - </head> - <body bgcolor="#FFFFFF"> - <center> - <img src="splash.png"></img><p> - <font size=+2>hugin</font><br> - <font size=-1>(http://hugin.sf.net)</font> - <br> - par Pablo d'Angelo - <p> - <b>Autres auteurs : </b> - Kai-Uwe Behrmann, Douglas Wilkins, Ed Halley, Ippei Ukai, - Bruno Postle, Alexandre Jenny, Ziv Yaniv, Marek Januszewski<br> - <b>Traducteurs :</b> - Jean-Luc Coulon, - Marek Januszewski, - Lorenz Trischberger, - Luca Vascon, - Alexandre Prokoudine, - Ademar de Souza Reis - Harry van der Wolf - Lu Fang - György Balló - Albert Capellades Badia - Jiri Slaby - Serhij Dubyk - Ulf Wilhelmson - Jozef Riha - Jorge González González - - <b>Merci à :</b> - Luca Vascon pour le logo, - et tous les membres de la liste de diffusion PTX.<p> - Hugin est diffusé par ses auteurs<br> - selon les termes de la GPL version 2, <b>Copyright (C) 2004-2006</b>. - </center> - - </body> -</html> Deleted: hugin/trunk/src/hugin1/hugin/xrc/data/about_pl.htm =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/data/about_pl.htm 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/src/hugin1/hugin/xrc/data/about_pl.htm 2007-12-18 21:00:00 UTC (rev 2571) @@ -1,42 +0,0 @@ -<html> - <head> - <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-2"> - <title>Hugin</title> - </head> - <body bgcolor="#FFFFFF"> - <center> - <img src="splash.png"></img><p> - <font size=+2>hugin</font><br> - <font size=-1>(http://hugin.sf.net)</font> - <br> - napisany przez Pablo d'Angelo - <p> - <b>Pozostali autorzy: </b> - Kai-Uwe Behrmann, Douglas Wilkins, Ed Halley, Ippei Ukai, - Bruno Postle, Alexandre Jenny, Ziv Yaniv, Marek Januszewski<br> - <b>Tumaczenia:</b> - Jean-Luc Coulon, - Marek Januszewski, - Lorenz Trischberger, - Luca Vascon, - Alexandre Prokoudine, - Ademar de Souza Reis - Harry van der Wolf - Lu Fang - György Balló - Albert Capellades Badia - Jiri Slaby - Serhij Dubyk - Ulf Wilhelmson - Jozef Riha - Jorge González González - - <b>Podzi�owania dla:</b> - Luca Vascon za logo, - i wszystkich czonk� grupy dyskusyjnej PTX.<p> - Hugin jest licencjonowany na GPL 2<br> - <b>Copyright (C) 2004-2006</b> autorzy. - </center> - - </body> -</html> Modified: hugin/trunk/src/hugin_config.h.in.cmake =================================================================== --- hugin/trunk/src/hugin_config.h.in.cmake 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/src/hugin_config.h.in.cmake 2007-12-18 21:00:00 UTC (rev 2571) @@ -5,7 +5,7 @@ #define VERSION_PATCH ${V_PATCH} #define HUGIN_WC_REVISION ${HUGIN_WC_REVISION} -#define PACKAGE_VERSION "${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}" +#define PACKAGE_VERSION "${HUGIN_PACKAGE_VERSION}" /* Define to 1 if you have the <pano12/queryfeature.h> header file. */ #define HAVE_PANO12_QUERYFEATURE_H 1 Modified: hugin/trunk/src/tools/align_image_stack.cpp =================================================================== --- hugin/trunk/src/tools/align_image_stack.cpp 2007-12-18 16:53:54 UTC (rev 2570) +++ hugin/trunk/src/tools/align_image_stack.cpp 2007-12-18 21:00:00 UTC (rev 2571) @@ -64,6 +64,7 @@ static void usage(const char * name) { cerr << name << ": align overlapping images for HDR creation" << std::endl + << "align_image_stack version " << PACKAGE_VERSION << std::endl << std::endl << "Usage: " << name << " [options] input files" << std::endl << "Valid options are:" << std::endl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-12-28 12:32:10
|
Revision: 2578 http://hugin.svn.sourceforge.net/hugin/?rev=2578&view=rev Author: ippei Date: 2007-12-28 04:31:59 -0800 (Fri, 28 Dec 2007) Log Message: ----------- Mac Build. Modified Paths: -------------- hugin/trunk/mac/Hugin-Info.plist hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/localised.sh hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp hugin/trunk/src/hugin1/base_wx/huginConfig.cpp hugin/trunk/src/hugin1/base_wx/platform.cpp hugin/trunk/src/hugin1/base_wx/platform.h hugin/trunk/src/hugin1/hugin/ImagesList.cpp hugin/trunk/src/hugin1/hugin/MainFrame.cpp hugin/trunk/src/hugin1/hugin/PanoPanel.cpp hugin/trunk/src/hugin1/hugin/huginApp.cpp hugin/trunk/src/hugin1/hugin/xrc/cp_editor_panel.xrc hugin/trunk/src/hugin1/hugin/xrc/cp_list_frame.xrc hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h Added Paths: ----------- hugin/trunk/mac/base_wx-Info.plist hugin/trunk/mac/complete-bundle.sh hugin/trunk/mac/hugin_base-Info.plist hugin/trunk/mac/hugin_stitch_project-Info.plist hugin/trunk/mac/vigra_impex-Info.plist Modified: hugin/trunk/mac/Hugin-Info.plist =================================================================== --- hugin/trunk/mac/Hugin-Info.plist 2007-12-27 11:09:25 UTC (rev 2577) +++ hugin/trunk/mac/Hugin-Info.plist 2007-12-28 12:31:59 UTC (rev 2578) @@ -28,7 +28,7 @@ <key>CFBundleExecutable</key> <string>Hugin</string> <key>CFBundleGetInfoString</key> - <string>Hugin 0.7 Lucerne edition</string> + <string>Hugin 0.7svn (experimental)</string> <key>CFBundleIconFile</key> <string>Hugin.icns</string> <key>CFBundleIdentifier</key> @@ -40,10 +40,10 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.7-Lucerne</string> + <string>0.7svn</string> <key>CFBundleSignature</key> <string>Hgin</string> <key>CFBundleVersion</key> - <string>0.7b5l</string> + <string>0.7svn</string> </dict> </plist> Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2007-12-27 11:09:25 UTC (rev 2577) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2007-12-28 12:31:59 UTC (rev 2578) @@ -7,6 +7,19 @@ objects = { /* Begin PBXAggregateTarget section */ + 5769FC280D24A26400A6AD01 /* frameworks */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 5769FC2B0D24A29100A6AD01 /* Build configuration list for PBXAggregateTarget "frameworks" */; + buildPhases = ( + ); + dependencies = ( + 576900950D24D26200A6AD01 /* PBXTargetDependency */, + 5769019A0D24D50800A6AD01 /* PBXTargetDependency */, + 576901980D24D50800A6AD01 /* PBXTargetDependency */, + ); + name = frameworks; + productName = "lib dynamic"; + }; 57A60E920C400269007B5462 /* all */ = { isa = PBXAggregateTarget; buildConfigurationList = 57A60EB20C4002B0007B5462 /* Build configuration list for PBXAggregateTarget "all" */; @@ -63,6 +76,7 @@ dependencies = ( 57E347470C4A8EF8006AA781 /* PBXTargetDependency */, 57525A2E0C54BC8400BF8096 /* PBXTargetDependency */, + 5769FDB30D24BB1D00A6AD01 /* PBXTargetDependency */, ); name = app; productName = app; @@ -119,31 +133,30 @@ 57023BA20C42816A008A44D6 /* PTScriptParsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */; }; 57023BA30C42816A008A44D6 /* SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EEE10C32AE100043F754 /* SrcPanoImage.h */; }; 57023D980C428BF6008A44D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 57023D9D0C428C4B008A44D6 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 57023D9E0C428C4B008A44D6 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 57023D9F0C428C4B008A44D6 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 57023DA00C428C4B008A44D6 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 57023D9D0C428C4B008A44D6 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 57023D9E0C428C4B008A44D6 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 57023D9F0C428C4B008A44D6 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 57023DA00C428C4B008A44D6 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; 57023DA10C428C63008A44D6 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; - 57023DB10C428C83008A44D6 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 57023DB40C428CB2008A44D6 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 57023DB60C428CDE008A44D6 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; - 57023DB70C428CDE008A44D6 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 57023DB90C428CF0008A44D6 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; - 57023DBA0C428D17008A44D6 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; - 57023DBC0C428D30008A44D6 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; - 5706CA3C0C79CD7400EE9694 /* nona in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5796FA950C4395CC006B7C6E /* nona */; }; + 57023DB10C428C83008A44D6 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; + 57023DB40C428CB2008A44D6 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; + 57023DB60C428CDE008A44D6 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 57023DB70C428CDE008A44D6 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; + 57023DB90C428CF0008A44D6 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 57023DBA0C428D17008A44D6 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 57023DBC0C428D30008A44D6 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; 5709A0750C4543E100BD1C53 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 5709A0760C4543E100BD1C53 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 5709A0770C4543E100BD1C53 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 5709A0780C4543E100BD1C53 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 5709A0790C4543E100BD1C53 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; - 5709A07A0C4543E100BD1C53 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; - 5709A07B0C4543E100BD1C53 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; - 5709A07C0C4543E100BD1C53 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; - 5709A07D0C4543E100BD1C53 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 5709A07E0C4543E100BD1C53 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 5709A07F0C4543E100BD1C53 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 5709A0800C4543E100BD1C53 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 5709A0760C4543E100BD1C53 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 5709A0770C4543E100BD1C53 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 5709A0780C4543E100BD1C53 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 5709A0790C4543E100BD1C53 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 5709A07A0C4543E100BD1C53 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 5709A07B0C4543E100BD1C53 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 5709A07C0C4543E100BD1C53 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 5709A07D0C4543E100BD1C53 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; + 5709A07E0C4543E100BD1C53 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 5709A07F0C4543E100BD1C53 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; + 5709A0800C4543E100BD1C53 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; 5709A0810C4543E100BD1C53 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; 5709A0820C4543E100BD1C53 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; 5709A0830C4543E100BD1C53 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; @@ -166,6 +179,7 @@ 5720E4970BD4575000E63404 /* lmlec.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E48B0BD4575000E63404 /* lmlec.c */; }; 5720E4990BD4575000E63404 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E48D0BD4575000E63404 /* misc.c */; }; 57237F2B0C390618005818A4 /* PanoImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F2A0C390618005818A4 /* PanoImage.cpp */; }; + 5739AEC40D251B51000DBBF3 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 573F330509F79BAA0088B333 /* iccjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 573F330409F79BAA0088B333 /* iccjpeg.c */; }; 574092360C393E9000D16607 /* ImageRemapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 574092350C393E9000D16607 /* ImageRemapper.h */; }; 574092390C393E9800D16607 /* RemappedPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 57237F420C391052005818A4 /* RemappedPanoImage.h */; }; @@ -178,32 +192,25 @@ 574092C10C3943D000D16607 /* Stitcher3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4A0C391053005818A4 /* Stitcher3.cpp */; }; 574092C20C3943D000D16607 /* Stitcher4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4B0C391053005818A4 /* Stitcher4.cpp */; }; 57525A390C54BCCB00BF8096 /* nona_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E330BF0C4A87F2006AA781 /* nona_gui.cpp */; }; - 57525A3A0C54BCEA00BF8096 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3EBC081FF2350086E561 /* QuickTime.framework */; }; - 57525A3B0C54BCEA00BF8096 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3F2E082005980086E561 /* IOKit.framework */; }; 57525A3C0C54BCEA00BF8096 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; - 57525A3D0C54BCEA00BF8096 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */; }; - 57525A3E0C54BCEA00BF8096 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3861067C789F00A5DBE0 /* System.framework */; }; - 57525A3F0C54BCEA00BF8096 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3862067C789F00A5DBE0 /* WebKit.framework */; }; 57525A400C54BCEA00BF8096 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; }; 57525A410C54BCEA00BF8096 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 57525A420C54BCEA00BF8096 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 57525A430C54BCEA00BF8096 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57525A440C54BCEA00BF8096 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 57525A450C54BCEA00BF8096 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 57525A460C54BCEA00BF8096 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 57525A470C54BCEA00BF8096 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 57525A480C54BCEA00BF8096 /* libwx_macu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.7.a */; }; - 57525A490C54BCEA00BF8096 /* libwxexpat-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989545068E2F22009F90BF /* libwxexpat-2.7.a */; }; - 57525A4A0C54BCEA00BF8096 /* libwxregexu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989565068E2FA3009F90BF /* libwxregexu-2.7.a */; }; - 57525A4B0C54BCEA00BF8096 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; - 57525A4C0C54BCEA00BF8096 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; - 57525A4D0C54BCEA00BF8096 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; - 57525A4E0C54BCEA00BF8096 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; - 57525A4F0C54BCEA00BF8096 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 57525A510C54BCEA00BF8096 /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; - 57525A520C54BCEA00BF8096 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 57525A530C54BCEA00BF8096 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 57525A540C54BCEA00BF8096 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 57525A440C54BCEA00BF8096 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 57525A450C54BCEA00BF8096 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 57525A460C54BCEA00BF8096 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 57525A470C54BCEA00BF8096 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 57525A480C54BCEA00BF8096 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; + 57525A4B0C54BCEA00BF8096 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 57525A4C0C54BCEA00BF8096 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 57525A4D0C54BCEA00BF8096 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 57525A4E0C54BCEA00BF8096 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 57525A4F0C54BCEA00BF8096 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; + 57525A510C54BCEA00BF8096 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; + 57525A520C54BCEA00BF8096 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; + 57525A530C54BCEA00BF8096 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; + 57525A540C54BCEA00BF8096 /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; }; 57525A550C54BCEA00BF8096 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; 57525A560C54BCEA00BF8096 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; 57525A570C54BCEA00BF8096 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; @@ -211,8 +218,8 @@ 57525A590C54BCEA00BF8096 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; 57525A5A0C54BCEA00BF8096 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 57525A5B0C54BCEA00BF8096 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; - 57525A5C0C54BCEA00BF8096 /* libhuginapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhuginapp.a */; }; - 57525A5D0C54BCEA00BF8096 /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */; }; + 57525A5C0C54BCEA00BF8096 /* libhugin_app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhugin_app.a */; }; + 57525A5D0C54BCEA00BF8096 /* libhugin_wxbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E34A5C0C4ACAA1006AA781 /* libhugin_wxbase.a */; }; 57565A4D0D088CFD00344F55 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A3F0D088CFD00344F55 /* ImageCache.cpp */; }; 57565A4E0D088CFD00344F55 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A400D088CFD00344F55 /* ImageCache.h */; }; 57565A4F0D088CFD00344F55 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A410D088CFD00344F55 /* MyExternalCmdExecDialog.cpp */; }; @@ -227,9 +234,9 @@ 57565A580D088CFD00344F55 /* huginConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A4A0D088CFD00344F55 /* huginConfig.h */; }; 57565A590D088CFD00344F55 /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A4B0D088CFD00344F55 /* platform.cpp */; }; 57565A5A0D088CFD00344F55 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A4C0D088CFD00344F55 /* platform.h */; }; - 57565A650D088DAD00344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */; }; - 57565A660D088DAD00344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */; }; - 57565A740D088EA600344F55 /* libboost_thread-mt-1_34_1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt-1_34_1.a */; }; + 57565A650D088DAD00344F55 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; }; + 57565A660D088DAD00344F55 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; }; + 57565A740D088EA600344F55 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; }; 57565A7C0D088F2E00344F55 /* ComputeImageROI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A790D088F2E00344F55 /* ComputeImageROI.cpp */; }; 57565A7D0D088F2E00344F55 /* ComputeImageROI.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A7A0D088F2E00344F55 /* ComputeImageROI.h */; }; 5759D9C20C3271640043F754 /* Command.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B50C3271640043F754 /* Command.h */; }; @@ -250,32 +257,32 @@ 5759EF270C32B1740043F754 /* ControlPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF250C32B1740043F754 /* ControlPoint.cpp */; }; 5759EF790C32B69F0043F754 /* Lens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF770C32B69F0043F754 /* Lens.cpp */; }; 576482AA0C469052003AFC2F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 576482AB0C469052003AFC2F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 576482AC0C469052003AFC2F /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 576482AD0C469052003AFC2F /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 576482AE0C469052003AFC2F /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; - 576482AF0C469052003AFC2F /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; - 576482B00C469052003AFC2F /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; - 576482B10C469052003AFC2F /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; - 576482B20C469052003AFC2F /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 576482B30C469052003AFC2F /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 576482B40C469052003AFC2F /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 576482B50C469052003AFC2F /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 576482AB0C469052003AFC2F /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 576482AC0C469052003AFC2F /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 576482AD0C469052003AFC2F /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 576482AE0C469052003AFC2F /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 576482AF0C469052003AFC2F /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 576482B00C469052003AFC2F /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 576482B10C469052003AFC2F /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 576482B20C469052003AFC2F /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; + 576482B30C469052003AFC2F /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 576482B40C469052003AFC2F /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; + 576482B50C469052003AFC2F /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; 576482B60C469052003AFC2F /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; 576482B70C469052003AFC2F /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; 576482B80C469052003AFC2F /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; 576482CE0C469056003AFC2F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 576482CF0C469056003AFC2F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 576482D00C469056003AFC2F /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 576482D10C469056003AFC2F /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 576482D20C469056003AFC2F /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; - 576482D30C469056003AFC2F /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; - 576482D40C469056003AFC2F /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; - 576482D50C469056003AFC2F /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; - 576482D60C469056003AFC2F /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 576482D70C469056003AFC2F /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 576482D80C469056003AFC2F /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 576482D90C469056003AFC2F /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 576482CF0C469056003AFC2F /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 576482D00C469056003AFC2F /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 576482D10C469056003AFC2F /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 576482D20C469056003AFC2F /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 576482D30C469056003AFC2F /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 576482D40C469056003AFC2F /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 576482D50C469056003AFC2F /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 576482D60C469056003AFC2F /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; + 576482D70C469056003AFC2F /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 576482D80C469056003AFC2F /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; + 576482D90C469056003AFC2F /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; 576482DA0C469056003AFC2F /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; 576482DB0C469056003AFC2F /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; 576482DC0C469056003AFC2F /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; @@ -283,13 +290,273 @@ 576482ED0C469093003AFC2F /* vig_optimize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576482E90C469093003AFC2F /* vig_optimize.cpp */; }; 576483530C46957A003AFC2F /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 576483540C46957D003AFC2F /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; - 576483550C4695CE003AFC2F /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 576483550C4695CE003AFC2F /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; }; 576483570C4695EA003AFC2F /* libPTLensDB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F8150C30268F00736343 /* libPTLensDB.a */; }; 576483580C4695EA003AFC2F /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; 576483E60C46AD9C003AFC2F /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; 576483E80C46ADA9003AFC2F /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; - 576483F10C46AE05003AFC2F /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 576484130C46AF3D003AFC2F /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; + 576483F10C46AE05003AFC2F /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; }; + 576484130C46AF3D003AFC2F /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; + 576900EA0D24D3DC00A6AD01 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A400D088CFD00344F55 /* ImageCache.h */; }; + 576900EB0D24D3DC00A6AD01 /* MyExternalCmdExecDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A420D088CFD00344F55 /* MyExternalCmdExecDialog.h */; }; + 576900EC0D24D3DC00A6AD01 /* MyProgressDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A440D088CFD00344F55 /* MyProgressDialog.h */; }; + 576900ED0D24D3DC00A6AD01 /* PTWXDlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A460D088CFD00344F55 /* PTWXDlg.h */; }; + 576900EE0D24D3DC00A6AD01 /* Plot2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A480D088CFD00344F55 /* Plot2D.h */; }; + 576900EF0D24D3DC00A6AD01 /* huginConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A4A0D088CFD00344F55 /* huginConfig.h */; }; + 576900F00D24D3DC00A6AD01 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A4C0D088CFD00344F55 /* platform.h */; }; + 576900F10D24D3DC00A6AD01 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A3F0D088CFD00344F55 /* ImageCache.cpp */; }; + 576900F20D24D3DC00A6AD01 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A410D088CFD00344F55 /* MyExternalCmdExecDialog.cpp */; }; + 576900F30D24D3DC00A6AD01 /* MyProgressDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A430D088CFD00344F55 /* MyProgressDialog.cpp */; }; + 576900F40D24D3DC00A6AD01 /* PTWXDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A450D088CFD00344F55 /* PTWXDlg.cpp */; }; + 576900F50D24D3DC00A6AD01 /* Plot2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A470D088CFD00344F55 /* Plot2D.cpp */; }; + 576900F60D24D3DC00A6AD01 /* huginConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A490D088CFD00344F55 /* huginConfig.cpp */; }; + 576900F70D24D3DC00A6AD01 /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A4B0D088CFD00344F55 /* platform.cpp */; }; + 576900F80D24D3DC00A6AD01 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; + 576900FA0D24D3DC00A6AD01 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; + 576900FB0D24D3DC00A6AD01 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 576900FC0D24D3DC00A6AD01 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; }; + 576900FD0D24D3DC00A6AD01 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 576900FE0D24D3DC00A6AD01 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 576900FF0D24D3DC00A6AD01 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 576901000D24D3DC00A6AD01 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 576901010D24D3DC00A6AD01 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 576901020D24D3DC00A6AD01 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 576901030D24D3DC00A6AD01 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 576901040D24D3DC00A6AD01 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; + 576901070D24D3F200A6AD01 /* PanoramaAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83A00C3A7AA900E4965E /* PanoramaAlgorithm.h */; }; + 576901080D24D3F200A6AD01 /* StitcherAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83A10C3A7AA900E4965E /* StitcherAlgorithm.h */; }; + 576901090D24D3F200A6AD01 /* CalculateCPStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83C90C3A800100E4965E /* CalculateCPStatistics.h */; }; + 5769010A0D24D3F200A6AD01 /* CalculateMeanExposure.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA84700C3A8AB400E4965E /* CalculateMeanExposure.h */; }; + 5769010B0D24D3F200A6AD01 /* RotatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA97D80C3A940500E4965E /* RotatePanorama.h */; }; + 5769010C0D24D3F200A6AD01 /* StraightenPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A08D0C3BA90900DD8BD8 /* StraightenPanorama.h */; }; + 5769010D0D24D3F200A6AD01 /* PointSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A0900C3BA90900DD8BD8 /* PointSampler.h */; }; + 5769010E0D24D3F200A6AD01 /* CalculateOptimalScale.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A1890C3BBF5600DD8BD8 /* CalculateOptimalScale.h */; }; + 5769010F0D24D3F200A6AD01 /* PanoramaMakefileExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A1B40C3BD12F00DD8BD8 /* PanoramaMakefileExport.h */; }; + 576901100D24D3F200A6AD01 /* CalculateFOV.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A30C0C3BE6DD00DD8BD8 /* CalculateFOV.h */; }; + 576901110D24D3F200A6AD01 /* CenterHorizontally.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A30E0C3BE6DD00DD8BD8 /* CenterHorizontally.h */; }; + 576901120D24D3F200A6AD01 /* FitPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */; }; + 576901130D24D3F200A6AD01 /* NonaImageStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */; }; + 576901140D24D3F200A6AD01 /* NonaFileStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */; }; + 576901150D24D3F200A6AD01 /* ImageGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA40C3FFF820076A417 /* ImageGraph.h */; }; + 576901160D24D3F200A6AD01 /* PTOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA60C3FFF820076A417 /* PTOptimizer.h */; }; + 576901170D24D3F200A6AD01 /* PhotometricOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA80C3FFF820076A417 /* PhotometricOptimizer.h */; }; + 576901180D24D3F200A6AD01 /* ComputeImageROI.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A7A0D088F2E00344F55 /* ComputeImageROI.h */; }; + 576901190D24D3F200A6AD01 /* Command.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B50C3271640043F754 /* Command.h */; }; + 5769011A0D24D3F200A6AD01 /* CommandHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B60C3271640043F754 /* CommandHistory.h */; }; + 5769011B0D24D3F200A6AD01 /* DocumentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B70C3271640043F754 /* DocumentData.h */; }; + 5769011C0D24D3F200A6AD01 /* ExternalProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B90C3271640043F754 /* ExternalProgram.h */; }; + 5769011D0D24D3F200A6AD01 /* ExternalProgramSetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9BB0C3271640043F754 /* ExternalProgramSetup.h */; }; + 5769011E0D24D3F200A6AD01 /* ProgressDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9BD0C3271640043F754 /* ProgressDisplay.h */; }; + 5769011F0D24D3F200A6AD01 /* ProgressDisplayOld.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9BF0C3271640043F754 /* ProgressDisplayOld.h */; }; + 576901200D24D3F200A6AD01 /* ProgressReporterOld.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9C10C3271640043F754 /* ProgressReporterOld.h */; }; + 576901210D24D3F200A6AD01 /* CachedImageRemapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4A70C3FC9750076A417 /* CachedImageRemapper.h */; }; + 576901220D24D3F200A6AD01 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4A90C3FC9750076A417 /* ImageCache.h */; }; + 576901230D24D3F200A6AD01 /* PanoCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4AA0C3FC9750076A417 /* PanoCommand.h */; }; + 576901240D24D3F200A6AD01 /* Matrix3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C00C3021B000736343 /* Matrix3.h */; }; + 576901250D24D3F200A6AD01 /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C10C3021B000736343 /* Vector3.h */; }; + 576901260D24D3F200A6AD01 /* eig_jacobi.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C30C3021B000736343 /* eig_jacobi.h */; }; + 576901270D24D3F200A6AD01 /* graph.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C50C3021B000736343 /* graph.h */; }; + 576901280D24D3F200A6AD01 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; }; + 576901290D24D3F200A6AD01 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; }; + 5769012A0D24D3F200A6AD01 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5ED0C3007F300736343 /* utils.h */; }; + 5769012B0D24D3F200A6AD01 /* stl_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F6170C30106A00736343 /* stl_utils.h */; }; + 5769012C0D24D3F200A6AD01 /* ImageRemapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 574092350C393E9000D16607 /* ImageRemapper.h */; }; + 5769012D0D24D3F200A6AD01 /* RemappedPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 57237F420C391052005818A4 /* RemappedPanoImage.h */; }; + 5769012E0D24D3F200A6AD01 /* SpaceTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 57237F450C391053005818A4 /* SpaceTransform.h */; }; + 5769012F0D24D3F200A6AD01 /* Stitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 57237F470C391053005818A4 /* Stitcher.h */; }; + 576901300D24D3F200A6AD01 /* ControlPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF260C32B1740043F754 /* ControlPoint.h */; }; + 576901310D24D3F200A6AD01 /* DestPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */; }; + 576901320D24D3F200A6AD01 /* Lens.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF780C32B69F0043F754 /* Lens.h */; }; + 576901330D24D3F200A6AD01 /* PanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759DA600C327DC90043F754 /* PanoImage.h */; }; + 576901340D24D3F200A6AD01 /* Panorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B88E5E0C36CD7E00EC6519 /* Panorama.h */; }; + 576901350D24D3F200A6AD01 /* PanoramaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5713010A0C33E3DD00252FE3 /* PanoramaData.h */; }; + 576901360D24D3F200A6AD01 /* PanoramaOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300820C33D49200252FE3 /* PanoramaOptions.h */; }; + 576901370D24D3F200A6AD01 /* PanoramaVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EE7D0C32AA050043F754 /* PanoramaVariable.h */; }; + 576901380D24D3F200A6AD01 /* PTScriptParsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */; }; + 576901390D24D3F200A6AD01 /* SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EEE10C32AE100043F754 /* SrcPanoImage.h */; }; + 5769013A0D24D3F200A6AD01 /* PanoToolsInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300700C33D43B00252FE3 /* PanoToolsInterface.h */; }; + 5769013B0D24D3F200A6AD01 /* PanoToolsOptimizerWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300720C33D43B00252FE3 /* PanoToolsOptimizerWrapper.h */; }; + 5769013C0D24D3F200A6AD01 /* Correlation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7230C301FC100736343 /* Correlation.h */; }; + 5769013D0D24D3F200A6AD01 /* FitPolynom.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7240C301FC100736343 /* FitPolynom.h */; }; + 5769013E0D24D3F200A6AD01 /* FunctorAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7250C301FC100736343 /* FunctorAccessor.h */; }; + 5769013F0D24D3F200A6AD01 /* HDRUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7260C301FC100736343 /* HDRUtils.h */; }; + 576901400D24D3F200A6AD01 /* ImageTransforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7270C301FC100736343 /* ImageTransforms.h */; }; + 576901410D24D3F200A6AD01 /* Interpolators.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7280C301FC100736343 /* Interpolators.h */; }; + 576901420D24D3F200A6AD01 /* MultiLayerImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7290C301FC100736343 /* MultiLayerImage.h */; }; + 576901430D24D3F200A6AD01 /* MultiThreadOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72B0C301FC100736343 /* MultiThreadOperations.h */; }; + 576901440D24D3F200A6AD01 /* NearestFeatureTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72C0C301FC100736343 /* NearestFeatureTransform.h */; }; + 576901450D24D3F200A6AD01 /* Pyramid.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72D0C301FC100736343 /* Pyramid.h */; }; + 576901460D24D3F200A6AD01 /* ROIImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72E0C301FC100736343 /* ROIImage.h */; }; + 576901470D24D3F200A6AD01 /* RansacParameterEstimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72F0C301FC100736343 /* RansacParameterEstimator.h */; }; + 576901480D24D3F200A6AD01 /* VigQuotientEstimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7300C301FC100736343 /* VigQuotientEstimator.h */; }; + 576901490D24D3F200A6AD01 /* VignettingCorrection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7310C301FC100736343 /* VignettingCorrection.h */; }; + 5769014A0D24D3F200A6AD01 /* blend.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7320C301FC100736343 /* blend.h */; }; + 5769014B0D24D3F200A6AD01 /* emor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7340C301FC100736343 /* emor.h */; }; + 5769014C0D24D3F200A6AD01 /* impexalpha.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7350C301FC100736343 /* impexalpha.hxx */; }; + 5769014D0D24D3F200A6AD01 /* lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7360C301FC100736343 /* lut.h */; }; + 5769014E0D24D3F200A6AD01 /* pyramid2.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7370C301FC100736343 /* pyramid2.h */; }; + 5769014F0D24D3F200A6AD01 /* ransac.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7380C301FC100736343 /* ransac.h */; }; + 576901500D24D3F200A6AD01 /* tiffUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7390C301FC100736343 /* tiffUtils.h */; }; + 576901510D24D3F200A6AD01 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F73A0C301FC100736343 /* utils.h */; }; + 576901520D24D3F200A6AD01 /* CalculateCPStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA83C80C3A800100E4965E /* CalculateCPStatistics.cpp */; }; + 576901530D24D3F200A6AD01 /* CalculateMeanExposure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA846F0C3A8AB400E4965E /* CalculateMeanExposure.cpp */; }; + 576901540D24D3F200A6AD01 /* RotatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */; }; + 576901550D24D3F200A6AD01 /* StraightenPanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A08C0C3BA90900DD8BD8 /* StraightenPanorama.cpp */; }; + 576901560D24D3F200A6AD01 /* PointSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A08F0C3BA90900DD8BD8 /* PointSampler.cpp */; }; + 576901570D24D3F200A6AD01 /* CalculateOptimalScale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A18A0C3BBF5600DD8BD8 /* CalculateOptimalScale.cpp */; }; + 576901580D24D3F200A6AD01 /* PanoramaMakefileExport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A1B30C3BD12F00DD8BD8 /* PanoramaMakefileExport.cpp */; }; + 576901590D24D3F200A6AD01 /* CenterHorizontally.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A30B0C3BE6DD00DD8BD8 /* CenterHorizontally.cpp */; }; + 5769015A0D24D3F200A6AD01 /* CalculateFOV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A30D0C3BE6DD00DD8BD8 /* CalculateFOV.cpp */; }; + 5769015B0D24D3F200A6AD01 /* FitPanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A39F0C3BED7F00DD8BD8 /* FitPanorama.cpp */; }; + 5769015C0D24D3F200A6AD01 /* NonaImageStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */; }; + 5769015D0D24D3F200A6AD01 /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; }; + 5769015E0D24D3F200A6AD01 /* ImageGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA30C3FFF820076A417 /* ImageGraph.cpp */; }; + 5769015F0D24D3F200A6AD01 /* PTOptimizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA50C3FFF820076A417 /* PTOptimizer.cpp */; }; + 576901600D24D3F200A6AD01 /* PhotometricOptimizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA70C3FFF820076A417 /* PhotometricOptimizer.cpp */; }; + 576901610D24D3F200A6AD01 /* ComputeImageROI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A790D088F2E00344F55 /* ComputeImageROI.cpp */; }; + 576901620D24D3F200A6AD01 /* ExternalProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9B80C3271640043F754 /* ExternalProgram.cpp */; }; + 576901630D24D3F200A6AD01 /* ExternalProgramSetup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9BA0C3271640043F754 /* ExternalProgramSetup.cpp */; }; + 576901640D24D3F200A6AD01 /* ProgressDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9BC0C3271640043F754 /* ProgressDisplay.cpp */; }; + 576901650D24D3F200A6AD01 /* ProgressDisplayOld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9BE0C3271640043F754 /* ProgressDisplayOld.cpp */; }; + 576901660D24D3F200A6AD01 /* ProgressReporterOld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9C00C3271640043F754 /* ProgressReporterOld.cpp */; }; + 576901670D24D3F200A6AD01 /* CachedImageRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EC4A60C3FC9750076A417 /* CachedImageRemapper.cpp */; }; + 576901680D24D3F200A6AD01 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EC4A80C3FC9750076A417 /* ImageCache.cpp */; }; + 576901690D24D3F200A6AD01 /* eig_jacobi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C20C3021B000736343 /* eig_jacobi.cpp */; }; + 5769016A0D24D3F200A6AD01 /* graph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C40C3021B000736343 /* graph.cpp */; }; + 5769016B0D24D3F200A6AD01 /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C486C50C312BA8002D79F1 /* Vector3.cpp */; }; + 5769016C0D24D3F200A6AD01 /* Matrix3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C487350C313A2C002D79F1 /* Matrix3.cpp */; }; + 5769016D0D24D3F200A6AD01 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F5EC0C3007F300736343 /* utils.cpp */; }; + 5769016E0D24D3F200A6AD01 /* SpaceTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F440C391052005818A4 /* SpaceTransform.cpp */; }; + 5769016F0D24D3F200A6AD01 /* Stitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F460C391053005818A4 /* Stitcher.cpp */; }; + 576901700D24D3F200A6AD01 /* Stitcher1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F480C391053005818A4 /* Stitcher1.cpp */; }; + 576901710D24D3F200A6AD01 /* Stitcher2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F490C391053005818A4 /* Stitcher2.cpp */; }; + 576901720D24D3F200A6AD01 /* Stitcher3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4A0C391053005818A4 /* Stitcher3.cpp */; }; + 576901730D24D3F200A6AD01 /* Stitcher4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4B0C391053005818A4 /* Stitcher4.cpp */; }; + 576901740D24D3F200A6AD01 /* PanoramaVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EE7B0C32A9FA0043F754 /* PanoramaVariable.cpp */; }; + 576901750D24D3F200A6AD01 /* SrcPanoImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EEE00C32AE100043F754 /* SrcPanoImage.cpp */; }; + 576901760D24D3F200A6AD01 /* ControlPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF250C32B1740043F754 /* ControlPoint.cpp */; }; + 576901770D24D3F200A6AD01 /* Lens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF770C32B69F0043F754 /* Lens.cpp */; }; + 576901780D24D3F200A6AD01 /* PanoramaOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300810C33D49200252FE3 /* PanoramaOptions.cpp */; }; + 576901790D24D3F200A6AD01 /* PTScriptParsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */; }; + 5769017A0D24D3F200A6AD01 /* Panorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */; }; + 5769017B0D24D3F200A6AD01 /* PanoImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F2A0C390618005818A4 /* PanoImage.cpp */; }; + 5769017C0D24D3F200A6AD01 /* PanoToolsInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5713006F0C33D43B00252FE3 /* PanoToolsInterface.cpp */; }; + 5769017D0D24D3F200A6AD01 /* PanoToolsOptimizerWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300710C33D43B00252FE3 /* PanoToolsOptimizerWrapper.cpp */; }; + 5769017E0D24D3F200A6AD01 /* emor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7330C301FC100736343 /* emor.cpp */; }; + 5769017F0D24D3F200A6AD01 /* MultiThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F72A0C301FC100736343 /* MultiThreadOperations.cpp */; }; + 576901800D24D3F200A6AD01 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; + 576901810D24D3F200A6AD01 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; + 576901820D24D3F200A6AD01 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 576901830D24D3F200A6AD01 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; }; + 576901840D24D3F200A6AD01 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 576901850D24D3F200A6AD01 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 576901860D24D3F200A6AD01 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 576901870D24D3F200A6AD01 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 576901880D24D3F200A6AD01 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 576901890D24D3F200A6AD01 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 5769018A0D24D3F200A6AD01 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 5769018B0D24D3F200A6AD01 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; + 576901A50D24D55D00A6AD01 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 576901A70D24D56700A6AD01 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576901AA0D24D57600A6AD01 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576901C40D24D7DB00A6AD01 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576901C50D24D7DB00A6AD01 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 576901C60D24D7DB00A6AD01 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 576901CA0D24D81000A6AD01 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576901CB0D24D81000A6AD01 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 576901CC0D24D81000A6AD01 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 576901D70D24D88E00A6AD01 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576901D80D24D88E00A6AD01 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 576901DB0D24D89A00A6AD01 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576901DC0D24D89A00A6AD01 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 576901E40D24D8CF00A6AD01 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; }; + 576901EB0D24D95100A6AD01 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576901EC0D24D95100A6AD01 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 576901ED0D24D95100A6AD01 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 576902000D24DA7200A6AD01 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 576902010D24DA7200A6AD01 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 576902020D24DA7200A6AD01 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 5769F60B0D23825700A6AD01 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; + 5769F60F0D23825700A6AD01 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; }; + 5769F6100D23825700A6AD01 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 5769F6110D23825700A6AD01 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 5769F6120D23825700A6AD01 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; + 5769F6130D23825700A6AD01 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 5769F6140D23825700A6AD01 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 5769F6150D23825700A6AD01 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 5769F6160D23825700A6AD01 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 5769F6170D23825700A6AD01 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; }; + 5769F6180D23825700A6AD01 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 5769F6190D23825700A6AD01 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF3477... [truncated message content] |
From: <ip...@us...> - 2007-12-29 03:40:12
|
Revision: 2579 http://hugin.svn.sourceforge.net/hugin/?rev=2579&view=rev Author: ippei Date: 2007-12-28 19:40:10 -0800 (Fri, 28 Dec 2007) Log Message: ----------- Mac minor tweaks, linux compile fix Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/complete-bundle.sh hugin/trunk/src/hugin1/hugin/CPListFrame.cpp hugin/trunk/src/hugin1/hugin/PanoPanel.cpp Added Paths: ----------- hugin/trunk/mac/ExternalPrograms/PutAutopanoSiftToHugin.applescript hugin/trunk/mac/complete-embed.sh Added: hugin/trunk/mac/ExternalPrograms/PutAutopanoSiftToHugin.applescript =================================================================== --- hugin/trunk/mac/ExternalPrograms/PutAutopanoSiftToHugin.applescript (rev 0) +++ hugin/trunk/mac/ExternalPrograms/PutAutopanoSiftToHugin.applescript 2007-12-29 03:40:10 UTC (rev 2579) @@ -0,0 +1,29 @@ +display alert "Do you know what you are doing?" message \xC2 + "Please read the readme and license files carefully before use. You'd better know what you are doing before you proceed." buttons {"Quit", "OK"} cancel button 1 as warning + +tell application "Finder" + copy "" to autopanoDirPath + repeat while autopanoDirPath is equal to "" + copy (choose folder with prompt "Where is autopano-sift bin folder?" without invisibles) to autopanoDirPath + if (not (exists file "autopano.exe" of folder autopanoDirPath)) \xC2 + or (not (exists file "generatekeys-sd.exe" of folder autopanoDirPath)) \xC2 + or (not (exists file "libsift.dll" of folder autopanoDirPath)) then + copy "" to autopanoDirPath + display alert "Error: autopano-sift file names do not match" as warning + end if + end repeat + copy "" to huginPath + repeat while huginPath is equal to "" + copy (choose file of type {"APPL"} with prompt "Where is Hugin.app?" without invisibles) to huginPath + if the name of file huginPath is not equal to "Hugin.app" then + copy "" to huginPath + display alert "Error: Hugin.app file name do not match" as warning + end if + end repeat + if exists folder "autopano-sift" of folder "Contents:Resources:" of file huginPath then delete folder "autopano-sift" of folder "Contents:Resources:" of file huginPath + + copy (make new folder with properties {name:"autopano-sift"} at folder "Contents:Resources:" of file huginPath) to autopanoSiftFolder + duplicate file "autopano.exe" of folder autopanoDirPath to autopanoSiftFolder + duplicate file "generatekeys-sd.exe" of folder autopanoDirPath to autopanoSiftFolder + duplicate file "libsift.dll" of folder autopanoDirPath to autopanoSiftFolder +end tell \ No newline at end of file Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2007-12-28 12:31:59 UTC (rev 2578) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2007-12-29 03:40:10 UTC (rev 2579) @@ -7,6 +7,18 @@ objects = { /* Begin PBXAggregateTarget section */ + 571046810D25F698006A3C69 /* bundled tools */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 571046860D25F6C1006A3C69 /* Build configuration list for PBXAggregateTarget "bundled tools" */; + buildPhases = ( + ); + dependencies = ( + 571046850D25F6A1006A3C69 /* PBXTargetDependency */, + 571046830D25F6A1006A3C69 /* PBXTargetDependency */, + ); + name = "bundled tools"; + productName = "bundled tools"; + }; 5769FC280D24A26400A6AD01 /* frameworks */ = { isa = PBXAggregateTarget; buildConfigurationList = 5769FC2B0D24A29100A6AD01 /* Build configuration list for PBXAggregateTarget "frameworks" */; @@ -87,8 +99,6 @@ buildPhases = ( ); dependencies = ( - 57E3473D0C4A8EF4006AA781 /* PBXTargetDependency */, - 57E3473B0C4A8EF4006AA781 /* PBXTargetDependency */, 57E347390C4A8EF4006AA781 /* PBXTargetDependency */, 57E347370C4A8EF4006AA781 /* PBXTargetDependency */, 57E347350C4A8EF4006AA781 /* PBXTargetDependency */, @@ -99,8 +109,6 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 5702273C0C4260CC008A44D6 /* open_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570227180C425C6A008A44D6 /* open_file.cpp */; }; - 57023B300C427838008A44D6 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; 57023B470C4279A2008A44D6 /* auto_file.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0206BC2301004F4FA7 /* auto_file.hxx */; }; 57023B480C4279A2008A44D6 /* bmp.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0406BC2301004F4FA7 /* bmp.hxx */; }; 57023B490C4279A2008A44D6 /* byteorder.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0606BC2301004F4FA7 /* byteorder.hxx */; }; @@ -118,7 +126,6 @@ 57023B560C4279A2008A44D6 /* tiff.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57023B460C427981008A44D6 /* tiff.hxx */; }; 57023B570C4279A2008A44D6 /* viff.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F1906BC2301004F4FA7 /* viff.hxx */; }; 57023B580C4279A2008A44D6 /* void_vector.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F1B06BC2301004F4FA7 /* void_vector.hxx */; }; - 57023B620C427AB4008A44D6 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; 57023B910C428147008A44D6 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; }; 57023B920C428147008A44D6 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5ED0C3007F300736343 /* utils.h */; }; 57023B930C428147008A44D6 /* stl_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F6170C30106A00736343 /* stl_utils.h */; }; @@ -132,19 +139,6 @@ 57023BA10C42816A008A44D6 /* PanoramaVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EE7D0C32AA050043F754 /* PanoramaVariable.h */; }; 57023BA20C42816A008A44D6 /* PTScriptParsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */; }; 57023BA30C42816A008A44D6 /* SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EEE10C32AE100043F754 /* SrcPanoImage.h */; }; - 57023D980C428BF6008A44D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 57023D9D0C428C4B008A44D6 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; - 57023D9E0C428C4B008A44D6 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; - 57023D9F0C428C4B008A44D6 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; - 57023DA00C428C4B008A44D6 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; - 57023DA10C428C63008A44D6 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; - 57023DB10C428C83008A44D6 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; - 57023DB40C428CB2008A44D6 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; - 57023DB60C428CDE008A44D6 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; - 57023DB70C428CDE008A44D6 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; - 57023DB90C428CF0008A44D6 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; - 57023DBA0C428D17008A44D6 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; - 57023DBC0C428D30008A44D6 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; 5709A0750C4543E100BD1C53 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 5709A0760C4543E100BD1C53 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; 5709A0770C4543E100BD1C53 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; @@ -161,6 +155,12 @@ 5709A0820C4543E100BD1C53 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; 5709A0830C4543E100BD1C53 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; 5709A08D0C45440200BD1C53 /* autooptimiser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */; }; + 5710466C0D25F577006A3C69 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 5710466D0D25F577006A3C69 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 5710466E0D25F577006A3C69 /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; + 571046720D25F5BE006A3C69 /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; }; + 571046730D25F5BE006A3C69 /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; }; + 571046740D25F5BE006A3C69 /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; }; 571152F806BC6E4C004F4FA7 /* bmp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0306BC2301004F4FA7 /* bmp.cxx */; }; 571152F906BC6E58004F4FA7 /* byteorder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0506BC2301004F4FA7 /* byteorder.cxx */; }; 571152FE06BC6E8E004F4FA7 /* codecmanager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0706BC2301004F4FA7 /* codecmanager.cxx */; }; @@ -207,19 +207,6 @@ 57525A4D0C54BCEA00BF8096 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; 57525A4E0C54BCEA00BF8096 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; 57525A4F0C54BCEA00BF8096 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; - 57525A510C54BCEA00BF8096 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; - 57525A520C54BCEA00BF8096 /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; - 57525A530C54BCEA00BF8096 /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; - 57525A540C54BCEA00BF8096 /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; }; - 57525A550C54BCEA00BF8096 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; - 57525A560C54BCEA00BF8096 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; - 57525A570C54BCEA00BF8096 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; - 57525A580C54BCEA00BF8096 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; - 57525A590C54BCEA00BF8096 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; - 57525A5A0C54BCEA00BF8096 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; - 57525A5B0C54BCEA00BF8096 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; - 57525A5C0C54BCEA00BF8096 /* libhugin_app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhugin_app.a */; }; - 57525A5D0C54BCEA00BF8096 /* libhugin_wxbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E34A5C0C4ACAA1006AA781 /* libhugin_wxbase.a */; }; 57565A4D0D088CFD00344F55 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A3F0D088CFD00344F55 /* ImageCache.cpp */; }; 57565A4E0D088CFD00344F55 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A400D088CFD00344F55 /* ImageCache.h */; }; 57565A4F0D088CFD00344F55 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A410D088CFD00344F55 /* MyExternalCmdExecDialog.cpp */; }; @@ -711,41 +698,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 570227880C426363008A44D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5759DA4E0C327D680043F754; - remoteInfo = panodata; - }; - 57023B6D0C427B8E008A44D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F5D60C3006E900736343; - remoteInfo = hugin_utils; - }; - 57023DC80C428DE6008A44D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 571300640C33D41F00252FE3; - remoteInfo = panotools; - }; - 57023DCE0C428DE7008A44D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 57023DD00C428DE7008A44D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; 5709A0690C4543E100BD1C53 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -788,6 +740,27 @@ remoteGlobalIDString = 5759D9AB0C32713F0043F754; remoteInfo = appbase; }; + 5710467B0D25F5EF006A3C69 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769FC280D24A26400A6AD01 /* frameworks */; + remoteInfo = frameworks; + }; + 571046820D25F6A1006A3C69 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */; + remoteInfo = "hugin_hdrmerge dynamic"; + }; + 571046840D25F6A1006A3C69 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5796FA730C4395CC006B7C6E /* nona dynamic */; + remoteInfo = "nona dynamic"; + }; 5737BC380C4CF7BA00A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -907,20 +880,6 @@ remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; - 57525A330C54BCA400BF8096 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57E3470D0C4A8E95006AA781; - remoteInfo = "lib static"; - }; - 57525A350C54BCA500BF8096 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57E34A5B0C4ACAA1006AA781; - remoteInfo = huginwxutils; - }; 5764829E0C469052003AFC2F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1320,20 +1279,6 @@ remoteGlobalIDString = 5709A0670C4543E100BD1C53; remoteInfo = "test autooptimiser"; }; - 57E3473A0C4A8EF4006AA781 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5796FA730C4395CC006B7C6E; - remoteInfo = "test nona"; - }; - 57E3473C0C4A8EF4006AA781 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5702272E0C42605C008A44D6; - remoteInfo = "test open_file"; - }; 57E347460C4A8EF8006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1358,6 +1303,19 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 5710466F0D25F5AA006A3C69 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 571046720D25F5BE006A3C69 /* HuginVigraImpex.framework in Copy Frameworks */, + 571046730D25F5BE006A3C69 /* HuginBase.framework in Copy Frameworks */, + 571046740D25F5BE006A3C69 /* HuginBaseWx.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 576901E60D24D93300A6AD01 /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1406,7 +1364,6 @@ /* Begin PBXFileReference section */ 570227180C425C6A008A44D6 /* open_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = open_file.cpp; sourceTree = "<group>"; }; - 5702272F0C42605C008A44D6 /* open_file */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = open_file; sourceTree = BUILT_PRODUCTS_DIR; }; 57023B460C427981008A44D6 /* tiff.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tiff.hxx; sourceTree = "<group>"; }; 5702996D07F967CB00F1FF15 /* HuginFiles.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginFiles.icns; sourceTree = "<group>"; }; 57098D730C453E5F00BD1C53 /* hugin_basic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin_basic.h; sourceTree = "<group>"; }; @@ -1879,7 +1836,7 @@ 57E331310C4A8859006AA781 /* PTStitcherPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTStitcherPanel.h; sourceTree = "<group>"; }; 57E331340C4A8859006AA781 /* PanoDruid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoDruid.cpp; sourceTree = "<group>"; }; 57E331350C4A8859006AA781 /* PanoDruid.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoDruid.h; sourceTree = "<group>"; }; - 57E331360C4A8859006AA781 /* PanoPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoPanel.cpp; sourceTree = "<group>"; }; + 57E331360C4A8859006AA781 /* PanoPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PanoPanel.cpp; sourceTree = "<group>"; }; 57E331370C4A8859006AA781 /* PanoPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoPanel.h; sourceTree = "<group>"; }; 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PreferencesDialog.cpp; sourceTree = "<group>"; }; 57E3313B0C4A8859006AA781 /* PreferencesDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesDialog.h; sourceTree = "<group>"; }; @@ -1922,28 +1879,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 5702272D0C42605C008A44D6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 57023D980C428BF6008A44D6 /* libz.dylib in Frameworks */, - 57023D9E0C428C4B008A44D6 /* libpng.3.dylib in Frameworks */, - 57023D9F0C428C4B008A44D6 /* libtiff.3.dylib in Frameworks */, - 57023DA00C428C4B008A44D6 /* libjpeg.62.dylib in Frameworks */, - 57023DB90C428CF0008A44D6 /* libIex.6.dylib in Frameworks */, - 57023DBA0C428D17008A44D6 /* libIlmThread.6.dylib in Frameworks */, - 57023DB60C428CDE008A44D6 /* libIlmImf.6.dylib in Frameworks */, - 57023DBC0C428D30008A44D6 /* libImath.6.dylib in Frameworks */, - 57023DB70C428CDE008A44D6 /* libHalf.6.dylib in Frameworks */, - 57023D9D0C428C4B008A44D6 /* libpano13.dylib in Frameworks */, - 57023DB40C428CB2008A44D6 /* libhugin_jhead.a in Frameworks */, - 57023DB10C428C83008A44D6 /* libhugin_vigra_impex.a in Frameworks */, - 57023B620C427AB4008A44D6 /* libhugin_utils.a in Frameworks */, - 57023DA10C428C63008A44D6 /* libhugin_panotools.a in Frameworks */, - 57023B300C427838008A44D6 /* libhugin_panodata.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5709A0740C4543E100BD1C53 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1989,20 +1924,10 @@ 57525A4D0C54BCEA00BF8096 /* libIlmThread.6.dylib in Frameworks */, 57525A4E0C54BCEA00BF8096 /* libImath.6.dylib in Frameworks */, 57525A4F0C54BCEA00BF8096 /* libHalf.6.dylib in Frameworks */, - 57525A510C54BCEA00BF8096 /* libhugin_levmar.a in Frameworks */, - 57525A520C54BCEA00BF8096 /* libhugin_jhead.a in Frameworks */, - 57525A530C54BCEA00BF8096 /* libhugin_vigra_impex.a in Frameworks */, - 57525A540C54BCEA00BF8096 /* libhugin_vigra_ext.a in Frameworks */, - 57525A550C54BCEA00BF8096 /* libhugin_utils.a in Frameworks */, - 57525A560C54BCEA00BF8096 /* libhugin_math.a in Frameworks */, - 57525A570C54BCEA00BF8096 /* libhugin_appbase.a in Frameworks */, - 57525A580C54BCEA00BF8096 /* libhugin_panodata.a in Frameworks */, - 57525A590C54BCEA00BF8096 /* libhugin_panotools.a in Frameworks */, - 57525A5A0C54BCEA00BF8096 /* libhugin_nona.a in Frameworks */, - 57525A5B0C54BCEA00BF8096 /* libhugin_algorithms.a in Frameworks */, - 57525A5C0C54BCEA00BF8096 /* libhugin_app.a in Frameworks */, - 57525A5D0C54BCEA00BF8096 /* libhugin_wxbase.a in Frameworks */, 57565A660D088DAD00344F55 /* libboost_thread-mt.dylib in Frameworks */, + 5710466C0D25F577006A3C69 /* HuginVigraImpex.framework in Frameworks */, + 5710466D0D25F577006A3C69 /* HuginBase.framework in Frameworks */, + 5710466E0D25F577006A3C69 /* HuginBaseWx.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2607,7 +2532,6 @@ 57525A1E0C54BBF600BF8096 /* test */ = { isa = PBXGroup; children = ( - 5702272F0C42605C008A44D6 /* open_file */, ); name = test; sourceTree = "<group>"; @@ -2915,8 +2839,8 @@ isa = PBXGroup; children = ( 57E3467E0C4A89B0006AA781 /* Hugin.app */, - 57525A250C54BC4400BF8096 /* Nona.app */, 5769F6300D23825700A6AD01 /* HuginStitchProject.app */, + 57525A250C54BC4400BF8096 /* Nona.app */, ); name = "Mac OS X"; sourceTree = "<group>"; @@ -3534,31 +3458,10 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 5702272E0C42605C008A44D6 /* test open_file */ = { + 5709A0670C4543E100BD1C53 /* autooptimiser static */ = { isa = PBXNativeTarget; - buildConfigurationList = 570227310C426099008A44D6 /* Build configuration list for PBXNativeTarget "test open_file" */; + buildConfigurationList = 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "autooptimiser static" */; buildPhases = ( - 5702272C0C42605C008A44D6 /* Sources */, - 5702272D0C42605C008A44D6 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 57023DCF0C428DE7008A44D6 /* PBXTargetDependency */, - 57023DD10C428DE7008A44D6 /* PBXTargetDependency */, - 57023B6E0C427B8E008A44D6 /* PBXTargetDependency */, - 57023DC90C428DE6008A44D6 /* PBXTargetDependency */, - 570227890C426363008A44D6 /* PBXTargetDependency */, - ); - name = "test open_file"; - productName = "sample open_close"; - productReference = 5702272F0C42605C008A44D6 /* open_file */; - productType = "com.apple.product-type.tool"; - }; - 5709A0670C4543E100BD1C53 /* tools autooptimiser */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "tools autooptimiser" */; - buildPhases = ( 5709A0720C4543E100BD1C53 /* Sources */, 5709A0740C4543E100BD1C53 /* Frameworks */, ); @@ -3574,7 +3477,7 @@ 57DB9BC00C454B96004957C2 /* PBXTargetDependency */, 57DB9BCB0C454C10004957C2 /* PBXTargetDependency */, ); - name = "tools autooptimiser"; + name = "autooptimiser static"; productName = "sample open_close"; productReference = 5709A0890C4543E100BD1C53 /* autooptimiser */; productType = "com.apple.product-type.tool"; @@ -3670,13 +3573,14 @@ buildPhases = ( 57525A220C54BC4400BF8096 /* Sources */, 57525A230C54BC4400BF8096 /* Frameworks */, + 5710466F0D25F5AA006A3C69 /* Copy Frameworks */, + 571046750D25F5C5006A3C69 /* Complete Bundle */, ); buildRules = ( ); dependencies = ( 57525A320C54BCA400BF8096 /* PBXTargetDependency */, - 57525A340C54BCA400BF8096 /* PBXTargetDependency */, - 57525A360C54BCA500BF8096 /* PBXTargetDependency */, + 5710467C0D25F5EF006A3C69 /* PBXTargetDependency */, ); name = Nona; productName = Nona; @@ -3717,9 +3621,9 @@ productReference = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; productType = "com.apple.product-type.library.static"; }; - 5764829C0C469052003AFC2F /* tools fulla */ = { + 5764829C0C469052003AFC2F /* fulla static */ = { isa = PBXNativeTarget; - buildConfigurationList = 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "tools fulla" */; + buildConfigurationList = 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "fulla static" */; buildPhases = ( 576482A70C469052003AFC2F /* Sources */, 576482A90C469052003AFC2F /* Frameworks */, @@ -3738,14 +3642,14 @@ 5764835C0C46961B003AFC2F /* PBXTargetDependency */, 576483600C46961F003AFC2F /* PBXTargetDependency */, ); - name = "tools fulla"; + name = "fulla static"; productName = "sample open_close"; productReference = 576482BE0C469052003AFC2F /* fulla */; productType = "com.apple.product-type.tool"; }; - 576482C00C469056003AFC2F /* tools vig_optimize */ = { + 576482C00C469056003AFC2F /* vig_optimize static */ = { isa = PBXNativeTarget; - buildConfigurationList = 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "tools vig_optimize" */; + buildConfigurationList = 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "vig_optimize static" */; buildPhases = ( 576482CB0C469056003AFC2F /* Sources */, 576482CD0C469056003AFC2F /* Frameworks */, @@ -3762,7 +3666,7 @@ 576482C90C469056003AFC2F /* PBXTargetDependency */, 576484010C46AF0A003AFC2F /* PBXTargetDependency */, ); - name = "tools vig_optimize"; + name = "vig_optimize static"; productName = "sample open_close"; productReference = 576482E20C469056003AFC2F /* vig_optimize */; productType = "com.apple.product-type.tool"; @@ -3816,6 +3720,7 @@ 5769F6080D23825700A6AD01 /* Frameworks */, 5769F79C0D239D0A00A6AD01 /* Copy Executable Files */, 576901FD0D24DA4B00A6AD01 /* Copy Frameworks */, + 571046570D25F45A006A3C69 /* Complete Bundle */, ); buildRules = ( ); @@ -3830,9 +3735,9 @@ productReference = 5769F6300D23825700A6AD01 /* HuginStitchProject.app */; productType = "com.apple.product-type.application"; }; - 5769F8460D23AA5D00A6AD01 /* tools hugin_hdrmerge */ = { + 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */ = { isa = PBXNativeTarget; - buildConfigurationList = 5769F86D0D23AA5D00A6AD01 /* Build configuration list for PBXNativeTarget "tools hugin_hdrmerge" */; + buildConfigurationList = 5769F86D0D23AA5D00A6AD01 /* Build configuration list for PBXNativeTarget "hugin_hdrmerge dynamic" */; buildPhases = ( 5769F8570D23AA5D00A6AD01 /* Sources */, 5769F8590D23AA5D00A6AD01 /* Frameworks */, @@ -3843,7 +3748,7 @@ 576901E10D24D8A900A6AD01 /* PBXTargetDependency */, 576901DF0D24D8A900A6AD01 /* PBXTargetDependency */, ); - name = "tools hugin_hdrmerge"; + name = "hugin_hdrmerge dynamic"; productName = "sample open_close"; productReference = 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */; productType = "com.apple.product-type.tool"; @@ -3934,9 +3839,9 @@ productReference = 5771F8150C30268F00736343 /* libPTLensDB.a */; productType = "com.apple.product-type.library.static"; }; - 5796FA730C4395CC006B7C6E /* tools nona */ = { + 5796FA730C4395CC006B7C6E /* nona dynamic */ = { isa = PBXNativeTarget; - buildConfigurationList = 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "tools nona" */; + buildConfigurationList = 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "nona dynamic" */; buildPhases = ( 5796FA7E0C4395CC006B7C6E /* Sources */, 5796FA800C4395CC006B7C6E /* Frameworks */, @@ -3947,7 +3852,7 @@ 576901D40D24D87F00A6AD01 /* PBXTargetDependency */, 576901D20D24D87F00A6AD01 /* PBXTargetDependency */, ); - name = "tools nona"; + name = "nona dynamic"; productName = "sample open_close"; productReference = 5796FA950C4395CC006B7C6E /* nona */; productType = "com.apple.product-type.tool"; @@ -3978,7 +3883,8 @@ 57E3467A0C4A89B0006AA781 /* Resources */, 57E347640C4A8F9F006AA781 /* Resourse Script */, 576901E60D24D93300A6AD01 /* Copy Frameworks */, - 576902030D24DA9500A6AD01 /* Complete Bundling */, + 576902030D24DA9500A6AD01 /* Complete Bundle */, + 5710465D0D25F490006A3C69 /* Complete Embedding */, ); buildRules = ( ); @@ -4052,10 +3958,10 @@ 57C486290C3121E8002D79F1 /* copy hugin_config.h */, 57A60E920C400269007B5462 /* all */, 57E3470D0C4A8E95006AA781 /* lib static */, - 5711524906BC6709004F4FA7 /* vigra_impex */, 5720E4720BD456CD00E63404 /* levmar */, - 5771F8140C30268F00736343 /* PTLensDB */, 5749F8A2067B60CA00A6EDD4 /* jhead */, + 5771F8140C30268F00736343 /* PTLensDB */, + 5711524906BC6709004F4FA7 /* vigra_impex */, 57C1705809A125DE00FAF325 /* vigra_ext */, 5771F5D60C3006E900736343 /* hugin_utils */, 5771F7790C30216F00736343 /* hugin_math */, @@ -4070,17 +3976,17 @@ 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */, 576900A90D24D29300A6AD01 /* hugin_base Framework */, 576900D70D24D32C00A6AD01 /* base_wx Framework */, + 571046810D25F698006A3C69 /* bundled tools */, + 5796FA730C4395CC006B7C6E /* nona dynamic */, + 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */, 57E347300C4A8EDF006AA781 /* app */, - 5796FA730C4395CC006B7C6E /* tools nona */, - 5769F8460D23AA5D00A6AD01 /* tools hugin_hdrmerge */, 5769F5FF0D23825700A6AD01 /* StitchProject */, 57E3467D0C4A89B0006AA781 /* Hugin */, - 57E347330C4A8EED006AA781 /* tools */, 57525A240C54BC4400BF8096 /* Nona */, - 5702272E0C42605C008A44D6 /* test open_file */, - 5709A0670C4543E100BD1C53 /* tools autooptimiser */, - 5764829C0C469052003AFC2F /* tools fulla */, - 576482C00C469056003AFC2F /* tools vig_optimize */, + 57E347330C4A8EED006AA781 /* tools */, + 5709A0670C4543E100BD1C53 /* autooptimiser static */, + 5764829C0C469052003AFC2F /* fulla static */, + 576482C00C469056003AFC2F /* vig_optimize static */, ); }; /* End PBXProject section */ @@ -4121,20 +4027,62 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 576902030D24DA9500A6AD01 /* Complete Bundling */ = { + 571046570D25F45A006A3C69 /* Complete Bundle */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Complete Bundling"; + name = "Complete Bundle"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi"; }; + 5710465D0D25F490006A3C69 /* Complete Embedding */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete Embedding"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-embed.sh\nfi"; + }; + 571046750D25F5C5006A3C69 /* Complete Bundle */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete Bundle"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi"; + }; + 576902030D24DA9500A6AD01 /* Complete Bundle */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Complete Bundle"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi"; + }; 57C4863E0C3122C4002D79F1 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -4167,14 +4115,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 5702272C0C42605C008A44D6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5702273C0C4260CC008A44D6 /* open_file.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5709A0720C4543E100BD1C53 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4536,31 +4476,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 570227890C426363008A44D6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5759DA4E0C327D680043F754 /* panodata */; - targetProxy = 570227880C426363008A44D6 /* PBXContainerItemProxy */; - }; - 57023B6E0C427B8E008A44D6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F5D60C3006E900736343 /* hugin_utils */; - targetProxy = 57023B6D0C427B8E008A44D6 /* PBXContainerItemProxy */; - }; - 57023DC90C428DE6008A44D6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 571300640C33D41F00252FE3 /* panotools */; - targetProxy = 57023DC80C428DE6008A44D6 /* PBXContainerItemProxy */; - }; - 57023DCF0C428DE7008A44D6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5749F8A2067B60CA00A6EDD4 /* jhead */; - targetProxy = 57023DCE0C428DE7008A44D6 /* PBXContainerItemProxy */; - }; - 57023DD10C428DE7008A44D6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5711524906BC6709004F4FA7 /* vigra_impex */; - targetProxy = 57023DD00C428DE7008A44D6 /* PBXContainerItemProxy */; - }; 5709A0680C4543E100BD1C53 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5749F8A2067B60CA00A6EDD4 /* jhead */; @@ -4591,6 +4506,21 @@ target = 5759D9AB0C32713F0043F754 /* appbase */; targetProxy = 5709A0D30C45481500BD1C53 /* PBXContainerItemProxy */; }; + 5710467C0D25F5EF006A3C69 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769FC280D24A26400A6AD01 /* frameworks */; + targetProxy = 5710467B0D25F5EF006A3C69 /* PBXContainerItemProxy */; + }; + 571046830D25F6A1006A3C69 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */; + targetProxy = 571046820D25F6A1006A3C69 /* PBXContainerItemProxy */; + }; + 571046850D25F6A1006A3C69 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5796FA730C4395CC006B7C6E /* nona dynamic */; + targetProxy = 571046840D25F6A1006A3C69 /* PBXContainerItemProxy */; + }; 5737BC390C4CF7BA00A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; @@ -4676,16 +4606,6 @@ target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; targetProxy = 57525A310C54BCA400BF8096 /* PBXContainerItemProxy */; }; - 57525A340C54BCA400BF8096 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 57E3470D0C4A8E95006AA781 /* lib static */; - targetProxy = 57525A330C54BCA400BF8096 /* PBXContainerItemProxy */; - }; - 57525A360C54BCA500BF8096 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 57E34A5B0C4ACAA1006AA781 /* wxbase */; - targetProxy = 57525A350C54BCA500BF8096 /* PBXContainerItemProxy */; - }; 5764829D0C469052003AFC2F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5749F8A2067B60CA00A6EDD4 /* jhead */; @@ -4853,12 +4773,12 @@ }; 5769F8840D23AAE800A6AD01 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5769F8460D23AA5D00A6AD01 /* tools hugin_hdrmerge */; + target = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */; targetProxy = 5769F8830D23AAE800A6AD01 /* PBXContainerItemProxy */; }; 5769F8860D23AAEB00A6AD01 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5796FA730C4395CC006B7C6E /* tools nona */; + target = 5796FA730C4395CC006B7C6E /* nona dynamic */; targetProxy = 5769F8850D23AAEB00A6AD01 /* PBXContainerItemProxy */; }; 5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */ = { @@ -4958,29 +4878,19 @@ }; 57E347350C4A8EF4006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 576482C00C469056003AFC2F /* tools vig_optimize */; + target = 576482C00C469056003AFC2F /* vig_optimize static */; targetProxy = 57E347340C4A8EF4006AA781 /* PBXContainerItemProxy */; }; 57E347370C4A8EF4006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5764829C0C469052003AFC2F /* tools fulla */; + target = 5764829C0C469052003AFC2F /* fulla static */; targetProxy = 57E347360C4A8EF4006AA781 /* PBXContainerItemProxy */; }; 57E347390C4A8EF4006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5709A0670C4543E100BD1C53 /* tools autooptimiser */; + target = 5709A0670C4543E100BD1C53 /* autooptimiser static */; targetProxy = 57E347380C4A8EF4006AA781 /* PBXContainerItemProxy */; }; - 57E3473B0C4A8EF4006AA781 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5796FA730C4395CC006B7C6E /* tools nona */; - targetProxy = 57E3473A0C4A8EF4006AA781 /* PBXContainerItemProxy */; - }; - 57E3473D0C4A8EF4006AA781 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5702272E0C42605C008A44D6 /* test open_file */; - targetProxy = 57E3473C0C4A8EF4006AA781 /* PBXContainerItemProxy */; - }; 57E347470C4A8EF8006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57E3467D0C4A89B0006AA781 /* Hugin */; @@ -4999,7 +4909,7 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 570227320C426099008A44D6 /* Debug */ = { + 5709A0850C4543E100BD1C53 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( @@ -5007,11 +4917,11 @@ ../src/hugin_base, "$(inherited)", ); - PRODUCT_NAME = open_file; + PRODUCT_NAME = autooptimiser; }; name = Debug; }; - 570227330C426099008A44D6 /* Development */ = { + 5709A0860C4543E100BD1C53 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( @@ -5019,11 +4929,11 @@ ../src/hugin_base, "$(inherited)", ); - PRODUCT_NAME = open_file; + PRODUCT_NAME = autooptimiser; }; name = Development; }; - 570227340C426099008A44D6 /* Development ZeroLink */ = { + 5709A0870C4543E100BD1C53 /* Development ZeroLink */ = { isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( @@ -5031,11 +4941,11 @@ ../src/hugin_base, "$(inherited)", ); - PRODUCT_NAME = open_file; + PRODUCT_NAME = autooptimiser; }; name = "Development ZeroLink"; }; - 570227350C426099008A44D6 /* Release */ = { + 5709A0880C4543E100BD1C53 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( @@ -5043,55 +4953,47 @@ ../src/hugin_base, "$(inherited)", ); - PRODUCT_NAME = open_file; + PRODUCT_NAME = autooptimiser; }; name = Release; }; - 5709A0850C4543E100BD1C53 /* Debug */ = { + 571046870D25F6C1006A3C69 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ( - ../src/foreign/vigra, - ../src/hugin_base, - "$(inherited)", - ); - PRODUCT_NAME = autooptimiser; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "bundled tools"; }; name = Debug; }; - 5709A0860C4543E100BD1C53 /* Development */ = { + 571046880D25F6C1006A3C69 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ( - ../src/foreign/vigra, - ../src/hugin_base, - "$(inherited)", - ); - PRODUCT_NAME = autooptimiser; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "bundled tools"; }; name = Development; }; - 5709A0870C4543E100BD1C53 /* Development ZeroLink */ = { + 571046890D25F6C1006A3C69 /* Development ZeroLink */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ( - ../src/foreign/vigra, - ../src/hugin_base, - "$(inherited)", - ); - PRODUCT_NAME = autooptimiser; + PRODUCT_NAME = "bundled tools"; }; name = "Development ZeroLink"; }; - 5709A0880C4543E100BD1C53 /* Release */ = { + 5710468A0D25F6C1006A3C69 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ( - ../src/foreign/vigra, - ../src/hugin_base, - "$(inherited)", - ); - PRODUCT_NAME = autooptimiser; + COPY_PHASE_STRIP = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + PRODUCT_NAME = "bundled tools"; + ZERO_LINK = NO; }; name = Release; }; @@ -5404,6 +5306,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Nona; }; name = Debug; @@ -5433,6 +5340,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Nona; }; name = Development; @@ -5462,6 +5374,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Nona; }; name = "Development ZeroLink"; @@ -5491,6 +5408,11 @@ ); INFOPLIST_FILE = "nona_gui-Info.plist"; INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = Nona; }; name = Release; @@ -7024,24 +6946,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 570227310C426099008A44D6 /* Build configuration list for PBXNativeTarget "test open_file" */ = { + 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "autooptimiser static" */ = { isa = XCConfigurationList; buildConfigurations = ( - 570227320C426099008A44D6 /* Debug */, - 570227330C426099008A44D6 /* Development */, - 570227340C426099008A44D6 /* Development ZeroLink */, - 570227350C426099008A44D6 /* Release */, + 5709A0850C4543E100BD1C53 /* Debug */, + 5709A0860C4543E100BD1C53 /* Development */, + 5709A0870C4543E100BD1C53 /* Development ZeroLink */, + 5709A0880C4543E100BD1C53 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "tools autooptimiser" */ = { + 571046860D25F6C1006A3C69 /* Build configuration list for PBXAggregateTarget "bundled tools" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5709A0850C4543E100BD1C53 /* Debug */, - 5709A0860C4543E100BD1C53 /* Development */, - 5709A0870C4543E100BD1C53 /* Development ZeroLink */, - 5709A0880C4543E100BD1C53 /* Release */, + 571046870D25F6C1006A3C69 /* Debug */, + 571046880D25F6C1006A3C69 /* Development */, + 571046890D25F6C1006A3C69 /* Development ZeroLink */, + 5710468A0D25F6C1006A3C69 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; @@ -7145,7 +7067,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "tools fulla" */ = { + 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "fulla static" */ = { isa = XCConfigurationList; buildConfigurations = ( 576482BA0C469052003AFC2F /* Debug */, @@ -7156,7 +7078,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "tools vig_optimize" */ = { + 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "vig_optimize static" */ = { isa = XCConfigurationList; buildConfigurations = ( 576482DE0C469056003AFC2F /* Debug */, @@ -7200,7 +7122,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 5769F86D0D23AA5D00A6AD01 /* Build configuration list for PBXNativeTarget "tools hugin_hdrmerge" */ = { + 5769F86D0D23AA5D00A6AD01 /* Build configuration list for PBXNativeTarget "hugin_hdrmerge dynamic" */ = { isa = XCConfigurationList; buildConfigurations = ( 5769F86E0D23AA5D00A6AD01 /* Debug */, @@ -7277,7 +7199,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "tools nona" */ = { + 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "nona dynamic" */ = { isa = XCConfigurationList; buildConfigurations = ( 5796FA910C4395CC006B7C6E /* Debug */, Modified: hugin/trunk/mac/complete-bundle.sh =================================================================== --- hugin/trunk/mac/complete-bundle.sh 2007-12-28 12:31:59 UTC (rev 2578) +++ hugin/trunk/mac/complete-bundle.sh 2007-12-29 03:40:10 UTC (rev 2579) @@ -1,35 +1,28 @@ #!/bin/sh -# $Id: localised.sh 2004 2007-05-11 00:17:50Z ippei $ +# $Id: complete-bundle.sh $ dylib_dir="../mac/ExternalPrograms/repository/lib" old_install_name_dirname="/Users/ippei/dev/hugin/ExternalPrograms/Repository-dynamic/lib" dylib_install_loc="Libraries" new_install_name_dirname="@executable_path/../$dylib_install_loc" -HuginApp="$TARGET_BUILD_DIR/Hugin.app" -StitcherApp="$HuginApp/Contents/Resources/HuginStitchProject.app" +App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app" archs="ppc i386 ppc64 x86_64" libs="libwx_macu-2.8 libpano13 libboost_thread-mt libboost_thread-mt-1_34_1 libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf" -binaries="$HuginApp/Contents/$dylib_install_loc/*.dylib $StitcherApp/Contents/$dylib_install_loc/*.dylib $HuginApp/Contents/MacOS/* $StitcherApp/Contents/MacOS/* $HuginApp/Contents/Frameworks/Hugin*.framework/Hugin*" +binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin*" #------------------------------------------------ -rm -Rf "$HuginApp/Contents/$dylib_install_loc" -mkdir -p "$HuginApp/Contents/$dylib_install_loc" +rm -Rf "$App/Contents/$dylib_install_loc" +mkdir -p "$App/Contents/$dylib_install_loc" for dylib in $libs do - cp -Rf $dylib_dir/$dylib.*ylib "$HuginApp/Contents/$dylib_install_loc/" + cp -Rf $dylib_dir/$dylib.*ylib "$App/Contents/$dylib_install_loc/" done -rm -Rf "$StitcherApp/Contents/$dylib_install_loc" -ln -s "../../../$dylib_install_loc" "$StitcherApp/Contents/$dylib_install_loc" -rm -Rf "$StitcherApp/Contents/Frameworks" -ln -s "../../../Frameworks" "$StitcherApp/Contents/Frameworks" - - #replace any "$old_install_name_dirname[/*]/" in install_name to "$new_install_name_dirname/" for exec_file in $binaries @@ -51,8 +44,5 @@ echo " Changing install name for: $lib" install_name_tool -change "$old_install_name_dirname/$lib" "$new_install_name_dirname/$lib" $exec_file done -done - -rm -Rf "$StitcherApp/Contents/Resources" -ln -s "../../../Resources" "$StitcherApp/Contents/Resources" \ No newline at end of file +done Added: hugin/trunk/mac/complete-embed.sh =================================================================== --- hugin/trunk/mac/complete-embed.sh (rev 0) +++ hugin/trunk/mac/complete-embed.sh 2007-12-29 03:40:10 UTC (rev 2579) @@ -0,0 +1,17 @@ +#!/bin/sh + +# $Id: complete-embed.sh $ + +dylib_install_loc="Libraries" + +HuginApp="$TARGET_BUILD_DIR/Hugin.app" +StitcherApp="$HuginApp/Contents/Resources/HuginStitchProject.app" + +#------------------------------------------------ + +rm -Rf "$StitcherApp/Contents/$dylib_install_loc" +ln -s "../../../$dylib_install_loc" "$StitcherApp/Contents/$dylib_install_loc" +rm -Rf "$StitcherApp/Contents/Frameworks" +ln -s "../../../Frameworks" "$StitcherApp/Contents/Frameworks" +rm -Rf "$StitcherApp/Contents/Resources" +ln -s "../../../Resources" "$StitcherApp/Contents/Resources" \ No newline at end of file Property changes on: hugin/trunk/mac/complete-embed.sh ___________________________________________________________________ Name: svn:executable + * Modified: hugin/trunk/src/hugin1/hugin/CPListFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPListFrame.cpp 2007-12-28 12:31:59 UTC (rev 2578) +++ hugin/trunk/src/hugin1/hugin/CPListFrame.cpp 2007-12-29 03:40:10 UTC (rev 2579) @@ -281,19 +281,19 @@ // setup list display m_list->InsertColumn( 0, _("#"), wxLIST_FORMAT_RIGHT, 25); m_list->InsertColumn( 1, _("left Img."), wxLIST_FORMAT_RIGHT, 65); - m_list->InsertColumn( 2, _("x"), wxLIST_FORMAT_RIGHT, 65); - m_list->InsertColumn( 3, _("y"), wxLIST_FORMAT_RIGHT, 65); + m_list->InsertColumn( 2, _("x"), wxLIST_FORMAT_RIGHT, 40); + m_list->InsertColumn( 3, _("y"), wxLIST_FORMAT_RIGHT, 40); m_list->InsertColumn( 4, _("right Img."), wxLIST_FORMAT_RIGHT, 65); - m_list->InsertColumn( 5, _("x"), wxLIST_FORMAT_RIGHT, 65); - m_list->InsertColumn( 6, _("y"), wxLIST_FORMAT_RIGHT, 65); - m_list->InsertColumn( 7, _("Alignment"), wxLIST_FORMAT_LEFT,110 ); - m_list->InsertColumn( 8, _("Distance"), wxLIST_FORMAT_RIGHT, 110); + m_list->InsertColumn( 5, _("x"), wxLIST_FORMAT_RIGHT, 40); + m_list->InsertColumn( 6, _("y"), wxLIST_FORMAT_RIGHT, 40); + m_list->InsertColumn( 7, _("Alignment"), wxLIST_FORMAT_LEFT, 80); + m_list->InsertColumn( 8, _("Distance"), wxLIST_FORMAT_RIGHT, 80); } else { m_list->InsertColumn( 0, _("#"), wxLIST_FORMAT_RIGHT, 25); m_list->InsertColumn( 1, _("left Img."), wxLIST_FORMAT_RIGHT, 65); m_list->InsertColumn( 2, _("right Img."), wxLIST_FORMAT_RIGHT, 65); - m_list->InsertColumn( 3, _("Alignment"), wxLIST_FORMAT_LEFT,110 ); - m_list->InsertColumn( 4, _("Distance"), wxLIST_FORMAT_RIGHT, 110); + m_list->InsertColumn( 3, _("Alignment"), wxLIST_FORMAT_LEFT, 80); + m_list->InsertColumn( 4, _("Distance"), wxLIST_FORMAT_RIGHT, 80); } //get saved width Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2007-12-28 12:31:59 UTC (rev 2578) +++ hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2007-12-29 03:40:10 UTC (rev 2579) @@ -627,10 +627,9 @@ return; } #else - wxString hugin_stitch_project = wxT("hugin_stitch_project") + wxString hugin_stitch_project = wxT("hugin_stitch_project"); #endif - wxString command = hugin_stitch_project + wxT(" -o ") + wxQuoteString(ptofile) - + wxT(" ") + wxQuoteString(ptofile); + wxString command = hugin_stitch_project + wxT(" ") + wxQuoteString(ptofile); wxExecute(command); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-12-31 19:14:35
|
Revision: 2584 http://hugin.svn.sourceforge.net/hugin/?rev=2584&view=rev Author: dangelo Date: 2007-12-31 11:14:31 -0800 (Mon, 31 Dec 2007) Log Message: ----------- Win32: Debug build with MSVC works now. Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindJPEG.cmake hugin/trunk/CMakeModules/FindPNG.cmake hugin/trunk/CMakeModules/FindTIFF.cmake hugin/trunk/CMakeModules/FindZLIB.cmake hugin/trunk/CMakeModules/win_bundle.cmake hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs hugin/trunk/src/CMakeLists.txt Added Paths: ----------- hugin/trunk/CMakeModules/FindLibraryWithDebug.cmake hugin/trunk/CMakeModules/FindPackageHandleStandardArgs.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/CMakeLists.txt 2007-12-31 19:14:31 UTC (rev 2584) @@ -88,6 +88,7 @@ FIND_PACKAGE(JPEG REQUIRED) INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) FIND_PACKAGE(PNG REQUIRED) +INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) FIND_PACKAGE(OpenEXR REQUIRED) @@ -116,6 +117,7 @@ ## +SET(Boost_LIB_SUFFIX_DEBUG gd) FIND_PACKAGE(Boost REQUIRED thread) IF (NOT Boost_thread_FOUND) MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBoost_LIB_SUFFIX=<suffix>") Modified: hugin/trunk/CMakeModules/FindJPEG.cmake =================================================================== --- hugin/trunk/CMakeModules/FindJPEG.cmake 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/CMakeModules/FindJPEG.cmake 2007-12-31 19:14:31 UTC (rev 2584) @@ -20,20 +20,18 @@ ${wxWidgets_ROOT_DIR}/src/jpeg ) -FIND_LIBRARY( JPEG_LIBRARIES - NAMES jpeg wxjpeg +include(FindLibraryWithDebug) + +find_library_with_debug(JPEG_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES jpeg libjpeg wxjpeg PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} ) -IF(JPEG_INCLUDE_DIR) - IF(JPEG_LIBRARIES) - SET( JPEG_FOUND "YES" ) - FIND_LIBRARY( JPEG_DEBUG_LIBRARIES - NAMES jpegd wxjpegd - PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} - ) - ENDIF(JPEG_LIBRARIES) -ENDIF(JPEG_INCLUDE_DIR) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(JPEG DEFAULT_MSG + JPEG_INCLUDE_DIR JPEG_LIBRARIES) +MARK_AS_ADVANCED(JPEG_INCLUDE_DIR JPEG_LIBRARIES ) Added: hugin/trunk/CMakeModules/FindLibraryWithDebug.cmake =================================================================== --- hugin/trunk/CMakeModules/FindLibraryWithDebug.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindLibraryWithDebug.cmake 2007-12-31 19:14:31 UTC (rev 2584) @@ -0,0 +1,113 @@ +# +# FIND_LIBRARY_WITH_DEBUG +# -> enhanced FIND_LIBRARY to allow the search for an +# optional debug library with a WIN32_DEBUG_POSTFIX similar +# to CMAKE_DEBUG_POSTFIX when creating a shared lib +# it has to be the second and third argument + +# Copyright (c) 2007, Christian Ehrlicher, <ch....@gm...> +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libname) + + IF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + + # no WIN32_DEBUG_POSTFIX -> simply pass all arguments to FIND_LIBRARY + FIND_LIBRARY(${var_name} + ${win32_dbg_postfix_name} + ${dgb_postfix} + ${libname} + ${ARGN} + ) + + ELSE(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + + IF(NOT WIN32) + # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX + + FIND_LIBRARY(${var_name} ${libname} ${ARGN}) + + ELSE(NOT WIN32) + + # 1. get all possible libnames + SET(args ${ARGN}) + SET(newargs "") + SET(libnames_release "") + SET(libnames_debug "") + + LIST(LENGTH args listCount) + + IF("${libname}" STREQUAL "NAMES") + SET(append_rest 0) + LIST(APPEND args " ") + + FOREACH(i RANGE ${listCount}) + LIST(GET args ${i} val) + + IF(append_rest) + LIST(APPEND newargs ${val}) + ELSE(append_rest) + IF("${val}" STREQUAL "PATHS") + LIST(APPEND newargs ${val}) + SET(append_rest 1) + ELSE("${val}" STREQUAL "PATHS") + LIST(APPEND libnames_release "${val}") + LIST(APPEND libnames_debug "${val}${dgb_postfix}") + ENDIF("${val}" STREQUAL "PATHS") + ENDIF(append_rest) + + ENDFOREACH(i) + + ELSE("${libname}" STREQUAL "NAMES") + + # just one name + LIST(APPEND libnames_release "${libname}") + LIST(APPEND libnames_debug "${libname}${dgb_postfix}") + + SET(newargs ${args}) + + ENDIF("${libname}" STREQUAL "NAMES") + + # search the release lib + FIND_LIBRARY(${var_name}_RELEASE + NAMES ${libnames_release} + ${newargs} + ) + + # search the debug lib + FIND_LIBRARY(${var_name}_DEBUG + NAMES ${libnames_debug} + ${newargs} + ) + + IF(${var_name}_RELEASE AND ${var_name}_DEBUG) + + # both libs found + SET(${var_name} optimized ${${var_name}_RELEASE} + debug ${${var_name}_DEBUG}) + + ELSE(${var_name}_RELEASE AND ${var_name}_DEBUG) + + IF(${var_name}_RELEASE) + + # only release found + SET(${var_name} ${${var_name}_RELEASE}) + + ELSE(${var_name}_RELEASE) + + # only debug (or nothing) found + SET(${var_name} ${${var_name}_DEBUG}) + + ENDIF(${var_name}_RELEASE) + + ENDIF(${var_name}_RELEASE AND ${var_name}_DEBUG) + + MARK_AS_ADVANCED(${var_name}_RELEASE) + MARK_AS_ADVANCED(${var_name}_DEBUG) + + ENDIF(NOT WIN32) + + ENDIF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + +ENDMACRO(FIND_LIBRARY_WITH_DEBUG) Modified: hugin/trunk/CMakeModules/FindPNG.cmake =================================================================== --- hugin/trunk/CMakeModules/FindPNG.cmake 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/CMakeModules/FindPNG.cmake 2007-12-31 19:14:31 UTC (rev 2584) @@ -11,48 +11,33 @@ # defines cache variables # PNG_INCLUDE_DIR, where to find headers # PNG_LIBRARIES, list of release link libraries. -# PNG_DEBUG_LIBRARIES, list of release link libraries. # PNG_FOUND, If != "YES", do not try to use PNG. # None of the above will be defined unless ZLIB can be found INCLUDE(FindZLIB) +include(FindLibraryWithDebug) + SET(PNG_FOUND "NO") IF (ZLIB_FOUND) - FIND_PATH(PNG_PNG_INCLUDE_DIR png.h + FIND_PATH(PNG_INCLUDE_DIR png.h /usr/local/include /usr/include ${wxWidgets_ROOT_DIR}/src/png ) - FIND_LIBRARY(PNG_LIBRARY + find_library_with_debug(PNG_LIBRARIES + WIN32_DEBUG_POSTFIX d NAMES png libpng wxpng PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} ) - IF(PNG_PNG_INCLUDE_DIR AND PNG_LIBRARY) - SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) - SET(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY}) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(PNG DEFAULT_MSG + PNG_INCLUDE_DIR PNG_LIBRARIES) - SET( PNG_FOUND "YES" ) - FIND_LIBRARY( PNG_DEBUG_LIBRARY - NAMES pngd wxpngd - PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} - ) - SET(PNG_DEBUG_LIBRARIES ${PNG_DEBUGLIBRARY} ${ZLIB_DEBUG_LIBRARY}) - ENDIF(PNG_PNG_INCLUDE_DIR AND PNG_LIBRARY) + SET(PNG_LIBRARIES ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}) + MARK_AS_ADVANCED(PNG_INCLUDE_DIR PNG_LIBRARIES ) ENDIF(ZLIB_FOUND) -IF (PNG_FOUND) - IF (NOT PNG_FIND_QUIETLY) - MESSAGE(STATUS "Found PNG: ${PNG_LIBRARY}") - ENDIF (NOT PNG_FIND_QUIETLY) -ELSE (PNG_FOUND) - IF (PNG_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find PNG library") - ENDIF (PNG_FIND_REQUIRED) -ENDIF (PNG_FOUND) - -MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY ) - Added: hugin/trunk/CMakeModules/FindPackageHandleStandardArgs.cmake =================================================================== --- hugin/trunk/CMakeModules/FindPackageHandleStandardArgs.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindPackageHandleStandardArgs.cmake 2007-12-31 19:14:31 UTC (rev 2584) @@ -0,0 +1,58 @@ +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... ) +# This macro is intended to be used in FindXXX.cmake modules files. +# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and +# it also sets the <UPPERCASED_NAME>_FOUND variable. +# The package is found if all variables listed are TRUE. +# Example: +# +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR) +# +# LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and +# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE. +# If it is not found and REQUIRED was used, it fails with FATAL_ERROR, +# independent whether QUIET was used or not. +# If it is found, the location is reported using the VAR1 argument, so +# here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out. +# If the second argument is DEFAULT_MSG, the message in the failure case will +# be "Could NOT find LibXml2", if you don't like this message you can specify +# your own custom failure message there. + +MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) + + IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + IF (${_NAME}_FIND_REQUIRED) + SET(_FAIL_MESSAGE "Could not find REQUIRED package ${_NAME}") + ELSE (${_NAME}_FIND_REQUIRED) + SET(_FAIL_MESSAGE "Could not find OPTIONAL package ${_NAME}") + ENDIF (${_NAME}_FIND_REQUIRED) + ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + SET(_FAIL_MESSAGE "${_FAIL_MSG}") + ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + + STRING(TOUPPER ${_NAME} _NAME_UPPER) + + SET(${_NAME_UPPER}_FOUND TRUE) + IF(NOT ${_VAR1}) + SET(${_NAME_UPPER}_FOUND FALSE) + ENDIF(NOT ${_VAR1}) + + FOREACH(_CURRENT_VAR ${ARGN}) + IF(NOT ${_CURRENT_VAR}) + SET(${_NAME_UPPER}_FOUND FALSE) + ENDIF(NOT ${_CURRENT_VAR}) + ENDFOREACH(_CURRENT_VAR) + + IF (${_NAME_UPPER}_FOUND) + IF (NOT ${_NAME}_FIND_QUIETLY) + MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}") + ENDIF (NOT ${_NAME}_FIND_QUIETLY) + ELSE (${_NAME_UPPER}_FOUND) + IF (${_NAME}_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}") + ELSE (${_NAME}_FIND_REQUIRED) + IF (NOT ${_NAME}_FIND_QUIETLY) + MESSAGE(STATUS "${_FAIL_MESSAGE}") + ENDIF (NOT ${_NAME}_FIND_QUIETLY) + ENDIF (${_NAME}_FIND_REQUIRED) + ENDIF (${_NAME_UPPER}_FOUND) +ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS) Modified: hugin/trunk/CMakeModules/FindTIFF.cmake =================================================================== --- hugin/trunk/CMakeModules/FindTIFF.cmake 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/CMakeModules/FindTIFF.cmake 2007-12-31 19:14:31 UTC (rev 2584) @@ -20,20 +20,18 @@ ${wxWidgets_ROOT_DIR}/src/tiff ) -FIND_LIBRARY( TIFF_LIBRARIES - NAMES tiff wxtiff +include(FindLibraryWithDebug) + +find_library_with_debug(TIFF_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES tiff libtiff wxtiff PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} ) -IF(TIFF_INCLUDE_DIR) - IF(TIFF_LIBRARIES) - SET( TIFF_FOUND "YES" ) - FIND_LIBRARY( TIFF_DEBUG_LIBRARIES - NAMES tiffd wxtiffd - PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} - ) - ENDIF(TIFF_LIBRARIES) -ENDIF(TIFF_INCLUDE_DIR) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(TIFF DEFAULT_MSG + TIFF_INCLUDE_DIR TIFF_LIBRARIES) +MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARIES) Modified: hugin/trunk/CMakeModules/FindZLIB.cmake =================================================================== --- hugin/trunk/CMakeModules/FindZLIB.cmake 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/CMakeModules/FindZLIB.cmake 2007-12-31 19:14:31 UTC (rev 2584) @@ -26,42 +26,20 @@ ${wxWidgets_ROOT_DIR}/src/zlib ) -SET(ZLIB_NAMES z zlib zdll wxzlib) -FIND_LIBRARY(ZLIB_LIBRARY - NAMES ${ZLIB_NAMES} - PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} -) +include(FindLibraryWithDebug) -SET(ZLIB_DEBUG_NAMES zd zlibd zdlld wxzlibd) -FIND_LIBRARY(ZLIB_DEBUG_LIBRARY - NAMES ${ZLIB_DEBUG_NAMES} +find_library_with_debug(ZLIB_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES z zlib wxzlib PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} ) -IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) - SET(ZLIB_FOUND TRUE) - SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) - IF (ZLIB_DEBUG_LIBRARY) - SET(ZLIB_DEBUG_LIBRARIES ${ZLIB_DEBUG_LIBRARY}) - ENDIF(ZLIB_DEBUG_LIBRARY) -ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) - SET(ZLIB_FOUND FALSE) - SET( ZLIB_LIBRARIES ) -ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) -IF (ZLIB_FOUND) - IF (NOT ZLIB_FIND_QUIETLY) - MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}") - ENDIF (NOT ZLIB_FIND_QUIETLY) -ELSE (ZLIB_FOUND) - IF (ZLIB_FIND_REQUIRED) - MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.") - MESSAGE(FATAL_ERROR "Could NOT find z library") - ENDIF (ZLIB_FIND_REQUIRED) -ENDIF (ZLIB_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(ZLIB DEFAULT_MSG + ZLIB_INCLUDE_DIR ZLIB_LIBRARIES) MARK_AS_ADVANCED( - ZLIB_LIBRARY - ZLIB_DEBUG_LIBRARY + ZLIB_LIBRARIES ZLIB_INCLUDE_DIR ) Modified: hugin/trunk/CMakeModules/win_bundle.cmake =================================================================== --- hugin/trunk/CMakeModules/win_bundle.cmake 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/CMakeModules/win_bundle.cmake 2007-12-31 19:14:31 UTC (rev 2584) @@ -7,6 +7,10 @@ CONFIGURE_FILE(platforms/windows/msi/top_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/top_banner.bmp COPYONLY) CONFIGURE_FILE(platforms/windows/msi/big_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/big_banner.bmp COPYONLY) + # install hugin readme, license etc. + INSTALL(FILES AUTHORS COPYING LICENCE LICENCE_JHEAD LICENCE_VIGRA + DESTINATION doc/hugin) + # find the path to enblend and panotools build directories # and copy required binaries into hugin installation folder FIND_PATH(PANO13_EXE_DIR PTmender.exe @@ -18,6 +22,19 @@ INSTALL(FILES ${PANO13_EXECUTABLES} DESTINATION ${BINDIR}) # TODO: install documentation for panotools? + FIND_PATH(PANO13_SRC_DIR filter.h + ${SOURCE_BASE_DIR}/libpano/pano13 + DOC "Location of pano13 source" + NO_DEFAULT_PATH) + INSTALL(FILES ${PANO13_SRC_DIR}/AUTHORS + ${PANO13_SRC_DIR}/gpl.txt + ${PANO13_SRC_DIR}/README + ${PANO13_SRC_DIR}/TODO + ${PANO13_SRC_DIR}/doc/Optimize.txt + ${PANO13_SRC_DIR}/doc/PTblender.readme + ${PANO13_SRC_DIR}/doc/PTmender.readme + ${PANO13_SRC_DIR}/doc/stitch.txt + DESTINATION doc/panotools) FIND_PATH(ENBLEND_EXE_DIR enblend.exe ${SOURCE_BASE_DIR}/enblend-3.1 Modified: hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs =================================================================== --- hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs 2007-12-31 19:14:31 UTC (rev 2584) @@ -12,6 +12,11 @@ <ComponentRef Id="HuginAssociationComponent" /> </Feature> </FeatureRef> + <FeatureRef Id="HUGINSTITCHFEATURE" > + <Feature Id="HuginStitchAssociationFeature" Title="Association" Description="Associate .pto files with hugin stitch project" Level="1"> + <ComponentRef Id="HuginStitchAssociationComponent" /> + </Feature> + </FeatureRef> <Property Id="AUTOPANOSIFT"> <DirectorySearch Id="AutopanoSiftDirectory" Depth="1" Path="[ProgramFilesFolder]"> @@ -27,17 +32,26 @@ </Extension> </Component> + <Component Id="HuginStitchAssociationComponent" Guid="498B874E-837C-11DC-A44F-2A8755D89593" DiskId="1"> + <Extension Id="pto"> + <Verb Id="Stitch" Command="Open" TargetFile="HUGINSTITCHEXECUTABLE" Argument='"%1"' /> + </Extension> + </Component> + <Component Id="HuginRegistryComponent" Guid="FF46C478-8316-11DC-9F04-5B8056D89593" DiskId="1"> <Shortcut Id="HomePage" Name="hugin website" Target="[System64Folder]rundll32.exe" Arguments="url.dll,FileProtocolHandler http://hugin.sourceforge.net" Directory="ProgramMenuDir" Description="hugin website on the Internet" /> <Shortcut Id="UninstallProduct" Name="Uninstall hugin" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" Directory="ProgramMenuDir" Description="Uninstalls hugin" /> + <!-- <RegistryKey Root="HKLM" Key="Software"> <RegistryKey Key="hugin" Action="create"> <RegistryValue Name="Install_Dir" Value="[APPLICATIONFOLDER]" Type="string" /> </RegistryKey> - </RegistryKey> + </RegistryKey> + --> + <!-- TODO: rework this section to respect the preferences of an earlier version <RegistryKey Root="HKCU" Key="Software"> <RegistryKey Key="hugin" Action="create" > @@ -60,7 +74,8 @@ </RegistryKey> </RegistryKey> - </RegistryKey> + </RegistryKey> + --> </Component> Modified: hugin/trunk/src/CMakeLists.txt =================================================================== --- hugin/trunk/src/CMakeLists.txt 2007-12-30 22:21:49 UTC (rev 2583) +++ hugin/trunk/src/CMakeLists.txt 2007-12-31 19:14:31 UTC (rev 2584) @@ -18,9 +18,8 @@ ENDIF (MSVC) set(image_libs huginvigraimpex ${OPENEXR_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} - ${PNG_LIBRARIES}) + ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}) - add_subdirectory(foreign) add_subdirectory(hugin_base) add_subdirectory(tools) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-01-01 16:15:22
|
Revision: 2587 http://hugin.svn.sourceforge.net/hugin/?rev=2587&view=rev Author: dangelo Date: 2008-01-01 08:15:19 -0800 (Tue, 01 Jan 2008) Log Message: ----------- windows build system changes, added separate hugin_version.h file to avoid recompilation of all files at each update. Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs hugin/trunk/src/deghosting/hugin_hdrmerge.cpp hugin/trunk/src/hugin1/nona_gui/nona_gui.cpp hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp hugin/trunk/src/hugin_config.h.in.cmake hugin/trunk/src/tools/align_image_stack.cpp hugin/trunk/src/tools/autooptimiser.cpp hugin/trunk/src/tools/fulla.cpp hugin/trunk/src/tools/nona.cpp hugin/trunk/src/tools/vig_optimize.cpp Added Paths: ----------- hugin/trunk/src/hugin_version.h.in.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/CMakeLists.txt 2008-01-01 16:15:19 UTC (rev 2587) @@ -14,7 +14,13 @@ IF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) # TODO: automatically set the revision on windows IF(WIN32) - set(HUGIN_WC_REVISION svn) + SET(HUGIN_WC_REVISION "" CACHE STRING + "set SVN revision." + ) + IF(NOT HUGIN_WC_REVISION) + MESSAGE(FATAL_ERROR "Need to set SVN revision (HUGIN_WC_REVISION) manually") + ENDIF(NOT HUGIN_WC_REVISION) + ELSE (WIN32) FIND_PACKAGE(Subversion REQUIRED) IF(Subversion_FOUND) @@ -238,6 +244,7 @@ # create config.h file configure_file(src/hugin_config.h.in.cmake ${CMAKE_BINARY_DIR}/src/hugin_config.h) +configure_file(src/hugin_version.h.in.cmake ${CMAKE_BINARY_DIR}/src/hugin_version.h) Modified: hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs =================================================================== --- hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/platforms/windows/msi/WixFragmentRegistry.wxs 2008-01-01 16:15:19 UTC (rev 2587) @@ -11,8 +11,6 @@ <Feature Id="HuginAssociationFeature" Title="Association" Description="Associate .pto files with hugin" Level="1"> <ComponentRef Id="HuginAssociationComponent" /> </Feature> - </FeatureRef> - <FeatureRef Id="HUGINSTITCHFEATURE" > <Feature Id="HuginStitchAssociationFeature" Title="Association" Description="Associate .pto files with hugin stitch project" Level="1"> <ComponentRef Id="HuginStitchAssociationComponent" /> </Feature> @@ -43,40 +41,6 @@ <Shortcut Id="HomePage" Name="hugin website" Target="[System64Folder]rundll32.exe" Arguments="url.dll,FileProtocolHandler http://hugin.sourceforge.net" Directory="ProgramMenuDir" Description="hugin website on the Internet" /> <Shortcut Id="UninstallProduct" Name="Uninstall hugin" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" Directory="ProgramMenuDir" Description="Uninstalls hugin" /> - <!-- - <RegistryKey Root="HKLM" Key="Software"> - <RegistryKey Key="hugin" Action="create"> - <RegistryValue Name="Install_Dir" Value="[APPLICATIONFOLDER]" Type="string" /> - </RegistryKey> - </RegistryKey> - --> - - <!-- TODO: rework this section to respect the preferences of an earlier version - <RegistryKey Root="HKCU" Key="Software"> - <RegistryKey Key="hugin" Action="create" > - - <RegistryKey Key="AutoPano" Action="create" > - <RegistryValue Name="Type" Value="1" Type="integer" /> - </RegistryKey> - - <RegistryKey Key="AutoPanoKolor" Action="create" > - <RegistryValue Name="AutopanoExeCustom" Value="0" Type="integer" /> - </RegistryKey> - - <RegistryKey Key="AutoPanoSift" Action="create" > - <RegistryValue Name="Args" Value="--output %o --imagelist %namefile" Type="string" /> - <RegistryValue Name="AutopanoExeCustom" Value="1" Type="integer" /> - <RegistryValue Name="AutopanoExe" Value="[AUTOPANOSIFT]" Type="string" /> - </RegistryKey> - - <RegistryKey Key="Panotools" Action="create" > - <RegistryValue Name="PTStitcherExeCustom" Value="0" Type="integer" /> - </RegistryKey> - - </RegistryKey> - </RegistryKey> - --> - </Component> </DirectoryRef> Modified: hugin/trunk/src/deghosting/hugin_hdrmerge.cpp =================================================================== --- hugin/trunk/src/deghosting/hugin_hdrmerge.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/deghosting/hugin_hdrmerge.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -25,6 +25,8 @@ */ #include <hugin_config.h> +#include <hugin_version.h> + #include <fstream> #include <sstream> #include <cmath> Modified: hugin/trunk/src/hugin1/nona_gui/nona_gui.cpp =================================================================== --- hugin/trunk/src/hugin1/nona_gui/nona_gui.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/hugin1/nona_gui/nona_gui.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -24,7 +24,8 @@ * */ -#include <config.h> +#include <hugin_config.h> +#include <hugin_version.h> #include "panoinc_WX.h" #include "panoinc.h" Modified: hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp =================================================================== --- hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -24,7 +24,8 @@ * */ -#include <config.h> +#include <hugin_config.h> +#include <hugin_version.h> #include "panoinc_WX.h" #include "panoinc.h" Modified: hugin/trunk/src/hugin_config.h.in.cmake =================================================================== --- hugin/trunk/src/hugin_config.h.in.cmake 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/hugin_config.h.in.cmake 2008-01-01 16:15:19 UTC (rev 2587) @@ -1,12 +1,5 @@ #ifndef __CONFIG_H__ -#define VERSION_MAJOR ${V_MAJOR} -#define VERSION_MINOR ${V_MINOR} -#define VERSION_PATCH ${V_PATCH} -#define HUGIN_WC_REVISION ${HUGIN_WC_REVISION} - -#define PACKAGE_VERSION "${HUGIN_PACKAGE_VERSION}" - /* Define to 1 if you have the <pano12/queryfeature.h> header file. */ #define HAVE_PANO12_QUERYFEATURE_H 1 Added: hugin/trunk/src/hugin_version.h.in.cmake =================================================================== --- hugin/trunk/src/hugin_version.h.in.cmake (rev 0) +++ hugin/trunk/src/hugin_version.h.in.cmake 2008-01-01 16:15:19 UTC (rev 2587) @@ -0,0 +1,11 @@ +#ifndef __HUGIN_VERSION_H__ + +#define VERSION_MAJOR ${V_MAJOR} +#define VERSION_MINOR ${V_MINOR} +#define VERSION_PATCH ${V_PATCH} +#define HUGIN_WC_REVISION ${HUGIN_WC_REVISION} + +#define PACKAGE_VERSION "${HUGIN_PACKAGE_VERSION}" + + +#endif Modified: hugin/trunk/src/tools/align_image_stack.cpp =================================================================== --- hugin/trunk/src/tools/align_image_stack.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/tools/align_image_stack.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -25,6 +25,7 @@ */ #include <hugin_config.h> +#include <hugin_version.h> #include <fstream> #include <sstream> Modified: hugin/trunk/src/tools/autooptimiser.cpp =================================================================== --- hugin/trunk/src/tools/autooptimiser.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/tools/autooptimiser.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -26,6 +26,7 @@ */ #include <hugin_config.h> +#include <hugin_version.h> #include <fstream> #include <sstream> Modified: hugin/trunk/src/tools/fulla.cpp =================================================================== --- hugin/trunk/src/tools/fulla.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/tools/fulla.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -25,6 +25,7 @@ */ #include <hugin_config.h> +#include <hugin_version.h> #include <fstream> #include <sstream> Modified: hugin/trunk/src/tools/nona.cpp =================================================================== --- hugin/trunk/src/tools/nona.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/tools/nona.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -24,6 +24,7 @@ */ #include <hugin_config.h> +#include <hugin_version.h> #include <fstream> #include <sstream> Modified: hugin/trunk/src/tools/vig_optimize.cpp =================================================================== --- hugin/trunk/src/tools/vig_optimize.cpp 2008-01-01 13:53:34 UTC (rev 2586) +++ hugin/trunk/src/tools/vig_optimize.cpp 2008-01-01 16:15:19 UTC (rev 2587) @@ -25,6 +25,7 @@ */ #include <hugin_config.h> +#include <hugin_version.h> #include <fstream> #include <sstream> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-01-02 15:53:06
|
Revision: 2591 http://hugin.svn.sourceforge.net/hugin/?rev=2591&view=rev Author: ippei Date: 2008-01-02 07:53:03 -0800 (Wed, 02 Jan 2008) Log Message: ----------- various Mac updates Modified Paths: -------------- hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh hugin/trunk/mac/ExternalPrograms/scripts/static/pano12.sh hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/mac/localised.sh hugin/trunk/src/hugin1/hugin/PanoPanel.cpp Added Paths: ----------- hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh hugin/trunk/mac/HuginVersion.xcconfig Modified: hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh 2008-01-02 14:56:28 UTC (rev 2590) +++ hugin/trunk/mac/ExternalPrograms/scripts/autopano-sift-C.sh 2008-01-02 15:53:03 UTC (rev 2591) @@ -56,8 +56,13 @@ elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] then TARGET=$ppc64TARGET - MACSDKDIR=$ppcMACSDKDIR + MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" fi make clean; @@ -65,9 +70,8 @@ prefix="$REPOSITORYDIR" \ CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ CPPFLAGS="-I/usr/include/libxml2 -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/pano12" \ - LDFLAGS="-arch $ARCH -L. -L$REPOSITORYDIR/lib -dead_strip -prebind" \ - LDLIBS="-lsift -lpano12 -lxml2 -lm -ltiff -ljpeg -lz"\ - NEXT_ROOT="$MACSDKDIR"; + LDFLAGS="$ARCHARGs -arch $ARCH -Wl,-syslibroot,$MACSDKDIR -L. -L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LDLIBS="-lsift -lpano12 -lxml2 -lm -ltiff -ljpeg -lpng -lz"; install ./autopano ./generatekeys $REPOSITORYDIR/arch/$ARCH/bin; Added: hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh (rev 0) +++ hugin/trunk/mac/ExternalPrograms/scripts/lcms.sh 2008-01-02 15:53:03 UTC (rev 2591) @@ -0,0 +1,130 @@ +# ------------------ +# liblcms +# ------------------ +# $Id: liblcms.sh 1902 2008-01-02 22:27:47Z Harry $ +# Copyright (c) 2007, Ippei Ukai +# script skeleton Copyright (c) 2007, Ippei Ukai +# lcms specifics 2008, Harry van der Wolf + + +# prepare + +# export REPOSITORYDIR="/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.3.9.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"; + +LCMSVER_M="1" +LCMSVER_FULL="$LCMSVER_M.0.16" + + +# 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 + + + + + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-static --enable-shared; + + make clean + make $OTHERMAKEARGs install + +done + + +# merge liblcms + +for liba in lib/liblcms.a lib/liblcms.$LCMSVER_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/liblcms.$LCMSVER_FULL.dylib" ] +then + install_name_tool -id "$REPOSITORYDIR/lib/liblcms.$LCMSVER_FULL.dylib" "$REPOSITORYDIR/lib/liblcms.$LCMSVER_FULL.dylib" + ln -sfn liblcms.$LCMSVER_FULL.dylib $REPOSITORYDIR/lib/liblcms.$LCMSVER_M.dylib; + ln -sfn liblcms.$LCMSVER_FULL.dylib $REPOSITORYDIR/lib/liblcms.dylib; +fi Modified: hugin/trunk/mac/ExternalPrograms/scripts/static/pano12.sh =================================================================== --- hugin/trunk/mac/ExternalPrograms/scripts/static/pano12.sh 2008-01-02 14:56:28 UTC (rev 2590) +++ hugin/trunk/mac/ExternalPrograms/scripts/static/pano12.sh 2008-01-02 15:53:03 UTC (rev 2591) @@ -58,8 +58,13 @@ elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] then TARGET=$ppc64TARGET - MACSDKDIR=$ppcMACSDKDIR + MACSDKDIR=$ppc64MACSDKDIR ARCHARGs="$ppc64ONLYARG" + elif [ $ARCH = "x86_64" ] + then + TARGET=$x64TARGET + MACSDKDIR=$x64MACSDKDIR + ARCHARGs="$x64ONLYARG" fi env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -gfull -dead_strip" \ @@ -110,7 +115,7 @@ # merge execs -for program in bin/panoinfo bin/PTblender bin/PTmender bin/PTOptimizer bin/PTtiff2psd +for program in bin/pano12info bin/PTOptimizer do LIPOARGs="" Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-01-02 14:56:28 UTC (rev 2590) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-01-02 15:53:03 UTC (rev 2591) @@ -46,15 +46,16 @@ name = all; productName = All; }; - 57C486290C3121E8002D79F1 /* copy hugin_config.h */ = { + 57C486290C3121E8002D79F1 /* configure */ = { isa = PBXAggregateTarget; - buildConfigurationList = 57C4862A0C312226002D79F1 /* Build configuration list for PBXAggregateTarget "copy hugin_config.h" */; + buildConfigurationList = 57C4862A0C312226002D79F1 /* Build configuration list for PBXAggregateTarget "configure" */; buildPhases = ( - 57C4863E0C3122C4002D79F1 /* ShellScript */, + 57C4863E0C3122C4002D79F1 /* copy hugin_config.h */, + 57E122110D2BDDBE00743A93 /* configure hugin_version.h */, ); dependencies = ( ); - name = "copy hugin_config.h"; + name = configure; productName = "copy hugin_config.h"; }; 57E3470D0C4A8E95006AA781 /* lib static */ = { @@ -102,6 +103,7 @@ 57E347390C4A8EF4006AA781 /* PBXTargetDependency */, 57E347370C4A8EF4006AA781 /* PBXTargetDependency */, 57E347350C4A8EF4006AA781 /* PBXTargetDependency */, + 57AC37490D2BE6D80086D348 /* PBXTargetDependency */, ); name = tools; productName = tools; @@ -244,15 +246,6 @@ 5759EF270C32B1740043F754 /* ControlPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF250C32B1740043F754 /* ControlPoint.cpp */; }; 5759EF790C32B69F0043F754 /* Lens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF770C32B69F0043F754 /* Lens.cpp */; }; 576482AA0C469052003AFC2F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 576482AB0C469052003AFC2F /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; - 576482AC0C469052003AFC2F /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; - 576482AD0C469052003AFC2F /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; - 576482AE0C469052003AFC2F /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; - 576482AF0C469052003AFC2F /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; - 576482B00C469052003AFC2F /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; - 576482B10C469052003AFC2F /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; - 576482B20C469052003AFC2F /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; - 576482B30C469052003AFC2F /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; 576482B40C469052003AFC2F /* libhugin_jhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */; }; 576482B50C469052003AFC2F /* libhugin_vigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libhugin_vigra_impex.a */; }; 576482B60C469052003AFC2F /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; @@ -627,6 +620,28 @@ 5796FA890C4395CC006B7C6E /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; 5796FA8A0C4395CC006B7C6E /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; 5796FA980C4395F4006B7C6E /* nona.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5796FA970C4395F4006B7C6E /* nona.cpp */; }; + 57AC372B0D2BE6340086D348 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 57AC372C0D2BE6340086D348 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 57AC372D0D2BE6340086D348 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 57AC372E0D2BE6340086D348 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 57AC372F0D2BE6340086D348 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 57AC37300D2BE6340086D348 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 57AC37310D2BE6340086D348 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 57AC37320D2BE6340086D348 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 57AC37330D2BE6340086D348 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.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 */; }; + 57AC37380D2BE6340086D348 /* libhugin_vigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; }; + 57AC37390D2BE6340086D348 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 57AC373A0D2BE6340086D348 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 57AC373B0D2BE6340086D348 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 57AC373C0D2BE6340086D348 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; + 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-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.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 */; }; @@ -645,6 +660,7 @@ 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 */; }; + 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 */; }; 57E3468C0C4A89E6006AA781 /* CPEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */; }; @@ -695,70 +711,38 @@ 57EA84720C3A8AB400E4965E /* CalculateMeanExposure.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA84700C3A8AB400E4965E /* CalculateMeanExposure.h */; }; 57EA97D90C3A940500E4965E /* RotatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */; }; 57EA97DA0C3A940500E4965E /* RotatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA97D80C3A940500E4965E /* RotatePanorama.h */; }; + 57FEE0F80D28835400DAF7A4 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; }; + 57FEE0F90D28835400DAF7A4 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; }; + 57FEE0FA0D28835400DAF7A4 /* libpng.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.3.dylib */; }; + 57FEE0FB0D28835400DAF7A4 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.3.dylib */; }; + 57FEE0FC0D28835400DAF7A4 /* libjpeg.62.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */; }; + 57FEE0FD0D28835400DAF7A4 /* libIex.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.6.dylib */; }; + 57FEE0FE0D28835400DAF7A4 /* libImath.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.6.dylib */; }; + 57FEE0FF0D28835400DAF7A4 /* libIlmImf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.6.dylib */; }; + 57FEE1000D28835400DAF7A4 /* libIlmThread.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.6.dylib */; }; + 57FEE1010D28835400DAF7A4 /* libHalf.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.6.dylib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 5709A0690C4543E100BD1C53 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 5709A06B0C4543E100BD1C53 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 5709A06D0C4543E100BD1C53 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F5D60C3006E900736343; - remoteInfo = hugin_utils; - }; - 5709A06F0C4543E100BD1C53 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 571300640C33D41F00252FE3; - remoteInfo = panotools; - }; - 5709A0710C4543E100BD1C53 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5759DA4E0C327D680043F754; - remoteInfo = panodata; - }; - 5709A0D30C45481500BD1C53 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5759D9AB0C32713F0043F754; - remoteInfo = appbase; - }; 5710467B0D25F5EF006A3C69 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5769FC280D24A26400A6AD01 /* frameworks */; + remoteGlobalIDString = 5769FC280D24A26400A6AD01; remoteInfo = frameworks; }; 571046820D25F6A1006A3C69 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */; + remoteGlobalIDString = 5769F8460D23AA5D00A6AD01; remoteInfo = "hugin_hdrmerge dynamic"; }; 571046840D25F6A1006A3C69 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5796FA730C4395CC006B7C6E /* nona dynamic */; + remoteGlobalIDString = 5796FA730C4395CC006B7C6E; remoteInfo = "nona dynamic"; }; 5737BC380C4CF7BA00A61778 /* PBXContainerItemProxy */ = { @@ -880,132 +864,6 @@ remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; - 5764829E0C469052003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 576482A00C469052003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 576482A20C469052003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F5D60C3006E900736343; - remoteInfo = hugin_utils; - }; - 576482A40C469052003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 571300640C33D41F00252FE3; - remoteInfo = panotools; - }; - 576482A60C469052003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5759DA4E0C327D680043F754; - remoteInfo = panodata; - }; - 576482C20C469056003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 576482C40C469056003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 576482C60C469056003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F5D60C3006E900736343; - remoteInfo = hugin_utils; - }; - 576482C80C469056003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 571300640C33D41F00252FE3; - remoteInfo = panotools; - }; - 576482CA0C469056003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5759DA4E0C327D680043F754; - remoteInfo = panodata; - }; - 576483590C469615003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 574092290C393E6600D16607; - remoteInfo = nona; - }; - 5764835B0C46961B003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5759D9AB0C32713F0043F754; - remoteInfo = appbase; - }; - 5764835D0C46961B003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F7790C30216F00736343; - remoteInfo = hugin_math; - }; - 5764835F0C46961F003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5771F8140C30268F00736343; - remoteInfo = PTLensDB; - }; - 576483610C469627003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; - 576483EA0C46ADBA003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57EA83850C3A798A00E4965E; - remoteInfo = algorithms; - }; - 576484000C46AF0A003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5759D9AB0C32713F0043F754; - remoteInfo = appbase; - }; - 576484140C46AF49003AFC2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5720E4720BD456CD00E63404; - remoteInfo = levmar; - }; 576900940D24D26200A6AD01 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1146,20 +1004,41 @@ remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; - 57DB9BBF0C454B96004957C2 /* PBXContainerItemProxy */ = { + 57AC37480D2BE6D80086D348 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57EA83850C3A798A00E4965E; - remoteInfo = algorithms; + remoteGlobalIDString = 57E122570D2BE4E800743A93 /* align_image_stack static */; + remoteInfo = "align_image_stack static"; }; - 57DB9BCA0C454C10004957C2 /* PBXContainerItemProxy */ = { + 57AC37500D2BE6F80086D348 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5771F7790C30216F00736343; - remoteInfo = hugin_math; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteInfo = "lib static"; }; + 57AC37550D2BE7540086D348 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteInfo = "lib static"; + }; + 57AC37570D2BE75F0086D348 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteInfo = "lib static"; + }; + 57AC37590D2BE7660086D348 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteInfo = "lib static"; + }; 57E347120C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1735,6 +1614,9 @@ 57D14A4506B8A3D100D8A03D /* libjpeg.62.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.62.dylib; path = lib/libjpeg.62.dylib; 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>"; }; + 57E122010D2BDBF300743A93 /* HuginVersion.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = HuginVersion.xcconfig; sourceTree = "<group>"; }; + 57E122480D2BE45700743A93 /* hugin_version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; 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; }; 57E32FAF0C4A87F1006AA781 /* ImageGraph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageGraph.h; sourceTree = "<group>"; }; 57E32FB00C4A87F1006AA781 /* PTOptimise.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTOptimise.h; sourceTree = "<group>"; }; 57E32FB10C4A87F1006AA781 /* PanoCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoCommand.h; sourceTree = "<group>"; }; @@ -1936,15 +1818,16 @@ buildActionMask = 2147483647; files = ( 576482AA0C469052003AFC2F /* libz.dylib in Frameworks */, - 576482AB0C469052003AFC2F /* libpng.3.dylib in Frameworks */, - 576482AC0C469052003AFC2F /* libtiff.3.dylib in Frameworks */, - 576482AD0C469052003AFC2F /* libjpeg.62.dylib in Frameworks */, - 576482AE0C469052003AFC2F /* libIex.6.dylib in Frameworks */, - 576482AF0C469052003AFC2F /* libIlmThread.6.dylib in Frameworks */, - 576482B00C469052003AFC2F /* libIlmImf.6.dylib in Frameworks */, - 576482B10C469052003AFC2F /* libImath.6.dylib in Frameworks */, - 576482B20C469052003AFC2F /* libHalf.6.dylib in Frameworks */, - 576482B30C469052003AFC2F /* libpano13.dylib in Frameworks */, + 57FEE0F80D28835400DAF7A4 /* libboost_thread-mt.dylib in Frameworks */, + 57FEE0F90D28835400DAF7A4 /* libpano13.dylib in Frameworks */, + 57FEE0FA0D28835400DAF7A4 /* libpng.3.dylib in Frameworks */, + 57FEE0FB0D28835400DAF7A4 /* libtiff.3.dylib in Frameworks */, + 57FEE0FC0D28835400DAF7A4 /* libjpeg.62.dylib in Frameworks */, + 57FEE0FD0D28835400DAF7A4 /* libIex.6.dylib in Frameworks */, + 57FEE0FE0D28835400DAF7A4 /* libImath.6.dylib in Frameworks */, + 57FEE0FF0D28835400DAF7A4 /* libIlmImf.6.dylib in Frameworks */, + 57FEE1000D28835400DAF7A4 /* libIlmThread.6.dylib in Frameworks */, + 57FEE1010D28835400DAF7A4 /* libHalf.6.dylib in Frameworks */, 576482B40C469052003AFC2F /* libhugin_jhead.a in Frameworks */, 576482B50C469052003AFC2F /* libhugin_vigra_impex.a in Frameworks */, 576482B60C469052003AFC2F /* libhugin_utils.a in Frameworks */, @@ -2107,6 +1990,35 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57E122560D2BE4E800743A93 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57AC372B0D2BE6340086D348 /* libz.dylib in Frameworks */, + 57AC37450D2BE6A00086D348 /* libboost_thread-mt.dylib in Frameworks */, + 57AC372C0D2BE6340086D348 /* libpng.3.dylib in Frameworks */, + 57AC372D0D2BE6340086D348 /* libtiff.3.dylib in Frameworks */, + 57AC372E0D2BE6340086D348 /* libjpeg.62.dylib in Frameworks */, + 57AC372F0D2BE6340086D348 /* libIex.6.dylib in Frameworks */, + 57AC37300D2BE6340086D348 /* libIlmThread.6.dylib in Frameworks */, + 57AC37310D2BE6340086D348 /* libIlmImf.6.dylib in Frameworks */, + 57AC37320D2BE6340086D348 /* libImath.6.dylib in Frameworks */, + 57AC37330D2BE6340086D348 /* libHalf.6.dylib in Frameworks */, + 57AC37340D2BE6340086D348 /* libpano13.dylib in Frameworks */, + 57AC37350D2BE6340086D348 /* libhugin_jhead.a in Frameworks */, + 57AC37360D2BE6340086D348 /* libhugin_vigra_impex.a in Frameworks */, + 57AC37370D2BE6340086D348 /* libhugin_utils.a in Frameworks */, + 57AC37380D2BE6340086D348 /* libhugin_vigra_ext.a in Frameworks */, + 57AC37390D2BE6340086D348 /* libhugin_panotools.a in Frameworks */, + 57AC373A0D2BE6340086D348 /* libhugin_panodata.a in Frameworks */, + 57AC373B0D2BE6340086D348 /* libhugin_appbase.a in Frameworks */, + 57AC373C0D2BE6340086D348 /* libhugin_algorithms.a in Frameworks */, + 57AC373D0D2BE6340086D348 /* libhugin_levmar.a in Frameworks */, + 57AC37430D2BE6950086D348 /* libhugin_nona.a in Frameworks */, + 57AC37410D2BE68D0086D348 /* libhugin_math.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 57E3467C0C4A89B0006AA781 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -2148,6 +2060,7 @@ isa = PBXGroup; children = ( 5751D8600939F1C0001477EA /* Hugin.xcodeproj */, + 57E122010D2BDBF300743A93 /* HuginVersion.xcconfig */, 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */, 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */, 5769F6320D23825700A6AD01 /* hugin_stitch_project-Info.plist */, @@ -2412,6 +2325,7 @@ 573B9041067BAEA700B7B355 /* tools */ = { isa = PBXGroup; children = ( + 57E122580D2BE4E900743A93 /* align_image_stack */, 5796FA950C4395CC006B7C6E /* nona */, 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */, 5709A0890C4543E100BD1C53 /* autooptimiser */, @@ -2817,6 +2731,7 @@ isa = PBXGroup; children = ( 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */, + 57E122480D2BE45700743A93 /* hugin_version.h */, 5771F5E60C3007B300736343 /* hugin_base */, 57114EC106BC2301004F4FA7 /* foreign */, 57460AB30C4E7BD5004507F7 /* tools */, @@ -3468,14 +3383,7 @@ buildRules = ( ); dependencies = ( - 5709A0680C4543E100BD1C53 /* PBXTargetDependency */, - 5709A06A0C4543E100BD1C53 /* PBXTargetDependency */, - 5709A06C0C4543E100BD1C53 /* PBXTargetDependency */, - 5709A0D40C45481500BD1C53 /* PBXTargetDependency */, - 5709A06E0C4543E100BD1C53 /* PBXTargetDependency */, - 5709A0700C4543E100BD1C53 /* PBXTargetDependency */, - 57DB9BC00C454B96004957C2 /* PBXTargetDependency */, - 57DB9BCB0C454C10004957C2 /* PBXTargetDependency */, + 57AC375A0D2BE7660086D348 /* PBXTargetDependency */, ); name = "autooptimiser static"; productName = "sample open_close"; @@ -3631,16 +3539,7 @@ buildRules = ( ); dependencies = ( - 5764829D0C469052003AFC2F /* PBXTargetDependency */, - 5764829F0C469052003AFC2F /* PBXTargetDependency */, - 576482A10C469052003AFC2F /* PBXTargetDependency */, - 576482A30C469052003AFC2F /* PBXTargetDependency */, - 576482A50C469052003AFC2F /* PBXTargetDependency */, - 5764835A0C469615003AFC2F /* PBXTargetDependency */, - 576483620C469627003AFC2F /* PBXTargetDependency */, - 5764835E0C46961B003AFC2F /* PBXTargetDependency */, - 5764835C0C46961B003AFC2F /* PBXTargetDependency */, - 576483600C46961F003AFC2F /* PBXTargetDependency */, + 57AC37580D2BE75F0086D348 /* PBXTargetDependency */, ); name = "fulla static"; productName = "sample open_close"; @@ -3657,14 +3556,7 @@ buildRules = ( ); dependencies = ( - 576484150C46AF49003AFC2F /* PBXTargetDependency */, - 576483EB0C46ADBA003AFC2F /* PBXTargetDependency */, - 576482C10C469056003AFC2F /* PBXTargetDependency */, - 576482C30C469056003AFC2F /* PBXTargetDependency */, - 576482C50C469056003AFC2F /* PBXTargetDependency */, - 576482C70C469056003AFC2F /* PBXTargetDependency */, - 576482C90C469056003AFC2F /* PBXTargetDependency */, - 576484010C46AF0A003AFC2F /* PBXTargetDependency */, + 57AC37560D2BE7540086D348 /* PBXTargetDependency */, ); name = "vig_optimize static"; productName = "sample open_close"; @@ -3874,6 +3766,23 @@ productReference = 57C1706C09A125DE00FAF325 /* libhugin_vigra_ext.a */; productType = "com.apple.product-type.library.static"; }; + 57E122570D2BE4E800743A93 /* align_image_stack static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 57E122620D2BE51000743A93 /* Build configuration list for PBXNativeTarget "align_image_stack static" */; + buildPhases = ( + 57E122550D2BE4E800743A93 /* Sources */, + 57E122560D2BE4E800743A93 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 57AC37510D2BE6F80086D348 /* PBXTargetDependency */, + ); + name = "align_image_stack static"; + productName = align_image_stack; + productReference = 57E122580D2BE4E900743A93 /* align_image_stack */; + productType = "com.apple.product-type.tool"; + }; 57E3467D0C4A89B0006AA781 /* Hugin */ = { isa = PBXNativeTarget; buildConfigurationList = 57E346D20C4A8A2E006AA781 /* Build configuration list for PBXNativeTarget "Hugin" */; @@ -3955,7 +3864,7 @@ productRefGroup = 57FC3ABD0675E43600C3E0AC; projectDirPath = ""; targets = ( - 57C486290C3121E8002D79F1 /* copy hugin_config.h */, + 57C486290C3121E8002D79F1 /* configure */, 57A60E920C400269007B5462 /* all */, 57E3470D0C4A8E95006AA781 /* lib static */, 5720E4720BD456CD00E63404 /* levmar */, @@ -3987,6 +3896,7 @@ 5709A0670C4543E100BD1C53 /* autooptimiser static */, 5764829C0C469052003AFC2F /* fulla static */, 576482C00C469056003AFC2F /* vig_optimize static */, + 57E122570D2BE4E800743A93 /* align_image_stack static */, ); }; /* End PBXProject section */ @@ -4083,7 +3993,7 @@ shellPath = /bin/sh; shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi"; }; - 57C4863E0C3122C4002D79F1 /* ShellScript */ = { + 57C4863E0C3122C4002D79F1 /* copy hugin_config.h */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -4091,13 +4001,30 @@ inputPaths = ( ../src/hugin_config_mac.h, ); + name = "copy hugin_config.h"; outputPaths = ( ../src/hugin_config.h, ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cp -r ../src/hugin_config_mac.h ../src/hugin_config.h "; + shellScript = "cp -r ../src/hugin_config_mac.h ../src/hugin_config.h\n\n"; }; + 57E122110D2BDDBE00743A93 /* configure hugin_version.h */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ../src/hugin_version.h.in.cmake, + ); + name = "configure hugin_version.h"; + outputPaths = ( + ../src/hugin_version.h, + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "sed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n"; + }; 57E347640C4A8F9F006AA781 /* Resourse Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -4403,6 +4330,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57E122550D2BE4E800743A93 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 57E1225C0D2BE50700743A93 /* align_image_stack.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 57E3467B0C4A89B0006AA781 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4476,36 +4411,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 5709A0680C4543E100BD1C53 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5749F8A2067B60CA00A6EDD4 /* jhead */; - targetProxy = 5709A0690C4543E100BD1C53 /* PBXContainerItemProxy */; - }; - 5709A06A0C4543E100BD1C53 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5711524906BC6709004F4FA7 /* vigra_impex */; - targetProxy = 5709A06B0C4543E100BD1C53 /* PBXContainerItemProxy */; - }; - 5709A06C0C4543E100BD1C53 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F5D60C3006E900736343 /* hugin_utils */; - targetProxy = 5709A06D0C4543E100BD1C53 /* PBXContainerItemProxy */; - }; - 5709A06E0C4543E100BD1C53 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 571300640C33D41F00252FE3 /* panotools */; - targetProxy = 5709A06F0C4543E100BD1C53 /* PBXContainerItemProxy */; - }; - 5709A0700C4543E100BD1C53 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5759DA4E0C327D680043F754 /* panodata */; - targetProxy = 5709A0710C4543E100BD1C53 /* PBXContainerItemProxy */; - }; - 5709A0D40C45481500BD1C53 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5759D9AB0C32713F0043F754 /* appbase */; - targetProxy = 5709A0D30C45481500BD1C53 /* PBXContainerItemProxy */; - }; 5710467C0D25F5EF006A3C69 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5769FC280D24A26400A6AD01 /* frameworks */; @@ -4523,77 +4428,77 @@ }; 5737BC390C4CF7BA00A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC380C4CF7BA00A61778 /* PBXContainerItemProxy */; }; 5737BC3B0C4CF7CE00A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC3A0C4CF7CE00A61778 /* PBXContainerItemProxy */; }; 5737BC3D0C4CF7D500A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC3C0C4CF7D500A61778 /* PBXContainerItemProxy */; }; 5737BC3F0C4CF7D800A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC3E0C4CF7D800A61778 /* PBXContainerItemProxy */; }; 5737BC410C4CF7E500A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC400C4CF7E500A61778 /* PBXContainerItemProxy */; }; 5737BC430C4CF7EA00A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC420C4CF7EA00A61778 /* PBXContainerItemProxy */; }; 5737BC450C4CF7ED00A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC440C4CF7ED00A61778 /* PBXContainerItemProxy */; }; 5737BC470C4CF7F000A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC460C4CF7F000A61778 /* PBXContainerItemProxy */; }; 5737BC490C4CF7F400A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC480C4CF7F400A61778 /* PBXContainerItemProxy */; }; 5737BC4B0C4CF80300A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC4A0C4CF80300A61778 /* PBXContainerItemProxy */; }; 5737BC4D0C4CF80700A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC4C0C4CF80700A61778 /* PBXContainerItemProxy */; }; 5737BC4F0C4CF80A00A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC4E0C4CF80A00A61778 /* PBXContainerItemProxy */; }; 5737BC510C4CF80D00A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC500C4CF80D00A61778 /* PBXContainerItemProxy */; }; 5737BC530C4CF81400A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC520C4CF81400A61778 /* PBXContainerItemProxy */; }; 5737BC550C4CF81800A61778 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5737BC540C4CF81800A61778 /* PBXContainerItemProxy */; }; 57525A2E0C54BC8400BF8096 /* PBXTargetDependency */ = { @@ -4603,99 +4508,9 @@ }; 57525A320C54BCA400BF8096 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 57525A310C54BCA400BF8096 /* PBXContainerItemProxy */; }; - 5764829D0C469052003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5749F8A2067B60CA00A6EDD4 /* jhead */; - targetProxy = 5764829E0C469052003AFC2F /* PBXContainerItemProxy */; - }; - 5764829F0C469052003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5711524906BC6709004F4FA7 /* vigra_impex */; - targetProxy = 576482A00C469052003AFC2F /* PBXContainerItemProxy */; - }; - 576482A10C469052003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F5D60C3006E900736343 /* hugin_utils */; - targetProxy = 576482A20C469052003AFC2F /* PBXContainerItemProxy */; - }; - 576482A30C469052003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 571300640C33D41F00252FE3 /* panotools */; - targetProxy = 576482A40C469052003AFC2F /* PBXContainerItemProxy */; - }; - 576482A50C469052003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5759DA4E0C327D680043F754 /* panodata */; - targetProxy = 576482A60C469052003AFC2F /* PBXContainerItemProxy */; - }; - 576482C10C469056003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5749F8A2067B60CA00A6EDD4 /* jhead */; - targetProxy = 576482C20C469056003AFC2F /* PBXContainerItemProxy */; - }; - 576482C30C469056003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5711524906BC6709004F4FA7 /* vigra_impex */; - targetProxy = 576482C40C469056003AFC2F /* PBXContainerItemProxy */; - }; - 576482C50C469056003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F5D60C3006E900736343 /* hugin_utils */; - targetProxy = 576482C60C469056003AFC2F /* PBXContainerItemProxy */; - }; - 576482C70C469056003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 571300640C33D41F00252FE3 /* panotools */; - targetProxy = 576482C80C469056003AFC2F /* PBXContainerItemProxy */; - }; - 576482C90C469056003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5759DA4E0C327D680043F754 /* panodata */; - targetProxy = 576482CA0C469056003AFC2F /* PBXContainerItemProxy */; - }; - 5764835A0C469615003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 574092290C393E6600D16607 /* nona */; - targetProxy = 576483590C469615003AFC2F /* PBXContainerItemProxy */; - }; - 5764835C0C46961B003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5759D9AB0C32713F0043F754 /* appbase */; - targetProxy = 5764835B0C46961B003AFC2F /* PBXContainerItemProxy */; - }; - 5764835E0C46961B003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F7790C30216F00736343 /* hugin_math */; - targetProxy = 5764835D0C46961B003AFC2F /* PBXContainerItemProxy */; - }; - 576483600C46961F003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5771F8140C30268F00736343 /* PTLensDB */; - targetProxy = 5764835F0C46961F003AFC2F /* PBXContainerItemProxy */; - }; - 576483620C469627003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 57C1705809A125DE00FAF325 /* vigra_ext */; - targetProxy = 576483610C469627003AFC2F /* PBXContainerItemProxy */; - }; - 576483EB0C46ADBA003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 57EA83850C3A798A00E4965E /* algorithms */; - targetProxy = 576483EA0C46ADBA003AFC2F /* PBXContainerItemProxy */; - }; - 576484010C46AF0A003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5759D9AB0C32713F0043F754 /* appbase */; - targetProxy = 576484000C46AF0A003AFC2F /* PBXContainerItemProxy */; - }; - 576484150C46AF49003AFC2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 5720E4720BD456CD00E63404 /* levmar */; - targetProxy = 576484140C46AF49003AFC2F /* PBXContainerItemProxy */; - }; 576900950D24D26200A6AD01 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */; @@ -4768,7 +4583,7 @@ }; 5769F6000D23825700A6AD01 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 5769F6010D23825700A6AD01 /* PBXContainerItemProxy */; }; 5769F8840D23AAE800A6AD01 /* PBXTargetDependency */ = { @@ -4793,19 +4608,34 @@ }; 57A60E940C400272007B5462 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + target = 57C486290C3121E8002D79F1 /* configure */; targetProxy = 57A60E930C400272007B5462 /* PBXContainerItemProxy */; }; - 57DB9BC00C454B96004957C2 /* PBXTargetDependency */ = { + 57AC37490D2BE6D80086D348 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 57EA83850C3A798A00E4965E /* algorithms */; - targetProxy = 57DB9BBF0C454B96004957C2 /* PBXContainerItemProxy */; + target = 57E122570D2BE4E800743A93 /* align_image_stack static */; + targetProxy = 57AC37480D2BE6D80086D348 /* PBXContainerItemProxy */; }; - 57DB9BCB0C454C10004957C2 /* PBXTargetDependency */ = { + 57AC37510D2BE6F80086D348 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5771F7790C30216F00736343 /* hugin_math */; - targetProxy = 57DB9BCA0C454C10004957C2 /* PBXContainerItemProxy */; + target = 57E3470D0C4A8E95006AA781 /* lib static */; + targetProxy = 57AC37500D2BE6F80086D348 /* PBXContainerItemProxy */; }; + 57AC37560D2BE7540086D348 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E3470D0C4A8E95006AA781 /* lib static */; + targetProxy = 57AC37550D2BE7540086D348 /* PBXContainerItemProxy */; + }; + 57AC37580D2BE75F0086D348 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E3470D0C4A8E95006AA781 /* lib static */; + targetProxy = 57AC37570D2BE75F0086D348 /* PBXContainerItemProxy */; + }; + 57AC375A0D2BE7660086D348 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E3470D0C4A8E95006AA781 /* lib static */; + targetProxy = 57AC37590D2BE7660086D348 /* PBXContainerItemProxy */; + }; 57E347130C4A8EB6006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 576EC4980C3FC9300076A417 /* huginapp */; @@ -5163,6 +4993,7 @@ }; 5745FC2A094E1E6400E6B672 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 57E122010D2BDBF300743A93 /* HuginVersion.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( @@ -5172,6 +5003,8 @@ COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; 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; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_PASCAL_STRINGS = YES; @@ -5197,17 +5030,17 @@ ); MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; - MACOSX_DEPLOYMENT_TARGET_ppc64 = ""; - MACOSX_DEPLOYMENT_TARGET_x86_64 = ""; + MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5; + MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4"; - PER_ARCH_CFLAGS_ppc64 = ""; - PER_ARCH_CFLAGS_x86_64 = ""; + PER_ARCH_CFLAGS_ppc64 = "-mcpu=G5 -mtune=G5 -ftree-vectorize"; + PER_ARCH_CFLAGS_x86_64 = "-march=nocona -mtune=generic -ftree-vectorize"; REPOSITORY_DIR = ./ExternalPrograms/repository; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; - SDKROOT_ppc64 = ""; - SDKROOT_x86_64 = ""; + SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk; + SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk; SEPARATE_STRIP = YES; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; @@ -5223,6 +5056,7 @@ }; 5745FC2B094E1E6400E6B672 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 57E122010D2BDBF300743A93 /* HuginVersion.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( @@ -5232,6 +5066,8 @@ COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; DEBUG_MACRO = ""; + DYLIB_COMPATIBILITY_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).0"; + DYLIB_CURRENT_VERSION = "$(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)"; GCC_CW_ASM_SYNTAX = NO; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_PASCAL_STRINGS = YES; @@ -5250,7 +5086,6 @@ "$(REPOSITORY_DIR)/include/OpenEXR", ../src, ); - HUGIN_PACKAGE_VERSION = 0.7; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ( "$(value)", @@ -5526,6 +5361,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = fulla; }; name = Debug; @@ -5539,6 +5379,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = fulla; }; name = Development; @@ -5552,6 +5397,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = fulla; }; name = "Development ZeroLink"; @@ -5565,6 +5415,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = fulla; }; name = Release; @@ -6070,12 +5925,15 @@ }; 576D277B093B3D4400FC5596 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 57E122010D2BDBF300743A93 /* HuginVersion.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; 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; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -6102,8 +5960,8 @@ ); MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; - MACOSX_DEPLOYMENT_TARGET_ppc64 = ""; - MACOSX_DEPLOYMENT_TARGET_x86_64 = ""; + MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5; + MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4"; PER_ARCH_CFLAGS_ppc64 = ""; @@ -6111,8 +5969,8 @@ REPOSITORY_DIR = ./ExternalPrograms/repository; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; - SDKROOT_ppc64 = ""; - SDKROOT_x86_64 = ""; + SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk; + SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk; SEPARATE_STRIP = YES; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; @@ -6244,12 +6102,15 @@ }; 5771F6350C30115A00736343 /* Development ZeroLink */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 57E122010D2BDBF300743A93 /* HuginVersion.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; 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; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -6276,17 +6137,13 @@ ); MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; - MACOSX_DEPLOYMENT_TARGET_ppc64 = ""; - MACOSX_DEPLOYMENT_TARGET_x86_64 = ""; - PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; - PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4"; - PER_ARCH_CFLAGS_ppc64 = ""; - PER_ARCH_CFLAGS_x86_64 = ""; + MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5; + MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5; REPOSITORY_DIR = ./ExternalPrograms/repository; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; - SDKROOT_ppc64 = ""; - SDKROOT_x86_64 = ""; + SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk; + SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk; SEPARATE_STRIP = YES; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; @@ -6547,6 +6404,74 @@ }; name = Release; }; + 57E122630D2BE51000743A93 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = align_image_stack; + }; + name = Debug; + }; + 57E122640D2BE51000743A93 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = align_image_stack; + }; + name = Development; + }; + 57E122650D2BE51000743A93 /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; + PRODUCT_NAME = align_image_stack; + }; + name = "Development ZeroLink"; + }; + 57E122660D2BE51000743A93 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inheri... [truncated message content] |
From: <da...@us...> - 2008-01-02 16:44:04
|
Revision: 2592 http://hugin.svn.sourceforge.net/hugin/?rev=2592&view=rev Author: dangelo Date: 2008-01-02 08:43:57 -0800 (Wed, 02 Jan 2008) Log Message: ----------- Embed SVN version in splash screen Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/src/hugin1/hugin/MainFrame.cpp hugin/trunk/src/hugin1/hugin/xrc/data/about.htm.in hugin/trunk/src/hugin1/hugin/xrc/data/splash.png Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2008-01-02 15:53:03 UTC (rev 2591) +++ hugin/trunk/CMakeLists.txt 2008-01-02 16:43:57 UTC (rev 2592) @@ -34,6 +34,7 @@ SET(HUGIN_PACKAGE_VERSION ${V_MAJOR}.${V_MINOR}.${V_PATCH}.${HUGIN_WC_REVISION}) ELSE (EXISTS ${PROJECT_SOURCE_DIR}/.svn) SET(HUGIN_PACKAGE_VERSION ${V_MAJOR}.${V_MINOR}.${V_PATCH}) + SET(HUGIN_WC_REVISION 0) ENDIF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) # version for internal libraries. Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-01-02 15:53:03 UTC (rev 2591) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-01-02 16:43:57 UTC (rev 2592) @@ -25,6 +25,8 @@ */ #include <config.h> +#include <hugin_version.h> + #include "panoinc_WX.h" #include "panoinc.h" @@ -181,6 +183,26 @@ if (bitmap.LoadFile(huginApp::Get()->GetXRCPath() + wxT("data/splash.png"), wxBITMAP_TYPE_PNG)) { + // embed package version into string. + { + wxMemoryDC dc; + dc.SelectObject(bitmap); + wxFont font(8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + dc.SetFont(font); + dc.SetTextForeground(*wxBLACK); + dc.SetTextBackground(*wxWHITE); + int tw, th; + wxString version; +#if HUGIN_WC_REVISION > 0 + version.Printf(_("Prerelease %s"),wxString(PACKAGE_VERSION, wxConvLocal).c_str()); +#else + version.Printf(_("Version %s"),wxString(PACKAGE_VERSION, wxConvLocal).c_str()); +#endif + dc.GetTextExtent(version, &tw, &th); + // place text on bitmap. + dc.DrawText(version, bitmap.GetWidth() - tw - 5, bitmap.GetHeight() - th - 5); + } + #ifdef __unix__ splash = new wxSplashScreen(bitmap, wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_NO_TIMEOUT, @@ -195,7 +217,7 @@ wxSIMPLE_BORDER); #endif } else { - wxLogFatalError(_("Fatal installation error\nThe data/splash.png was not found at:") + huginApp::Get()->GetXRCPath()); + wxLogFatalError(_("Fatal installation error\nThe file data/splash.png was not found at:") + huginApp::Get()->GetXRCPath()); abort(); } splash->Refresh(); Modified: hugin/trunk/src/hugin1/hugin/xrc/data/about.htm.in =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/data/about.htm.in 2008-01-02 15:53:03 UTC (rev 2591) +++ hugin/trunk/src/hugin1/hugin/xrc/data/about.htm.in 2008-01-02 16:43:57 UTC (rev 2592) @@ -6,10 +6,10 @@ <center> <img src="splash.png"></img><p> <font size=+2>hugin</font><br> + Version ${HUGIN_PACKAGE_VERSION} + <br> <font size=-1>(http://hugin.sourceforge.net)</font> <br> - Hugin version ${HUGIN_PACKAGE_VERSION} - <br> by Pablo d'Angelo <p> <b>Additional Authors: </b> @@ -34,12 +34,14 @@ Milo Casagrande <p> Hugin uses the EMoR response model from the Computer Vision Lab at Columbia University. + The GUI layout is in part based on the interface of PTGui by Joost Nieuwenhuijse. </p> + <br> <b>Thanks to:</b> Luca Vascon for the logo, and all members of the PTX email list.<p> Hugin is licenced under the GPL 2<br> - <b>Copyright (C) 2004-2007</b> by the authors. + <b>Copyright (C) 2004-2008</b> by the authors. </center> </body> Modified: hugin/trunk/src/hugin1/hugin/xrc/data/splash.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-01-03 12:47:58
|
Revision: 2600 http://hugin.svn.sourceforge.net/hugin/?rev=2600&view=rev Author: dangelo Date: 2008-01-03 04:47:52 -0800 (Thu, 03 Jan 2008) Log Message: ----------- Fix problems with localized subversion output during configuration step Modified Paths: -------------- hugin/trunk/CMakeLists.txt Added Paths: ----------- hugin/trunk/CMakeModules/FindSubversion.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2008-01-03 12:40:16 UTC (rev 2599) +++ hugin/trunk/CMakeLists.txt 2008-01-03 12:47:52 UTC (rev 2600) @@ -25,7 +25,7 @@ FIND_PACKAGE(Subversion REQUIRED) IF(Subversion_FOUND) Subversion_WC_INFO(${PROJECT_SOURCE_DIR} HUGIN) - MESSAGE("Current revision is ${HUGIN_WC_REVISION}") + MESSAGE("-- Current SVN revision is ${HUGIN_WC_REVISION}") ELSE(Subversion_FOUND) SET(HUGIN_WC_REVISION svn) ENDIF(Subversion_FOUND) @@ -181,7 +181,7 @@ # use shared internal libraries SET(HUGIN_SHARED_LIBS 1) ENDIF (${HUGIN_SHARED}) - MESSAGE("Using shared libraries") + MESSAGE("-- Using shared internal libraries") ELSE (UNIX) # no shared libs DLL on windows. The code is just Added: hugin/trunk/CMakeModules/FindSubversion.cmake =================================================================== --- hugin/trunk/CMakeModules/FindSubversion.cmake (rev 0) +++ hugin/trunk/CMakeModules/FindSubversion.cmake 2008-01-03 12:47:52 UTC (rev 2600) @@ -0,0 +1,118 @@ +# - Extract information from a subversion working copy +# The module defines the following variables: +# Subversion_SVN_EXECUTABLE - path to svn command line client +# Subversion_VERSION_SVN - version of svn command line client +# Subversion_FOUND - true if the command line client was found +# If the command line client executable is found the macro +# Subversion_WC_INFO(<dir> <var-prefix>) +# is defined to extract information of a subversion working copy at +# a given location. The macro defines the following variables: +# <var-prefix>_WC_URL - url of the repository (at <dir>) +# <var-prefix>_WC_ROOT - root url of the repository +# <var-prefix>_WC_REVISION - current revision +# <var-prefix>_WC_LAST_CHANGED_AUTHOR - author of last commit +# <var-prefix>_WC_LAST_CHANGED_DATE - date of last commit +# <var-prefix>_WC_LAST_CHANGED_REV - revision of last commit +# <var-prefix>_WC_LAST_CHANGED_LOG - last log of base revision +# <var-prefix>_WC_INFO - output of command `svn info <dir>' +# Example usage: +# FIND_PACKAGE(Subversion) +# IF(Subversion_FOUND) +# Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project) +# MESSAGE("Current revision is ${Project_WC_REVISION}") +# ENDIF(Subversion_FOUND) + +# Copyright (c) 2006, Tristan Carel +# All rights reserved. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the University of California, Berkeley nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# $Id: FindSubversion.cmake,v 1.1.2.1 2006/11/13 17:59:54 hoffman Exp $ + +SET(Subversion_FOUND FALSE) +SET(Subversion_SVN_FOUND FALSE) + +FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn + DOC "subversion command line client") +MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE) + +IF(Subversion_SVN_EXECUTABLE) + SET(Subversion_SVN_FOUND TRUE) + SET(Subversion_FOUND TRUE) + + MACRO(Subversion_WC_INFO dir prefix) + EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + OUTPUT_VARIABLE Subversion_VERSION_SVN + OUTPUT_STRIP_TRAILING_WHITESPACE) + + EXECUTE_PROCESS(COMMAND env LANG=C ${Subversion_SVN_EXECUTABLE} info ${dir} + OUTPUT_VARIABLE ${prefix}_WC_INFO + ERROR_VARIABLE Subversion_svn_info_error + RESULT_VARIABLE Subversion_svn_info_result + OUTPUT_STRIP_TRAILING_WHITESPACE) + + IF(NOT ${Subversion_svn_info_result} EQUAL 0) + MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}") + ELSE(NOT ${Subversion_svn_info_result} EQUAL 0) + + STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*" + "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}") + STRING(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*" + "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}") + STRING(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*" + "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}") + STRING(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*" + "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}") + STRING(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*" + "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}") + STRING(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*" + "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}") + + ENDIF(NOT ${Subversion_svn_info_result} EQUAL 0) + + EXECUTE_PROCESS(COMMAND + env LANG=C ${Subversion_SVN_EXECUTABLE} log -r BASE ${dir} + OUTPUT_VARIABLE Subversion_LAST_CHANGED_LOG + ERROR_VARIABLE Subversion_svn_log_error + RESULT_VARIABLE Subversion_svn_log_result + OUTPUT_STRIP_TRAILING_WHITESPACE) + + IF(NOT ${Subversion_svn_log_result} EQUAL 0) + MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}") + ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0) + ENDMACRO(Subversion_WC_INFO) + +ENDIF(Subversion_SVN_EXECUTABLE) + +IF(NOT Subversion_FOUND) + IF(NOT Subversion_FIND_QUIETLY) + MESSAGE(STATUS "Subversion was not found.") + ELSE(NOT Subversion_FIND_QUIETLY) + IF(Subversion_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Subversion was not found.") + ENDIF(Subversion_FIND_REQUIRED) + ENDIF(NOT Subversion_FIND_QUIETLY) +ENDIF(NOT Subversion_FOUND) + +# FindSubversion.cmake ends here. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-01-03 16:25:38
|
Revision: 2607 http://hugin.svn.sourceforge.net/hugin/?rev=2607&view=rev Author: dangelo Date: 2008-01-03 08:25:33 -0800 (Thu, 03 Jan 2008) Log Message: ----------- added fisheye support to align image stack (based on patch by sebpz) Modified Paths: -------------- hugin/trunk/AUTHORS hugin/trunk/src/tools/align_image_stack.cpp Modified: hugin/trunk/AUTHORS =================================================================== --- hugin/trunk/AUTHORS 2008-01-03 14:40:31 UTC (rev 2606) +++ hugin/trunk/AUTHORS 2008-01-03 16:25:33 UTC (rev 2607) @@ -33,8 +33,9 @@ Alexandre Prokoudine Russian Ademar de Souza Reis Brazilian Harry von der Wolf Dutch + Simon Oosthoek Dutch Lu Fang Simplified Chinese - György Balló Hungarian + György Ball\xC3 Hungarian Albert Capellades Badia Catalan Jiri Slaby Czech Serhij Dubyk Ukrainian Modified: hugin/trunk/src/tools/align_image_stack.cpp =================================================================== --- hugin/trunk/src/tools/align_image_stack.cpp 2008-01-03 14:40:31 UTC (rev 2606) +++ hugin/trunk/src/tools/align_image_stack.cpp 2008-01-03 16:25:33 UTC (rev 2607) @@ -75,6 +75,7 @@ << " -o output merge images to HDR, generate output.hdr)," << std::endl << " Modifiers" << std::endl << " -v Verbose, print progress messages" << std::endl + << " -e Assume input images are full frame fish eye (default: rectilinear)" << std::endl << " -t num Remove all control points with an error higher than num pixels (default: 3)" << std::endl << " -f HFOV approximate horizontal field of view of input images, use if EXIF info not complete" << std::endl << " -m Optimize field of view for all images, execpt for first." << std::endl @@ -222,12 +223,14 @@ hfov = 0; pyrLevel = 2; optHFOV = false; + fisheye = false; } double cpErrorThreshold; int nPoints; double hfov; bool optHFOV; + bool fisheye; int pyrLevel; std::string alignedPrefix; std::string ptoFile; @@ -265,6 +268,10 @@ SrcPanoImage srcImg; srcImg.setFilename(files[0]); + + if (param.fisheye) { + srcImg.setProjection(SrcPanoImage::FULL_FRAME_FISHEYE); + } SrcPanoImage::initImageFromFile(srcImg, focalLength, cropFactor); // disable autorotate srcImg.setRoll(0); @@ -292,11 +299,16 @@ } pano.setSrcImage(imgNr, srcImg); - // setup output to be exactly similar to input image PanoramaOptions opts; - opts.setProjection(PanoramaOptions::RECTILINEAR); + + if (param.fisheye) { + opts.setProjection(PanoramaOptions::FULL_FRAME_FISHEYE); + } else { + opts.setProjection(PanoramaOptions::RECTILINEAR); + } opts.setHFOV(srcImg.getHFOV(), false); + if (srcImg.getRoll() == 0.0 || srcImg.getRoll() == 180.0) { opts.setWidth(srcImg.getSize().x, false); opts.setHeight(srcImg.getSize().y); @@ -452,7 +464,7 @@ int main(int argc, char *argv[]) { // parse arguments - const char * optstring = "a:f:hmp:vo:t:c:o:"; + const char * optstring = "a:ef:hmp:vo:t:c:o:"; int c; opterr = 0; @@ -470,6 +482,9 @@ case 'c': param.nPoints = atoi(optarg); break; + case 'e': + param.fisheye = true; + break; case 'f': param.hfov = atof(optarg); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |