Menu
▾
▴
[Hugin-cvs] SF.net SVN: hugin:[3252] hugin/trunk
|
From: <ip...@us...> - 2008-07-31 14:04:44
|
Revision: 3252
http://hugin.svn.sourceforge.net/hugin/?rev=3252&view=rev
Author: ippei
Date: 2008-07-31 14:04:34 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Mac: build update; easier to compile for multiple repositories, external single architecture fix, boost 1.36
Modified Paths:
--------------
hugin/trunk/mac/BuildConfig.xcconfig.orig
hugin/trunk/mac/ExternalPrograms/readme.txt
hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt
hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt
hugin/trunk/mac/ExternalPrograms/scripts/boost.sh
hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh
hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh
hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh
hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh
hugin/trunk/mac/ExternalPrograms/scripts/static/boost.sh
hugin/trunk/mac/ExternalPrograms/scripts/static/wxmac28.sh
hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh
hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
hugin/trunk/mac/complete-bundle.sh
hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h
Added Paths:
-----------
hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-panther.txt
Modified: hugin/trunk/mac/BuildConfig.xcconfig.orig
===================================================================
--- hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/BuildConfig.xcconfig.orig 2008-07-31 14:04:34 UTC (rev 3252)
@@ -1,4 +1,4 @@
-#include "Version.xcconfig"
+#include "../mac/Version.xcconfig"
// where external libraries are installed
REPOSITORY_ABSOLUTE_PATH = /PATH/TO/HUGIN/SOURCE/mac/ExternalPrograms/repository
@@ -9,26 +9,30 @@
//RELEASE_ARCHS_64 = ppc64 x86_64
// SDK target
-SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk
+SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk
SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk
SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk
// deployment target
-MACOSX_DEPLOYMENT_TARGET_ppc = 10.3.9
+MACOSX_DEPLOYMENT_TARGET_ppc = 10.4
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4
MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5
MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5
// special optimization
-PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4
+PER_ARCH_CFLAGS_ppc = -mcpu=G4 -mtune=G4 -ftree-vectorize
PER_ARCH_CFLAGS_i386 = -march=prescott -mtune=pentium-m -ftree-vectorize
PER_ARCH_CFLAGS_ppc64 = -mcpu=G5 -mtune=G5 -ftree-vectorize
PER_ARCH_CFLAGS_x86_64 = -march=nocona -mtune=generic -ftree-vectorize
// wxWidgets
WX_MAJOR_VERSION = 2.8
-WX_LOCALE_DIR = ./ExternalPrograms/wxMac-2.8.8/locale
+WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.8/locale
// ExifTool
-EXIFTOOL_DIR = ./ExternalPrograms/Image-ExifTool-7.34
\ No newline at end of file
+EXIFTOOL_DIR = ../mac/ExternalPrograms/Image-ExifTool-7.34
+
+// Boost Thread
+BOOST_VER = 1_36
+BOOST_THREAD_LIB = libboost_thread-xgcc40-mt
Modified: hugin/trunk/mac/ExternalPrograms/readme.txt
===================================================================
--- hugin/trunk/mac/ExternalPrograms/readme.txt 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/readme.txt 2008-07-31 14:04:34 UTC (rev 3252)
@@ -24,7 +24,7 @@
The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts.
[Dynamic Build for distributable Hugin.app]
-boost (1.35.0)
+boost (1.36)
libexpat (2.0.1)
libjpeg (6b)
libpng (1.2.29)
@@ -40,7 +40,7 @@
enblend31 (cvs or 3.1)
[Static Build for distributable command-line tools]
-static/boost (1.35.0)
+static/boost (1.36)
static/libexpat (2.0.1)
static/libjpeg (6b)
static/libpng (1.2.29)
Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-leopard.txt 2008-07-31 14:04:34 UTC (rev 3252)
@@ -17,10 +17,10 @@
REPOSITORYDIR="$myREPOSITORYDIR" \
ARCHS="ppc i386 ppc64 x86_64" \
\
- ppcTARGET="powerpc-apple-darwin7" \
- ppcOSVERSION="10.3.9" \
- ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \
- ppcOPTIMIZE="-mcpu=G3 -mtune=G4" \
+ ppcTARGET="powerpc-apple-darwin8" \
+ ppcOSVERSION="10.4" \
+ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \
+ ppcOPTIMIZE="-mcpu=G4 -mtune=G4 -ftree-vectorize" \
\
i386TARGET="i386-apple-darwin8" \
i386OSVERSION="10.4" \
Added: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-panther.txt
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-panther.txt (rev 0)
+++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-panther.txt 2008-07-31 14:04:34 UTC (rev 3252)
@@ -0,0 +1,40 @@
+# Configuration for G3 and Panther build
+# Copyright (c) 2007-2008, Ippei Ukai
+
+
+# has to be the absolute path from /
+myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository";
+
+# number of jobs that make can use, probably same as the number of CPUs.
+#PROCESSNUM=2
+PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g');
+
+
+
+mkdir -p $myREPOSITORYDIR;
+
+export \
+ REPOSITORYDIR="$myREPOSITORYDIR" \
+ ARCHS="ppc" \
+ \
+ ppcTARGET="powerpc-apple-darwin7" \
+ ppcOSVERSION="10.3" \
+ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \
+ ppcOPTIMIZE="-mcpu=G3 -mtune=G3" \
+ \
+ OTHERARGs="" \
+ OTHERMAKEARGs="--jobs=$PROCESSNUM";
+
+
+# Deprecated:
+export \
+ ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \
+
+
+# cmake settings
+export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include"
+export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib"
+
+
+
+# $Id: SetEnv-universal.txt 1902 2007-02-04 22:27:47Z ippei $
Modified: hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2008-07-31 14:04:34 UTC (rev 3252)
@@ -17,10 +17,10 @@
REPOSITORYDIR="$myREPOSITORYDIR" \
ARCHS="ppc i386" \
\
- ppcTARGET="powerpc-apple-darwin7" \
- ppcOSVERSION="10.3.9" \
- ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \
- ppcOPTIMIZE="-mcpu=G3 -mtune=G4" \
+ ppcTARGET="powerpc-apple-darwin8" \
+ ppcOSVERSION="10.4" \
+ ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \
+ ppcOPTIMIZE="-mcpu=G4 -mtune=G4 -ftree-vectorize" \
\
i386TARGET="i386-apple-darwin8" \
i386OSVERSION="10.4" \
Modified: hugin/trunk/mac/ExternalPrograms/scripts/boost.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/boost.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -19,11 +19,12 @@
# OTHERARGs="";
-BOOST_VER="1_35"
+BOOST_VER="1_36"
+BOOST_THREAD_LIB="libboost_thread-xgcc40-mt"
-
# install headers
+mkdir -p "$REPOSITORYDIR/include"
rm -rf "$REPOSITORYDIR/include/boost";
cp -R "./boost" "$REPOSITORYDIR/include/";
@@ -85,13 +86,15 @@
boostADDRESSMODEL="64"
fi
+ SDKVRSION=$(echo $MACSDKDIR | sed 's/^[^1]*\([[:digit:]]*\.[[:digit:]]*\).*/\1/')
- echo "WARNING: assumes the SDK version matches the macosx-version-min"
# hack that sends extra arguments to g++
$BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR --toolset="darwin" -n stage \
- --with-thread variant=release link=static \
- architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" macosx-version="$OSVERSION" \
+ --with-thread \
+ variant=release link=static \
+ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \
+ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \
| grep "^ " | sed 's/"//g' | sed s/g++/g++\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \
| while read COMMAND
do
@@ -101,8 +104,10 @@
# hack that sends extra arguments to g++
$BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR --toolset="darwin" -n stage \
- --with-thread variant=release \
- architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" macosx-version="$OSVERSION" \
+ --with-thread \
+ variant=release \
+ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \
+ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \
| grep "^ " | sed 's/"//g' | sed s/g++/g++\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \
| while read COMMAND
do
@@ -114,12 +119,12 @@
# merge libboost_thread
-for liba in "lib/libboost_thread-mt-$BOOST_VER.a" "lib/libboost_thread-mt-$BOOST_VER.dylib"
+for liba in "lib/$BOOST_THREAD_LIB-$BOOST_VER.a" "lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib"
do
if [ $NUMARCH -eq 1 ]
then
- mv "stage-$ARCH/$libname" "$REPOSITORYDIR/$libname";
+ mv "stage-$ARCH/$liba" "$REPOSITORYDIR/$liba";
if [[ $liba == *.a ]]
then
ranlib "$REPOSITORYDIR/$liba";
@@ -143,14 +148,14 @@
done
-if [ -f "$REPOSITORYDIR/lib/libboost_thread-mt-$BOOST_VER.a" ]
+if [ -f "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.a" ]
then
- ln -sfn libboost_thread-mt-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread-mt.a;
- ln -sfn libboost_thread-mt.a $REPOSITORYDIR/lib/libboost_thread.a;
+ ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.a $REPOSITORYDIR/lib/$BOOST_THREAD_LIB.a;
+ ln -sfn $BOOST_THREAD_LIB.a $REPOSITORYDIR/lib/libboost_thread.a;
fi
-if [ -f "$REPOSITORYDIR/lib/libboost_thread-mt-$BOOST_VER.dylib" ]
+if [ -f "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib" ]
then
- install_name_tool -id "$REPOSITORYDIR/lib/libboost_thread-mt-$BOOST_VER.dylib" "$REPOSITORYDIR/lib/libboost_thread-mt-$BOOST_VER.dylib";
- ln -sfn libboost_thread-mt-$BOOST_VER.dylib $REPOSITORYDIR/lib/libboost_thread-mt.dylib;
- ln -sfn libboost_thread-mt.dylib $REPOSITORYDIR/lib/libboost_thread.dylib;
+ install_name_tool -id "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib" "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.dylib";
+ ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.dylib $REPOSITORYDIR/lib/$BOOST_THREAD_LIB.dylib;
+ ln -sfn $BOOST_THREAD_LIB.dylib $REPOSITORYDIR/lib/libboost_thread.dylib;
fi
Modified: hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/gnumake.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -88,22 +88,23 @@
for program in bin/gnumake
do
- if [ $NUMARCH -eq 1 ]
- then
- mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program";
- strip "$REPOSITORYDIR/$program";
- continue
- fi
-
LIPOARGs=""
for ARCH in $ARCHS
do
+
LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program"
+
+ if [ $NUMARCH -eq 1 ]
+ then
+ mv "$REPOSITORYDIR/arch/$ARCH/$program" "$REPOSITORYDIR/$program";
+ strip "$REPOSITORYDIR/$program";
+ break;
+ else
+ lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program";
+ strip "$REPOSITORYDIR/$program";
+ fi
+
done
- lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program";
-
- strip "$REPOSITORYDIR/$program";
-
done
Modified: hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/libexpat.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -93,7 +93,10 @@
if [ $NUMARCH -eq 1 ]
then
mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba";
- ranlib "$REPOSITORYDIR/$liba";
+ if [[ $liba == *.a ]]
+ then
+ ranlib "$REPOSITORYDIR/$liba";
+ fi
continue
fi
Modified: hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/openexr16.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -19,6 +19,13 @@
# OTHERARGs="";
+
+EXRVER_M="6"
+EXRVER_FULL="$EXRVER_M.0.0"
+
+NATIVE_LIBHALF_DIR="$REPOSITORYDIR/lib"
+
+
# init
let NUMARCH="0"
@@ -34,7 +41,7 @@
g++ -I"$REPOSITORYDIR/include/OpenEXR" "./IlmImf/b44ExpLogTable.cpp" \
- -L"$REPOSITORYDIR/lib" -lHalf\
+ -L"$NATIVE_LIBHALF_DIR" -lHalf\
-o "./IlmImf/b44ExpLogTable-native"
if [ -f "./IlmImf/Makefile.in-original" ]
@@ -49,9 +56,6 @@
# compile
-EXRVER_M="6"
-EXRVER_FULL="$EXRVER_M.0.0"
-
for ARCH in $ARCHS
do
Modified: hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/pano13.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -16,9 +16,7 @@
# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \
# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \
# OTHERARGs="";
-
-
-
+
# init
let NUMARCH="0"
@@ -66,16 +64,16 @@
MACSDKDIR=$x64MACSDKDIR
ARCHARGs="$x64ONLYARG"
fi
-
- env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
- CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
+
+ env CFLAGS="-gfull -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
+ CXXFLAGS="-gfull -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
CPPFLAGS="-I$REPOSITORYDIR/include" \
LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \
NEXT_ROOT="$MACSDKDIR" \
./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
--host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \
- --with-java=$MACSDKDIR/System/Library/Frameworks/JavaVM.framework/Versions/Current \
- --with-zlib=$MACSDKDIR/usr \
+ --without-java \
+ --with-zlib=/usr \
--with-png=$REPOSITORYDIR \
--with-jpeg=$REPOSITORYDIR \
--with-tiff=$REPOSITORYDIR \
Modified: hugin/trunk/mac/ExternalPrograms/scripts/static/boost.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/static/boost.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/static/boost.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -19,11 +19,12 @@
# OTHERARGs="";
-BOOST_VER="1_35"
+BOOST_VER="1_36"
+BOOST_THREAD_LIB="libboost_thread-xgcc40-mt"
-
# install headers
+mkdir -p "$REPOSITORYDIR/include"
rm -rf "$REPOSITORYDIR/include/boost";
cp -R "./boost" "$REPOSITORYDIR/include/";
@@ -72,7 +73,7 @@
elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ]
then
MACSDKDIR=$ppc64MACSDKDIR
- OSVERSION=$ppcOSVERSION
+ OSVERSION=$ppc64OSVERSION
OPTIMIZE=$ppc64OPTIMIZE
boostARCHITECTURE="power"
boostADDRESSMODEL="64"
@@ -85,13 +86,15 @@
boostADDRESSMODEL="64"
fi
+ SDKVRSION=$(echo $MACSDKDIR | sed 's/^[^1]*\([[:digit:]]*\.[[:digit:]]*\).*/\1/')
- echo "WARNING: assumes the SDK version matches the macosx-version-min"
# hack that sends extra arguments to g++
$BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR --toolset="darwin" -n stage \
- --with-thread variant=release link=static \
- architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" macosx-version="$OSVERSION" \
+ --with-thread \
+ variant=release link=static \
+ architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \
+ macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \
| grep "^ " | sed 's/"//g' | sed s/g++/g++\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \
| while read COMMAND
do
@@ -103,7 +106,7 @@
# merge libboost_thread
-for libname in "libboost_thread-mt-$BOOST_VER"
+for libname in "$BOOST_THREAD_LIB-$BOOST_VER"
do
LIPOARGs=""
@@ -131,8 +134,8 @@
done
-if [ -f "$REPOSITORYDIR/lib/libboost_thread-mt-$BOOST_VER.a" ]
+if [ -f "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.a" ]
then
- ln -sfn libboost_thread-mt-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread-mt.a;
+ ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread.a;
fi
Modified: hugin/trunk/mac/ExternalPrograms/scripts/static/wxmac28.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/static/wxmac28.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/static/wxmac28.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -87,15 +87,14 @@
--disable-shared --disable-debug;
- # disabled for all targets for now.
-# # disable core graphics implementation for 10.3
-# if [[ $TARGET == *darwin7 ]]
-# then
+# disable core graphics implementation for 10.3
+if [[ $TARGET == *darwin7 ]]
+then
echo '#ifndef wxMAC_USE_CORE_GRAPHICS' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
echo ' #define wxMAC_USE_CORE_GRAPHICS 0' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
echo '#endif' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
echo '' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
-# fi
+fi
make clean;
Modified: hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh
===================================================================
--- hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/ExternalPrograms/scripts/wxmac28.sh 2008-07-31 14:04:34 UTC (rev 3252)
@@ -78,6 +78,7 @@
OSVERSION=$ppcOSVERSION
fi
+ ARCHARGs=$(echo $ARCHARGs | sed 's/-ftree-vectorize//')
env CFLAGS="-arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
CXXFLAGS="-arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
@@ -89,15 +90,14 @@
--enable-shared --disable-debug;
- # disabled for all targets for now.
-# # disable core graphics implementation for 10.3
-# if [[ $TARGET == *darwin7 ]]
-# then
-# echo '#ifndef wxMAC_USE_CORE_GRAPHICS' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
-# echo ' #define wxMAC_USE_CORE_GRAPHICS 0' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
-# echo '#endif' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
-# echo '' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
-# fi
+# disable core graphics implementation for 10.3
+if [[ $TARGET == *darwin7 ]]
+then
+ echo '#ifndef wxMAC_USE_CORE_GRAPHICS' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
+ echo ' #define wxMAC_USE_CORE_GRAPHICS 0' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
+ echo '#endif' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
+ echo '' >> lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h
+fi
make clean;
Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-07-30 03:18:31 UTC (rev 3251)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2008-07-31 14:04:34 UTC (rev 3252)
@@ -254,9 +254,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.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 */; };
+ 57565A650D088DAD00344F55 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+ 57565A660D088DAD00344F55 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+ 57565A740D088EA600344F55 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.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 */; };
@@ -325,7 +325,7 @@
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 */; };
+ 576900FC0D24D3DC00A6AD01 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
576900FD0D24D3DC00A6AD01 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
576900FE0D24D3DC00A6AD01 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
576900FF0D24D3DC00A6AD01 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
@@ -457,7 +457,7 @@
5769017F0D24D3F200A6AD01 /* MultiThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F72A0C301FC100736343 /* MultiThreadOperations.cpp */; };
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 */; };
+ 576901830D24D3F200A6AD01 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
576901840D24D3F200A6AD01 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
576901850D24D3F200A6AD01 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
576901860D24D3F200A6AD01 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
@@ -479,7 +479,7 @@
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 */; };
+ 576901E40D24D8CF00A6AD01 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.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 */; };
@@ -501,7 +501,7 @@
5769F61A0D23825700A6AD01 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
5769F61B0D23825700A6AD01 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
5769F61C0D23825700A6AD01 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
- 5769F62A0D23825700A6AD01 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; };
+ 5769F62A0D23825700A6AD01 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
5769F6370D2383A600A6AD01 /* hugin_stitch_project.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 575670980D089B1F00344F55 /* hugin_stitch_project.cpp */; };
5769F7A30D239D6A00A6AD01 /* enfuse in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F79E0D239D6A00A6AD01 /* enfuse */; };
5769F7A40D239D6A00A6AD01 /* PTblender in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F79F0D239D6A00A6AD01 /* PTblender */; };
@@ -675,7 +675,7 @@
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 */; };
+ 57AC37450D2BE6A00086D348 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
57B88E5F0C36CD7E00EC6519 /* Panorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */; };
57C313C00C37E04500E00EDC /* PTScriptParsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */; };
57C4868E0C31299E002D79F1 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; };
@@ -701,7 +701,7 @@
57D382DF0E2369FC00445A37 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
57D382E00E2369FC00445A37 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
57D382E10E2369FC00445A37 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
- 57D382E20E2369FC00445A37 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; };
+ 57D382E20E2369FC00445A37 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
57D382E30E2369FC00445A37 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
57D382F30E236A0800445A37 /* APImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE560D8D491B002BF5FF /* APImage.cpp */; };
57D382F40E236A0800445A37 /* Descriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE790D8D491B002BF5FF /* Descriptor.cpp */; };
@@ -792,7 +792,7 @@
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 */; };
+ 57FEE0F80D28835400DAF7A4 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
57FEE0F90D28835400DAF7A4 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
57FEE0FA0D28835400DAF7A4 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
57FEE0FB0D28835400DAF7A4 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
@@ -823,7 +823,7 @@
7332AEC40D8D4C45002BF5FF /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; };
73BDB8950DA552EF00027833 /* matchpoint-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */; };
73C958FA0DA2C9DB00E19110 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
- 73C958FB0DA2C9DB00E19110 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; };
+ 73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
73C958FE0DA2C9DB00E19110 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
73C958FF0DA2C9DB00E19110 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
@@ -848,7 +848,7 @@
73E79F100D674EAC00C07126 /* align_image_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5769F83B0D23A98400A6AD01 /* align_image_stack.cpp */; };
73E79F120D674EAC00C07126 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
73E79F130D674EAC00C07126 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
- 73E79F140D674EAC00C07126 /* libboost_thread-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */; };
+ 73E79F140D674EAC00C07126 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
73E79F150D674EAC00C07126 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
73E79F160D674EAC00C07126 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
73E79F170D674EAC00C07126 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
@@ -1620,6 +1620,10 @@
57454C35094E501800E6B672 /* wx-2.8 */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = folder; path = "wx-2.8"; sourceTree = "<group>"; };
5749F8A3067B60CA00A6EDD4 /* libhugin_jhead.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_jhead.a; sourceTree = BUILT_PRODUCTS_DIR; };
5749FA9B067B80F000A6EDD4 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = "<group>"; };
+ 574B81B40E41996700644179 /* LICENCE_JHEAD */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENCE_JHEAD; sourceTree = "<group>"; };
+ 574B81B50E41996700644179 /* LICENCE_VIGRA */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENCE_VIGRA; sourceTree = "<group>"; };
+ 574B81B60E41997700644179 /* README_JP */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README_JP; sourceTree = "<group>"; };
+ 574B81B90E41999300644179 /* platforms */ = {isa = PBXFileReference; lastKnownFileType = folder; path = platforms; sourceTree = "<group>"; };
57525A250C54BC4400BF8096 /* Nona.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nona.app; sourceTree = BUILT_PRODUCTS_DIR; };
57565A3F0D088CFD00344F55 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; };
57565A400D088CFD00344F55 /* ImageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageCache.h; sourceTree = "<group>"; };
@@ -1635,7 +1639,7 @@
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.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_thread-mt.dylib"; path = "lib/libboost_thread-mt.dylib"; sourceTree = "<group>"; };
+ 57565A640D088DAD00344F55 /* libboost_thread.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_thread.dylib; path = lib/libboost_thread.dylib; 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>"; };
@@ -1813,12 +1817,12 @@
57D14A4506B8A3D100D8A03D /* libjpeg.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.dylib; path = lib/libjpeg.dylib; sourceTree = "<group>"; };
57D18D8E0E13BD340054A523 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
57D18D8F0E13BD340054A523 /* SVN-rev.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "SVN-rev.xcconfig"; sourceTree = "<group>"; };
- 57D382EB0E2369FC00445A37 /* nona */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = "<group>"; };
- 57D3830D0E236A0800445A37 /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = "<group>"; };
+ 57D382EB0E2369FC00445A37 /* nona */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = BUILT_PRODUCTS_DIR; };
+ 57D3830D0E236A0800445A37 /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; };
57D475B60D3CE0AB003CF158 /* translations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = translations; sourceTree = "<group>"; };
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 /* BuildConfig.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BuildConfig.xcconfig; sourceTree = "<group>"; };
+ 57E122010D2BDBF300743A93 /* BuildConfig.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BuildConfig.xcconfig; sourceTree = SOURCE_ROOT; };
57E122480D2BE45700743A93 /* hugin_version.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = hugin_version.h; sourceTree = "<group>"; };
57E122580D2BE4E900743A93 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; };
57E32FAF0C4A87F1006AA781 /* ImageGraph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageGraph.h; sourceTree = "<group>"; };
@@ -1960,7 +1964,6 @@
57EA97D80C3A940500E4965E /* RotatePanorama.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RotatePanorama.h; path = algorithms/basic/RotatePanorama.h; sourceTree = "<group>"; };
57F7B2150C521B7C00E0C537 /* hugin1.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin1.pch; sourceTree = "<group>"; };
57FD3E5E06E98ED50070426B /* pano13 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = pano13; sourceTree = "<group>"; };
- 731ADE960D66E1AB004161DF /* autopano-sift-c */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "autopano-sift-c"; path = "bin/autopano-sift-c"; sourceTree = "<group>"; };
7332AE560D8D491B002BF5FF /* APImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = APImage.cpp; sourceTree = "<group>"; };
7332AE570D8D491B002BF5FF /* APImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = APImage.h; sourceTree = "<group>"; };
7332AE590D8D491B002BF5FF /* cmake_install.cmake */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cmake_install.cmake; sourceTree = "<group>"; };
@@ -2009,10 +2012,7 @@
7332AE8E0D8D491C002BF5FF /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
7332AE8F0D8D491C002BF5FF /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
7332AEAE0D8D4986002BF5FF /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; };
- 736B5B9F0D8074DD00638B14 /* panomatic */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = panomatic; path = bin/panomatic; sourceTree = "<group>"; };
736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; };
- 737ECC720DA56633003BC9F5 /* generatekeys */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = generatekeys; path = bin/generatekeys; sourceTree = "<group>"; };
- 737ECC800DA56F5D003BC9F5 /* autopano */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = autopano; path = bin/autopano; sourceTree = "<group>"; };
73BDB8900DA552D500027833 /* matchpoint-complete-mac.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "matchpoint-complete-mac.sh"; sourceTree = "<group>"; };
73C959140DA2C9DB00E19110 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; };
73E79F300D674EAC00C07126 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2067,7 +2067,7 @@
57525A4D0C54BCEA00BF8096 /* libIlmThread.dylib in Frameworks */,
57525A4E0C54BCEA00BF8096 /* libImath.dylib in Frameworks */,
57525A4F0C54BCEA00BF8096 /* libHalf.dylib in Frameworks */,
- 57565A660D088DAD00344F55 /* libboost_thread-mt.dylib in Frameworks */,
+ 57565A660D088DAD00344F55 /* libboost_thread.dylib in Frameworks */,
5710466C0D25F577006A3C69 /* HuginVigraImpex.framework in Frameworks */,
5710466D0D25F577006A3C69 /* HuginBase.framework in Frameworks */,
5710466E0D25F577006A3C69 /* HuginBaseWx.framework in Frameworks */,
@@ -2080,7 +2080,7 @@
buildActionMask = 2147483647;
files = (
576482AA0C469052003AFC2F /* libz.dylib in Frameworks */,
- 57FEE0F80D28835400DAF7A4 /* libboost_thread-mt.dylib in Frameworks */,
+ 57FEE0F80D28835400DAF7A4 /* libboost_thread.dylib in Frameworks */,
57FEE0F90D28835400DAF7A4 /* libpano13.dylib in Frameworks */,
57FEE0FA0D28835400DAF7A4 /* libpng.dylib in Frameworks */,
57FEE0FB0D28835400DAF7A4 /* libtiff.dylib in Frameworks */,
@@ -2136,7 +2136,7 @@
576901A70D24D56700A6AD01 /* HuginVigraImpex.framework in Frameworks */,
576901810D24D3F200A6AD01 /* libhugin_levmar.a in Frameworks */,
576901820D24D3F200A6AD01 /* libpano13.dylib in Frameworks */,
- 576901830D24D3F200A6AD01 /* libboost_thread-mt.dylib in Frameworks */,
+ 576901830D24D3F200A6AD01 /* libboost_thread.dylib in Frameworks */,
576901840D24D3F200A6AD01 /* libpng.dylib in Frameworks */,
576901850D24D3F200A6AD01 /* libtiff.dylib in Frameworks */,
576901860D24D3F200A6AD01 /* libjpeg.dylib in Frameworks */,
@@ -2160,7 +2160,7 @@
576901AA0D24D57600A6AD01 /* HuginVigraImpex.framework in Frameworks */,
576900FA0D24D3DC00A6AD01 /* Carbon.framework in Frameworks */,
576900FB0D24D3DC00A6AD01 /* libpano13.dylib in Frameworks */,
- 576900FC0D24D3DC00A6AD01 /* libboost_thread-mt.dylib in Frameworks */,
+ 576900FC0D24D3DC00A6AD01 /* libboost_thread.dylib in Frameworks */,
576900FD0D24D3DC00A6AD01 /* libpng.dylib in Frameworks */,
576900FE0D24D3DC00A6AD01 /* libtiff.dylib in Frameworks */,
576900FF0D24D3DC00A6AD01 /* libjpeg.dylib in Frameworks */,
@@ -2194,7 +2194,7 @@
5769F61A0D23825700A6AD01 /* libIlmThread.dylib in Frameworks */,
5769F61B0D23825700A6AD01 /* libImath.dylib in Frameworks */,
5769F61C0D23825700A6AD01 /* libHalf.dylib in Frameworks */,
- 5769F62A0D23825700A6AD01 /* libboost_thread-mt.dylib in Frameworks */,
+ 5769F62A0D23825700A6AD01 /* libboost_thread.dylib in Frameworks */,
5731C4E20D55380B00605D22 /* libexpat.dylib in Frameworks */,
576901CA0D24D81000A6AD01 /* HuginVigraImpex.framework in Frameworks */,
576901CB0D24D81000A6AD01 /* HuginBase.framework in Frameworks */,
@@ -2216,7 +2216,7 @@
5769F8610D23AA5D00A6AD01 /* libImath.dylib in Frameworks */,
5769F8620D23AA5D00A6AD01 /* libHalf.dylib in Frameworks */,
5769F8630D23AA5D00A6AD01 /* libpano13.dylib in Frameworks */,
- 576901E40D24D8CF00A6AD01 /* libboost_thread-mt.dylib in Frameworks */,
+ 576901E40D24D8CF00A6AD01 /* libboost_thread.dylib in Frameworks */,
5731C4D40D5537BE00605D22 /* libexpat.dylib in Frameworks */,
576901DB0D24D89A00A6AD01 /* HuginVigraImpex.framework in Frameworks */,
576901DC0D24D89A00A6AD01 /* HuginBase.framework in Frameworks */,
@@ -2252,7 +2252,7 @@
5796FA880C4395CC006B7C6E /* libImath.dylib in Frameworks */,
5796FA890C4395CC006B7C6E /* libHalf.dylib in Frameworks */,
5796FA8A0C4395CC006B7C6E /* libpano13.dylib in Frameworks */,
- 57565A740D088EA600344F55 /* libboost_thread-mt.dylib in Frameworks */,
+ 57565A740D088EA600344F55 /* libboost_thread.dylib in Frameworks */,
5731C4D00D5537A600605D22 /* libexpat.dylib in Frameworks */,
576901D70D24D88E00A6AD01 /* HuginVigraImpex.framework in Frameworks */,
576901D80D24D88E00A6AD01 /* HuginBase.framework in Frameworks */,
@@ -2273,7 +2273,7 @@
57D382DF0E2369FC00445A37 /* libImath.dylib in Frameworks */,
57D382E00E2369FC00445A37 /* libHalf.dylib in Frameworks */,
57D382E10E2369FC00445A37 /* libpano13.dylib in Frameworks */,
- 57D382E20E2369FC00445A37 /* libboost_thread-mt.dylib in Frameworks */,
+ 57D382E20E2369FC00445A37 /* libboost_thread.dylib in Frameworks */,
57D382E30E2369FC00445A37 /* libexpat.dylib in Frameworks */,
57D383230E236B1D00445A37 /* libhugin_jhead.a in Frameworks */,
57D383240E236B1D00445A37 /* libhugin_vigra_impex.a in Frameworks */,
@@ -2322,7 +2322,7 @@
files = (
57AC372B0D2BE6340086D348 /* libz.dylib in Frameworks */,
5731CA900D56057A00605D22 /* libiconv.dylib in Frameworks */,
- 57AC37450D2BE6A00086D348 /* libboost_thread-mt.dylib in Frameworks */,
+ 57AC37450D2BE6A00086D348 /* libboost_thread.dylib in Frameworks */,
57AC372C0D2BE6340086D348 /* libpng.dylib in Frameworks */,
57AC372D0D2BE6340086D348 /* libtiff.dylib in Frameworks */,
57AC372E0D2BE6340086D348 /* libjpeg.dylib in Frameworks */,
@@ -2367,7 +2367,7 @@
57E346EC0C4A8AC2006AA781 /* libIlmThread.dylib in Frameworks */,
57E346ED0C4A8AC2006AA781 /* libImath.dylib in Frameworks */,
57E346EE0C4A8AC2006AA781 /* libHalf.dylib in Frameworks */,
- 57565A650D088DAD00344F55 /* libboost_thread-mt.dylib in Frameworks */,
+ 57565A650D088DAD00344F55 /* libboost_thread.dylib in Frameworks */,
5731C4DD0D5537EA00605D22 /* libexpat.dylib in Frameworks */,
576901EB0D24D95100A6AD01 /* HuginVigraImpex.framework in Frameworks */,
576901EC0D24D95100A6AD01 /* HuginBase.framework in Frameworks */,
@@ -2404,7 +2404,7 @@
73C9592A0DA2CB7400E19110 /* libiconv.dylib in Frameworks */,
73C959390DA2CCA100E19110 /* libpano13.dylib in Frameworks */,
73C9591F0DA2CAF600E19110 /* libhugin_levmar.a in Frameworks */,
- 73C958FB0DA2C9DB00E19110 /* libboost_thread-mt.dylib in Frameworks */,
+ 73C958FB0DA2C9DB00E19110 /* libboost_thread.dylib in Frameworks */,
73C958FD0DA2C9DB00E19110 /* libpng.dylib in Frameworks */,
73C958FE0DA2C9DB00E19110 /* libtiff.dylib in Frameworks */,
73C9593D0DA2CCE000E19110 /* libHalf.dylib in Frameworks */,
@@ -2429,7 +2429,7 @@
files = (
73E79F120D674EAC00C07126 /* libz.dylib in Frameworks */,
73E79F130D674EAC00C07126 /* libiconv.dylib in Frameworks */,
- 73E79F140D674EAC00C07126 /* libboost_thread-mt.dylib in Frameworks */,
+ 73E79F140D674EAC00C07126 /* libboost_thread.dylib in Frameworks */,
73E79F150D674EAC00C07126 /* libpng.dylib in Frameworks */,
73E79F160D674EAC00C07126 /* libtiff.dylib in Frameworks */,
73E79F170D674EAC00C07126 /* libjpeg.dylib in Frameworks */,
@@ -2484,7 +2484,7 @@
576900AB0D24D29300A6AD01 /* hugin_base-Info.plist */,
576900E20D24D32C00A6AD01 /* base_wx-Info.plist */,
);
- name = mac;
+ path = mac;
sourceTree = "<group>";
};
57114EC106BC2301004F4FA7 /* foreign */ = {
@@ -2702,7 +2702,6 @@
573B9041067BAEA700B7B355 /* tools-dynamic */,
57D18D880E13BC8A0054A523 /* tools-static */,
57BB2817068114B2006EDB38 /* Mac OS X */,
- 57525A1E0C54BBF600BF8096 /* test */,
);
name = Product;
sourceTree = BUILT_PRODUCTS_DIR;
@@ -2746,7 +2745,7 @@
57115FB60B7778FE00B522DF /* scripts */,
);
path = ExternalPrograms;
- sourceTree = "<group>";
+ sourceTree = SOURCE_ROOT;
};
573E2E5E0B76AD0100E86281 /* Documents */ = {
isa = PBXGroup;
@@ -2770,18 +2769,14 @@
5745FBE5094E1C4700E6B672 /* repository */ = {
isa = PBXGroup;
children = (
- 737ECC800DA56F5D003BC9F5 /* autopano */,
570898E30D4CB635008949E7 /* gnumake */,
5769F7A10D239D6A00A6AD01 /* PTmender */,
5769F79F0D239D6A00A6AD01 /* PTblender */,
- 737ECC720DA56633003BC9F5 /* generatekeys */,
- 731ADE960D66E1AB004161DF /* autopano-sift-c */,
5769F7A00D239D6A00A6AD01 /* PTmasker */,
- 736B5B9F0D8074DD00638B14 /* panomatic */,
5769F7A20D239D6A00A6AD01 /* PTroller */,
570D581A082A9ED50030E768 /* enblend */,
5769F79E0D239D6A00A6AD01 /* enfuse */,
- 57565A640D088DAD00344F55 /* libboost_thread-mt.dylib */,
+ 57565A640D088DAD00344F55 /* libboost_thread.dylib */,
573B8F85067BAAB900B7B355 /* libpano13.dylib */,
577092FA06BD7388004058A1 /* libpng.dylib */,
577092FB06BD7388004058A1 /* libtiff.dylib */,
@@ -2835,20 +2830,32 @@
path = /;
sourceTree = "<absolute>";
};
- 5751D8600939F1C0001477EA /* Hugin.xcodeproj */ = {
+ 574B81880E4198FE00644179 /* hugin */ = {
isa = PBXGroup;
children = (
- 578414E10C313E7500546EAD /* project.pbxproj */,
+ 579D36060C0EFD4D00BFC58C /* src */,
+ 57114E9E06BC2301004F4FA7 /* mac */,
+ 57CCCC29086C957E000EBC4A /* AUTHORS */,
+ 57CCCC39086C957E000EBC4A /* COPYING */,
+ 57CCCC3C086C957E000EBC4A /* LICENCE */,
+ 574B81B40E41996700644179 /* LICENCE_JHEAD */,
+ 574B81B50E41996700644179 /* LICENCE_VIGRA */,
+ 57CCCC4E086C957E000EBC4A /* README */,
+ 574B81B60E41997700644179 /* README_JP */,
+ 574B81B90E41999300644179 /* platforms */,
+ 57CCCC5C086C9651000EBC4A /* utils */,
);
- name = Hugin.xcodeproj;
- sourceTree = "<group>";
+ name = hugin;
+ path = ..;
+ sourceTree = SOURCE_ROOT;
};
- 57525A1E0C54BBF600BF8096 /* test */ = {
+ 5751D8600939F1C0001477EA /* Hugin.xcodeproj */ = {
isa = PBXGroup;
children = (
+ 578414E10C313E7500546EAD /* project.pbxproj */,
);
- name = test;
- sourceTree = "<group>";
+ name = Hugin.xcodeproj;
+ sourceTree = SOURCE_ROOT;
};
57565A3D0D088CFD00344F55 /* base_wx */ = {
isa = PBXGroup;
@@ -3143,8 +3150,7 @@
7332AE550D8D491B002BF5FF /* matchpoint */,
57D475B60D3CE0AB003CF158 /* translations */,
);
- name = src;
- path = ../src;
+ path = src;
sourceTree = "<group>";
};
57B88E610C36CD8F00EC6519 /* photometric */ = {
@@ -3165,19 +3171,6 @@
name = "Mac OS X";
sourceTree = "<group>";
};
- 57CCCC23086C9530000EBC4A /* attached */ = {
- isa = PBXGroup;
- children = (
- 57CCCC5C086C9651000EBC4A /* utils */,
- 57CCCC29086C957E000EBC4A /* AUTHORS */,
- 57CCCC39086C957E000EBC4A /* COPYING */,
- 57CCCC3C086C957E000EBC4A /* LICENCE */,
- 57CCCC4E086C957E000EBC4A /* README */,
- );
- name = attached;
- path = ..;
- sourceTree = SOURCE_ROOT;
- };
57D18D880E13BC8A0054A523 /* tools-static */ = {
isa = PBXGroup;
children = (
@@ -3470,10 +3463,8 @@
isa = PBXGroup;
children = (
57E34AC90C4ACE1C006AA781 /* math.h */,
- 579D36060C0EFD4D00BFC58C /* src */,
- 57114E9E06BC2301004F4FA7 /* mac */,
+ 574B81880E4198FE00644179 /* hugin */,
5745FC05094E1D5400E6B672 /* External */,
- 57CCCC23086C9530000EBC4A /* attached */,
573B8F3E067BA2EB00B7B355 /* Product */,
);
sourceTree = "<group>";
@@ -4702,7 +4693,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi";
};
5710465D0D25F490006A3C69 /* Complete Embedding */ = {
isa = PBXShellScriptBuildPhase;
@@ -4716,7 +4707,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-embed.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-embed.sh\nfi";
};
571046750D25F5C5006A3C69 /* Complete Bundle */ = {
isa = PBXShellScriptBuildPhase;
@@ -4730,7 +4721,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi";
};
571D8AC70E212172006D0305 /* Locale Script */ = {
isa = PBXShellScriptBuildPhase;
@@ -4744,7 +4735,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./localised.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/localised.sh\nfi";
};
571D8C740E2132DE006D0305 /* Patch XRC */ = {
isa = PBXShellScriptBuildPhase;
@@ -4758,7 +4749,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./patch-xrc.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/patch-xrc.sh\nfi";
};
571D8C8E0E213833006D0305 /* Localise Help */ = {
isa = PBXShellScriptBuildPhase;
@@ -4772,7 +4763,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./localise-help.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/localise-help.sh\nfi";
};
576902030D24DA9500A6AD01 /* Complete Bundle */ = {
isa = PBXShellScriptBuildPhase;
@@ -4786,7 +4777,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./complete-bundle.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi";
};
579374850D47E7E500A52730 /* Copy ExifTool */ = {
isa = PBXShellScriptBuildPhase;
@@ -4800,7 +4791,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./copyExifTool.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/copyExifTool.sh\nfi";
};
57C4863E0C3122C4002D79F1 /* copy hugin_config.h */ = {
isa = PBXShellScriptBuildPhase;
@@ -4830,7 +4821,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"./SVN-rev.xcconfig\"\n\nif [ $(svnversion -n \"../\") = \"exported\" ]\nthen\n echo \"\" > \"./SVN-rev.xcconfig\"\nelse\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"./SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"./SVN-rev.xcconfig\"\nfi";
+ shellScript = "rm -f \"../mac/SVN-rev.xcconfig\"\n\nif [ $(svnversion -n \"../\") = \"exported\" ]\nthen\n echo \"\" > \"../mac/SVN-rev.xcconfig\"\nelse\n echo 'HUGIN_WC_REVISION = '$(svnversion -n \"../\" | grep -o '^[0-9]*') > \"../mac/SVN-rev.xcconfig\"\n echo 'HUGIN_PRERELEASE_VERSION_TAG = -svn'$(svnversion -n \"../\") >> \"../mac/SVN-rev.xcconfig\"\nfi";
};
57E122110D2BDDBE00743A93 /* configure hugin_version.h */ = {
isa = PBXShellScriptBuildPhase;
@@ -4860,7 +4851,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ $ACTION = \"build\" ]\nthen\n ./localised.sh\nfi";
+ shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/localised.sh\nfi";
};
/* End PBXShellScriptBuildPhase section */
@@ -5878,6 +5869,7 @@
GCC_DEBUGGING_SYMBOLS = full;
GCC_ENABLE_PASCAL_STRINGS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -5885,6 +5877,7 @@
"$(DEBUG_MACRO)",
"$(PRECOMP_MACRO)",
);
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
/usr/include,
/Developer/Headers/FlatCarbon,
@@ -5928,6 +5921,7 @@
GCC_DEBUGGING_SYMBOLS = full;
GCC_ENABLE_PASCAL_STRINGS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = 2;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -5935,6 +5929,7 @@
"$(DEBUG_MACRO)",
"$(PRECOMP_MACRO)",
);
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
/usr/include,
/Developer/Headers/FlatCarbon,
@@ -5982,7 +5977,7 @@
"$(WX_INCLUDE_DIR_LIB)",
"$(inherited)",
);
- INFOPLIST_FILE = "nona_gui-Info.plist";
+ INFOPLIST_FILE = "../mac/nona_gui-Info.plist";
INSTALL_PATH = /Applications;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6018,7 +6013,7 @@
"$(WX_INCLUDE_DIR_LIB)",
"$(inherited)",
);
- INFOPLIST_FILE = "nona_gui-Info.plist";
+ INFOPLIST_FILE = "../mac/nona_gui-Info.plist";
INSTALL_PATH = /Applications;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6054,7 +6049,7 @@
"$(WX_INCLUDE_DIR_LIB)",
"$(inherited)",
);
- INFOPLIST_FILE = "nona_gui-Info.plist";
+ INFOPLIST_FILE = "../mac/nona_gui-Info.plist";
INSTALL_PATH = /Applications;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6090,7 +6085,7 @@
"$(WX_INCLUDE_DIR_LIB)",
"$(inherited)",
);
- INFOPLIST_FILE = "nona_gui-Info.plist";
+ INFOPLIST_FILE = "../mac/nona_gui-Info.plist";
INSTALL_PATH = /Applications;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6361,7 +6356,7 @@
../src/hugin_base,
"$(inherited)",
);
- INFOPLIST_FILE = "hugin_base-Info.plist";
+ INFOPLIST_FILE = "../mac/hugin_base-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6381,7 +6376,7 @@
../src/hugin_base,
"$(inherited)",
);
- INFOPLIST_FILE = "hugin_base-Info.plist";
+ INFOPLIST_FILE = "../mac/hugin_base-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6401,7 +6396,7 @@
../src/hugin_base,
"$(inherited)",
);
- INFOPLIST_FILE = "hugin_base-Info.plist";
+ INFOPLIST_FILE = "../mac/hugin_base-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6422,7 +6417,7 @@
../src/hugin_base,
"$(inherited)",
);
- INFOPLIST_FILE = "hugin_base-Info.plist";
+ INFOPLIST_FILE = "../mac/hugin_base-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6457,7 +6452,7 @@
"$(WX_INCLUDE_DIR_LIB)",
"$(inherited)",
);
- INFOPLIST_FILE = "base_wx-Info.plist";
+ INFOPLIST_FILE = "../mac/base_wx-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6490,7 +6485,7 @@
"$(WX_INCLUDE_DIR_LIB)",
"$(inherited)",
);
- INFOPLIST_FILE = "base_wx-Info.plist";
+ INFOPLIST_FILE = "../mac/base_wx-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -6523,7 +6518,7 @@
"$(WX_INCLUDE_D...
[truncated message content] |