From 8032d2c3f208637f058282b8e12f7ae824eb2200 Mon Sep 17 00:00:00 2001 From: Wyatt Olson Date: Thu, 26 Aug 2010 09:05:14 -0600 Subject: [PATCH] Modified COMPILE.txt with updated instructions on universal builds --- COMPILE.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/COMPILE.txt b/COMPILE.txt index 2bd728c4d..84825fa36 100644 --- a/COMPILE.txt +++ b/COMPILE.txt @@ -45,16 +45,22 @@ OSX Requirements: - XCode Development Tools (you only need a subset of these, but it is probably easier to just install all of them) - MacPorts - - Set /opt/local/etc/macports/variants.conf to include "+universal +no_x11 +quartz" (NOTE: as of this writing the Pango and Pango-devel ports are broken and will not build as Universal variants. Until this is fixed, leave the universal flag off.) - - Set /opt/local/etc/macports/macports.conf key 'universal_archs' to "i386 x86_64" - - Run "sudo port install cairomm pango-devel gtk2 cmake glibmm gtkmm lcms libiptcdata gcc45 mercurial" to install all needed libraries and tools + - Set /opt/local/etc/macports/variants.conf to include "+no_x11 +quartz" + - If you want to build for multiple architectures, add +universal to variants.conf + - Set /opt/local/etc/macports/macports.conf key 'universal_archs' to the architectures you wish to build for. Possible values + include "i386 x86_64 ppc ppc64" + - Edit beginning of CMakeLists.txt to enable the same architectures as you added to variants.conf + - Run "sudo port install cairomm pango-devel gtk2 cmake glibmm gtkmm lcms libiptcdata" to install all needed libraries and tools + - If you don't already have Mercurial installed, run "sudo port install mercurial" + - If you want to try OpenMP builds, run "sudo port install gcc45" Compile: - Enter root directory of RawTherapee source tree -- Type: cmake -D CMAKE_C_COMPILER=gcc-mp-4.5 -D CMAKE_CXX_COMPILER=g++-mp-4.5 . (to enable OpenMP) OR: - cmake -D OPTION_OMP=false . (to disable OpenMP and use the older compiler) +- Type: cmake -D CMAKE_C_COMPILER=gcc-mp-4.5 -D CMAKE_CXX_COMPILER=g++-mp-4.5 . (to enable OpenMP, assuming you have installed gcc45) OR: + cmake -D OPTION_OMP=false . (to disable OpenMP and use the default compiler) - Type: make install - Type: ./tools/osx/make-app-bundle -- You will find a RawTherapee.dmg file in release/ folder; this is the distribution release and can be run on any 10.5 or 10.6 Intel machine. +- You will find a RawTherapee.dmg file in release/ folder; this is the distribution release and can be run on any machine which meets the + architecture requirements you specified in variants.conf earlier. For any bugs or patches to the OSX build, please contact Wyatt