Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: 2 new changesets
|
From: <hug...@li...> - 2010-09-02 17:25:29
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b41086a6c6b0 changeset: 4287:b41086a6c6b0 user: tmodes date: Thu Sep 02 19:24:05 2010 +0200 description: Modified PTBatcherGUI menu for more clarity details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d2cef3abb956 changeset: 4288:d2cef3abb956 user: tmodes date: Thu Sep 02 19:24:54 2010 +0200 description: Removed now obsolete files diffstat: .hgignore | 3 + CMakeLists.txt | 11 +- TODO | 34 +- mac/ExternalPrograms/readme.txt | 68 +- mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt | 50 - mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt.org | 66 + mac/ExternalPrograms/scripts/SetEnv-leopard.txt | 66 - mac/ExternalPrograms/scripts/SetEnv-leopard.txt.org | 66 + mac/ExternalPrograms/scripts/SetEnv-universal.txt | 53 - mac/ExternalPrograms/scripts/SetEnv-universal.txt.org | 53 + mac/Hugin.xcodeproj/project.pbxproj | 8 +- mac/patch-xrc.sh | 15 +- src/Doxyfile | 166 +- src/hugin1/CMakeLists.txt | 1 - src/hugin1/base_wx/MyExternalCmdExecDialog.cpp | 7 +- src/hugin1/base_wx/MyExternalCmdExecDialog.h | 2 +- src/hugin1/base_wx/RunStitchPanel.cpp | 138 +- src/hugin1/base_wx/RunStitchPanel.h | 9 +- src/hugin1/base_wx/huginConfig.cpp | 45 - src/hugin1/base_wx/huginConfig.h | 7 +- src/hugin1/hugin/AssistantPanel.cpp | 467 +- src/hugin1/hugin/AssistantPanel.h | 1 - src/hugin1/hugin/AutoCtrlPointCreator.cpp | 1118 ++ src/hugin1/hugin/AutoCtrlPointCreator.h | 193 + src/hugin1/hugin/CMakeLists.txt | 12 +- src/hugin1/hugin/CPDetectorConfig.cpp | 470 + src/hugin1/hugin/CPDetectorConfig.h | 201 + src/hugin1/hugin/CPDetectorConfig_default.h | 97 + src/hugin1/hugin/CPDetectorDialog.cpp | 284 - src/hugin1/hugin/CPDetectorDialog.h | 88 - src/hugin1/hugin/ChoosyRemapper.cpp | 20 +- src/hugin1/hugin/ChoosyRemapper.h | 4 +- src/hugin1/hugin/GLPreviewFrame.cpp | 571 +- src/hugin1/hugin/GLPreviewFrame.h | 154 +- src/hugin1/hugin/GLRenderer.cpp | 399 +- src/hugin1/hugin/GLRenderer.h | 93 +- src/hugin1/hugin/GLViewer.cpp | 250 +- src/hugin1/hugin/GLViewer.h | 105 +- src/hugin1/hugin/GreatCircles.cpp | 255 +- src/hugin1/hugin/GreatCircles.h | 27 +- src/hugin1/hugin/ImagesPanel.cpp | 2 +- src/hugin1/hugin/ImagesPanel.h | 2 +- src/hugin1/hugin/LayoutRemapper.cpp | 16 +- src/hugin1/hugin/LayoutRemapper.h | 4 +- src/hugin1/hugin/LensPanel.cpp | 2 +- src/hugin1/hugin/MainFrame.cpp | 2 +- src/hugin1/hugin/MeshManager.cpp | 291 +- src/hugin1/hugin/MeshManager.h | 186 +- src/hugin1/hugin/MeshRemapper.cpp | 34 +- src/hugin1/hugin/MeshRemapper.h | 10 +- src/hugin1/hugin/OverviewCameraTool.cpp | 186 + src/hugin1/hugin/OverviewCameraTool.h | 92 + src/hugin1/hugin/OverviewDragTool.cpp | 43 + src/hugin1/hugin/OverviewDragTool.h | 28 + src/hugin1/hugin/OverviewOutlinesTool.cpp | 592 + src/hugin1/hugin/OverviewOutlinesTool.h | 149 + src/hugin1/hugin/PreferencesDialog.cpp | 1 - src/hugin1/hugin/PreferencesDialog.h | 2 +- src/hugin1/hugin/PreviewControlPointTool.cpp | 8 +- src/hugin1/hugin/PreviewControlPointTool.h | 6 +- src/hugin1/hugin/PreviewCropTool.cpp | 29 +- src/hugin1/hugin/PreviewCropTool.h | 2 +- src/hugin1/hugin/PreviewDifferenceTool.cpp | 25 +- src/hugin1/hugin/PreviewDifferenceTool.h | 7 +- src/hugin1/hugin/PreviewDragTool.cpp | 349 +- src/hugin1/hugin/PreviewDragTool.h | 31 +- src/hugin1/hugin/PreviewIdentifyTool.cpp | 264 +- src/hugin1/hugin/PreviewIdentifyTool.h | 18 +- src/hugin1/hugin/PreviewLayoutLinesTool.cpp | 57 +- src/hugin1/hugin/PreviewLayoutLinesTool.h | 10 +- src/hugin1/hugin/PreviewPanoMaskTool.h | 2 +- src/hugin1/hugin/PreviewTool.cpp | 34 - src/hugin1/hugin/PreviewTool.h | 104 - src/hugin1/hugin/PreviewToolHelper.cpp | 424 - src/hugin1/hugin/PreviewToolHelper.h | 156 - src/hugin1/hugin/ProjectionGridTool.cpp | 477 + src/hugin1/hugin/ProjectionGridTool.h | 81 + src/hugin1/hugin/TexCoordRemapper.cpp | 34 +- src/hugin1/hugin/TexCoordRemapper.h | 4 +- src/hugin1/hugin/TextureManager.cpp | 11 +- src/hugin1/hugin/TextureManager.h | 2 +- src/hugin1/hugin/Tool.cpp | 48 + src/hugin1/hugin/Tool.h | 156 + src/hugin1/hugin/ToolHelper.cpp | 794 + src/hugin1/hugin/ToolHelper.h | 249 + src/hugin1/hugin/VertexCoordRemapper.cpp | 42 +- src/hugin1/hugin/VertexCoordRemapper.h | 4 +- src/hugin1/hugin/ViewState.cpp | 469 +- src/hugin1/hugin/ViewState.h | 272 +- src/hugin1/hugin/wxPanoCommand.cpp | 4 - src/hugin1/hugin/wxPanoCommand.h | 6 +- src/hugin1/hugin/xrc/assistant_panel.xrc | 26 +- src/hugin1/hugin/xrc/batch_frame.xrc | 177 +- src/hugin1/hugin/xrc/batch_menu.xrc | 6 +- src/hugin1/hugin/xrc/preview_frame.xrc | 34 + src/hugin1/icpfind/AutoCtrlPointCreator.cpp | 1119 -- src/hugin1/icpfind/AutoCtrlPointCreator.h | 169 - src/hugin1/icpfind/CMakeLists.txt | 24 - src/hugin1/icpfind/CPDetectorConfig.cpp | 214 - src/hugin1/icpfind/CPDetectorConfig.h | 146 - src/hugin1/icpfind/CPDetectorConfig_default.h | 97 - src/hugin1/icpfind/icpfind.cpp | 145 - src/hugin1/icpfind/icpfind.h | 36 - src/hugin1/ptbatcher/Batch.cpp | 72 +- src/hugin1/ptbatcher/Batch.h | 5 +- src/hugin1/ptbatcher/BatchFrame.cpp | 99 +- src/hugin1/ptbatcher/BatchFrame.h | 3 +- src/hugin1/ptbatcher/CMakeLists.txt | 105 +- src/hugin1/ptbatcher/FindPanoDialog.cpp | 580 - src/hugin1/ptbatcher/FindPanoDialog.h | 147 - src/hugin1/ptbatcher/PTBatcherGUI.cpp | 180 +- src/hugin1/ptbatcher/PTBatcherGUI.h | 1 + src/hugin1/ptbatcher/ProjectArray.cpp | 4 +- src/hugin1/ptbatcher/ProjectArray.h | 8 +- src/hugin1/ptbatcher/ProjectListBox.cpp | 14 +- src/hugin1/ptbatcher/ProjectListBox.h | 2 - src/hugin1/ptbatcher/RunStitchFrame.cpp | 30 +- src/hugin1/ptbatcher/RunStitchFrame.h | 6 +- src/hugin1/stitch_project/hugin_stitch_project.cpp | 4 +- src/hugin_base/CMakeLists.txt | 10 +- src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp | 147 - src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.h | 138 - src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp | 982 ++ src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h | 145 + src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp | 1027 -- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h | 208 - src/hugin_base/hugin_utils/utils.h | 96 +- src/hugin_base/makefilelib/Anything.h | 66 - src/hugin_base/makefilelib/AutoVariable.cpp | 53 - src/hugin_base/makefilelib/AutoVariable.h | 63 - src/hugin_base/makefilelib/CMakeLists.txt | 49 - src/hugin_base/makefilelib/Comment.cpp | 39 - src/hugin_base/makefilelib/Comment.h | 69 - src/hugin_base/makefilelib/Conditional.cpp | 50 - src/hugin_base/makefilelib/Conditional.h | 140 - src/hugin_base/makefilelib/Doxyfile | 279 - src/hugin_base/makefilelib/Makefile.cpp | 134 - src/hugin_base/makefilelib/Makefile.h | 106 - src/hugin_base/makefilelib/Makefile.mk | 32 - src/hugin_base/makefilelib/MakefileItem.cpp | 49 - src/hugin_base/makefilelib/MakefileItem.h | 96 - src/hugin_base/makefilelib/Manageable.h | 40 - src/hugin_base/makefilelib/Manager.h | 91 - src/hugin_base/makefilelib/Newline.h | 59 - src/hugin_base/makefilelib/README.dox | 56 - src/hugin_base/makefilelib/Rule.cpp | 53 - src/hugin_base/makefilelib/Rule.h | 107 - src/hugin_base/makefilelib/StringAdapter.h | 73 - src/hugin_base/makefilelib/Variable.cpp | 104 - src/hugin_base/makefilelib/Variable.h | 138 - src/hugin_base/makefilelib/VariableDef.cpp | 38 - src/hugin_base/makefilelib/VariableDef.h | 59 - src/hugin_base/makefilelib/VariableRef.cpp | 36 - src/hugin_base/makefilelib/VariableRef.h | 61 - src/hugin_base/makefilelib/char_type.h | 83 - src/hugin_base/makefilelib/example.cpp | 114 - src/hugin_base/makefilelib/test_filenames.cpp | 220 - src/hugin_base/makefilelib/test_makefilelib.cpp | 215 - src/hugin_base/makefilelib/test_simple.cpp | 224 - src/hugin_base/makefilelib/test_util.cpp | 133 - src/hugin_base/makefilelib/test_util.h | 65 - src/hugin_base/makefilelib/test_util_win32.cpp | 164 - src/hugin_base/makefilelib/unicode.cpp | 103 - src/hugin_base/makefilelib/unicode.dox | 26 - src/hugin_base/panodata/PanoramaOptions.cpp | 4 +- src/hugin_base/panodata/SrcPanoImage.h | 6 +- src/tools/CMakeLists.txt | 5 +- src/tools/checkpto.cpp | 85 - src/tools/pano_modify.cpp | 841 +- src/tools/pto2mk.cpp | 11 +- src/translations/bg.po | 1981 ++- src/translations/ca_ES.po | 1998 ++-- src/translations/cs_CZ.po | 3553 +++---- src/translations/de.po | 4813 ++++---- src/translations/en_GB.po | 3411 +++--- src/translations/es.po | 1978 ++- src/translations/fi.po | 3913 +++---- src/translations/fr.po | 1978 ++- src/translations/hu.po | 1978 ++- src/translations/hugin.pot | 3515 +++--- src/translations/it.po | 2017 ++-- src/translations/ja.po | 1979 ++- src/translations/ko.po | 1974 ++- src/translations/nl.po | 4910 +++++---- src/translations/pl.po | 2094 ++-- src/translations/pt_BR.po | 1978 ++- src/translations/ru.po | 1979 ++- src/translations/sk.po | 2052 ++-- src/translations/sl.po | 1980 ++- src/translations/sv.po | 4258 +++---- src/translations/uk.po | 1980 ++- src/translations/zh_CN.po | 3598 ++---- src/translations/zh_TW.po | 1974 ++- 193 files changed, 40852 insertions(+), 43182 deletions(-) diffs (truncated from 151550 to 500 lines): diff -r afcb49d443f0 -r d2cef3abb956 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Thu Sep 02 19:24:54 2010 +0200 @@ -0,0 +1,3 @@ +# ignore editors backup file +glob:*~$ +glob:rev.txt diff -r afcb49d443f0 -r d2cef3abb956 CMakeLists.txt --- a/CMakeLists.txt Wed Sep 01 22:25:49 2010 +0200 +++ b/CMakeLists.txt Thu Sep 02 19:24:54 2010 +0200 @@ -137,8 +137,7 @@ ## # This must come before FINDs for tiff, jpeg, png, zlib to enable # finding the wxWidgets distributions of those packages (Win32 only). - -SET(wxWidgets_USE_LIBS base core xrc html xml adv gl net) +SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net) FIND_PACKAGE(wxWidgets REQUIRED) # hugin requires wxwidgets 2.7.0 or above @@ -232,13 +231,9 @@ set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix}) endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") ENDIF(WIN32) -FIND_PACKAGE(Boost 1.34 COMPONENTS thread regex filesystem iostreams system) +FIND_PACKAGE(Boost COMPONENTS thread) IF (NOT Boost_FOUND) - IF(WIN32) - MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") - ELSE() - MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.34") - ENDIF() + MESSAGE(FATAL_ERROR "boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") ENDIF (NOT Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) diff -r afcb49d443f0 -r d2cef3abb956 TODO --- a/TODO Wed Sep 01 22:25:49 2010 +0200 +++ b/TODO Thu Sep 02 19:24:54 2010 +0200 @@ -1,3 +1,35 @@ [TODO] -- compile a todo list \ No newline at end of file +- compile a todo list + + +Panorama Overview Related TODO list: + + - Check the system in windows and mac (I can only test in windows) + - DragTool: add lines from starting to ending point + - Improve performance of calculating panosphere meshes by using GPU + - Create realtime adjustments for the other viewer when dragging images + - Add a switch for the projection grid or make it automatic for certain tabs. + - The projection grid is not included in the mosaic plane currently because just adding it as a rectilinear projection of the current grid will be ugly and not useful. So first I need to come up with some representation of the grid on the mosaic plane which will be useful. + - The mosaic plane could use some things like: + - rendering of the hypothetical camera positions for each image + - rendering of the panosphere together with the plane to create a sense of what is going on. This also needs some thought + - Dragging in the mosaic plane should support changing of the Z parameter as well + - Test the system with masks for the issues that James pointed out + - Highlighting an image in identify mode also highlights the image in the other viewer. This currently only works when the mouse is over the image buttons + - Improve performance for great circles by using display lists and meshes also for the crosses. Also keep the old method by just using lines, which is useful for the preview + - Check the issue with double difference choices + - Add the interactive circles + - Implement the better handling of image groups + - Bug, sometimes changing the FOV sliders doesn't cause the overview to be redrawn + - Add informative status messages + - Automatic adjustment of the zoom level for the mosaic plane + - The overview window does not process the mouse wheel on windows + + +fixed: + + - Bug (at least in my computer) with wxAUI which causes the program to crash when both canvases are undocked and then docked. + - with preview fixed to the frame this is not a problem anymore + - Toggle buttons to show hide the overview and preview canvases + diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/readme.txt --- a/mac/ExternalPrograms/readme.txt Wed Sep 01 22:25:49 2010 +0200 +++ b/mac/ExternalPrograms/readme.txt Thu Sep 02 19:24:54 2010 +0200 @@ -1,1 +1,67 @@ -External Programs (This is for 10.4 or above) HOWTO: 1. Download the source package of the external programs. You typically want to place it in the "ExternalPrograms" folder. 2. Edit ExternalPrograms/scripts/SetEnv-*.txt file appropriately, especially the myREPOSITORYDIR variable. 3. Open a Terminal window (bash is preferred). 5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b') 4. Set the variables for the compilation. (eg. 'source ../scripts/SetEnv-universal.txt') 6. Using the appropriate shell script, build the source. (eg. 'sh ../scripts/libjpeg.sh') RESULT: The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw). USAGE: When compiling programs from source specifying the above directory as prefix. You probably have to specify the correct SDK (-isysroot) and MacOS target version (-mmacosx-version-min) as well. You can make multiple 'repositories' as well. For example, you can make one for statically and one for dynamically linked product, or ones with different target architecture/OS versions. PROGRAMS: The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. [Dynamic Build for distributable Hugin.app and PTBatcherGUI.app] boost (1.39) libexpat (2.0.1) libjpeg (6b) libpng (1.2.38) libtiff (3.8.2) ilmbase (1.0.1) openexr16 (1.6.1) pano13 (2.9.14) wxmac28 (2.8.10) static/libexiv2 (0.18.2) static/lcms (1.17) static/libxmi (1.2) static/libglew (1.5.1) gnumake (Darwin 9/gnumake-119/make) enblend (3.2) [Static Build for distributable command-line tools] static/boost (1.39) static/libexpat (2.0.1) static/libjpeg (6b) static/libpng (1.2.38) static/libtiff (3.8.2) static/ilmbase (1.0.1) static/openexr16 (1.6.1) static/pano13 (2.9.14) static/wxmac28 (2.8.10) static/libexiv2 (0.18.2) static/lcms (1.17) static/libxmi (1.2) static/libglew (1.5.1) gnumake (Darwin 9 source: gnumake-119/make) enblend31 (3.2) LICENSE: The scripts for compiling universal builds are originally copyrighted by Ippei Ukai (2007-2008), and distributed under the modified BSD license. $Id: howto.txt 1902 2007-02-04 22:27:47Z ippei $ \ No newline at end of file +External Programs +(This is for 10.4 or above) + + +HOWTO: +1. Download the source package of the external programs. You typically want to place it in the "ExternalPrograms" folder. +2. Edit ExternalPrograms/scripts/SetEnv-*.txt.org file appropriately, especially the myREPOSITORYDIR variable and + save it as SetEnv-*.txt. +3. Open a Terminal window (bash is preferred). +5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b') +4. Set the variables for the compilation. (eg. 'source ../scripts/SetEnv-universal.txt') +6. Using the appropriate shell script, build the source. (eg. 'sh ../scripts/libjpeg.sh') + + +RESULT: +The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw). + + +USAGE: +When compiling programs from source specifying the above directory as prefix. You probably have to specify the correct SDK (-isysroot) and MacOS target version (-mmacosx-version-min) as well. +You can make multiple 'repositories' as well. For example, you can make one for statically and one for dynamically linked product, or ones with different target architecture/OS versions. + + +PROGRAMS: +The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. + +[Dynamic Build for distributable Hugin.app and PTBatcherGUI.app] +boost (1.41) +libexpat (2.0.1) +libiconv +gettext (0.17) +libjpeg (8) +libpng (1.2.41) +libtiff (3.8.2) +ilmbase (1.0.1) +openexr16 (1.6.2) +pano13 (2.9.17) +wxmac28 (2.8.11) +libexiv2 (0.19) +lcms (1.17) +libxmi (1.2) +libglew (1.5.1) +gnumake (Darwin 9/gnumake-119/make) +enblend (4.0) + +[Static Build for distributable command-line tools] +static/boost (1.39) +static/libexpat (2.0.1) +static/libjpeg (6b) +static/libpng (1.2.38) +static/libtiff (3.8.2) +static/ilmbase (1.0.1) +static/openexr16 (1.6.1) +static/pano13 (2.9.14) +static/wxmac28 (2.8.10) +static/libexiv2 (0.18.2) +static/lcms (1.17) +static/libxmi (1.2) +static/libglew (1.5.1) +gnumake (Darwin 9 source: gnumake-119/make) +enblend31 (3.2) + +LICENSE: +The scripts for compiling universal builds are originally copyrighted by Ippei Ukai (2007-2008), and distributed under the modified BSD license. + + +$Id: howto.txt 1902 2007-02-04 22:27:47Z ippei diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt --- a/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt Wed Sep 01 22:25:49 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -# Configuration for 4 part universal build, only possible from Leopard -# Copyright (c) 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'); - - -#export \ -# CC="gcc-4.2" \ -# CXX="g++-4.2"; - -mkdir -p $myREPOSITORYDIR; - -export \ - REPOSITORYDIR="$myREPOSITORYDIR" \ - ARCHS="ppc i386" \ - \ - ppcTARGET="powerpc-apple-darwin9" \ - ppcOSVERSION="10.5" \ - ppcMACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - ppcOPTIMIZE="-mtune=G5 -ftree-vectorize" \ - ppcCC="gcc-4.2" \ - ppcCXX="g++-4.2" \ - \ - i386TARGET="i386-apple-darwin9" \ - i386OSVERSION="10.5" \ - i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ - i386CC="gcc-4.2" \ - i386CXX="g++-4.2" \ - \ - OTHERARGs="" \ - OTHERMAKEARGs="--jobs=$PROCESSNUM"; - - -# Deprecated: -export \ - ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ - i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ - -# cmake settings -export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" -export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" - -# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt.org --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt.org Thu Sep 02 19:24:54 2010 +0200 @@ -0,0 +1,66 @@ +# Configuration for 4 part universal build, only possible from Leopard +# Copyright (c) 2008, Ippei Ukai + + +# has to be the absolute path from / +myREPOSITORYDIR="/Users/Shared/development/hugin_related/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'); + + +#export \ +# CC="gcc-4.2" \ +# CXX="g++-4.2"; + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="ppc i386 ppc64 x86_64" \ + \ + ppcTARGET="powerpc-apple-darwin9" \ + ppcOSVERSION="10.5" \ + ppcMACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ + ppcCC="gcc-4.2" \ + ppcCXX="g++-4.2" \ + \ + i386TARGET="i386-apple-darwin9" \ + i386OSVERSION="10.5" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ + i386CC="gcc-4.2" \ + i386CXX="g++-4.2" \ + \ + ppc64TARGET="powerpc64-apple-darwin9" \ + ppc64OSVERSION="10.5" \ + ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppc64OPTIMIZE="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ + ppc64CC="gcc-4.2" \ + ppc64CXX="g++-4.2" \ + \ + x64TARGET="x86_64-apple-darwin9" \ + x64OSVERSION="10.5" \ + x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ + x64CC="gcc-4.2" \ + x64CXX="g++-4.2" \ + \ + OTHERARGs="" \ + OTHERMAKEARGs="--jobs=$PROCESSNUM"; + + +# Deprecated: +export \ + ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ + ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ + x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; + +# cmake settings +export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" +export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" + +# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard.txt --- a/mac/ExternalPrograms/scripts/SetEnv-leopard.txt Wed Sep 01 22:25:49 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -# Configuration for 4 part universal build, only possible from Leopard -# Copyright (c) 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 -if [ $(uname -p) = i386 ] ; then - PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); -else - PROCESSNUM="1" -fi - -mkdir -p $myREPOSITORYDIR; - -export \ - REPOSITORYDIR="$myREPOSITORYDIR" \ - ARCHS="ppc i386 ppc64 x86_64" \ - \ - ppcTARGET="powerpc-apple-darwin8" \ - ppcOSVERSION="10.4" \ - ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ - ppcCC="gcc-4.0" \ - ppcCXX="g++-4.0" \ - \ - i386TARGET="i386-apple-darwin8" \ - i386OSVERSION="10.4" \ - i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ - i386CC="gcc-4.0" \ - i386CXX="g++-4.0" \ - \ - ppc64TARGET="powerpc64-apple-darwin9" \ - ppc64OSVERSION="10.5" \ - ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - ppc64OPTIMIZE="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ - ppc64CC="gcc-4.2" \ - ppc64CXX="g++-4.2" \ - \ - x64TARGET="x86_64-apple-darwin9" \ - x64OSVERSION="10.5" \ - x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ - x64CC="gcc-4.2" \ - x64CXX="g++-4.2" \ - \ - OTHERARGs="" \ - OTHERMAKEARGs="--jobs=$PROCESSNUM"; - - -# Deprecated: -export \ - ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ - i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ - ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ - x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; - - -# cmake settings -export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" -export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" - -# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard.txt.org --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mac/ExternalPrograms/scripts/SetEnv-leopard.txt.org Thu Sep 02 19:24:54 2010 +0200 @@ -0,0 +1,66 @@ +# Configuration for 4 part universal build, only possible from Leopard +# Copyright (c) 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 +if [ $(uname -p) = i386 ] ; then + PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +else + PROCESSNUM="1" +fi + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="ppc i386 ppc64 x86_64" \ + \ + ppcTARGET="powerpc-apple-darwin8" \ + ppcOSVERSION="10.4" \ + ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ + ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ + ppcCC="gcc-4.0" \ + ppcCXX="g++-4.0" \ + \ + i386TARGET="i386-apple-darwin8" \ + i386OSVERSION="10.4" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ + i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ + i386CC="gcc-4.0" \ + i386CXX="g++-4.0" \ + \ + ppc64TARGET="powerpc64-apple-darwin9" \ + ppc64OSVERSION="10.5" \ + ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppc64OPTIMIZE="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ + ppc64CC="gcc-4.2" \ + ppc64CXX="g++-4.2" \ + \ + x64TARGET="x86_64-apple-darwin9" \ + x64OSVERSION="10.5" \ + x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ + x64CC="gcc-4.2" \ + x64CXX="g++-4.2" \ + \ + OTHERARGs="" \ + OTHERMAKEARGs="--jobs=$PROCESSNUM"; + + +# Deprecated: +export \ + ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ + ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ + x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; + + +# cmake settings +export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" +export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" + +# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-universal.txt --- a/mac/ExternalPrograms/scripts/SetEnv-universal.txt Wed Sep 01 22:25:49 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -# Configuration for 2 part universal 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 -if [ $(uname -p) = i386 ] ; then - PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); -else - PROCESSNUM="1" -fi - -mkdir -p $myREPOSITORYDIR; - -export \ - REPOSITORYDIR="$myREPOSITORYDIR" \ |