From: <bto...@us...> - 2008-01-21 23:40:52
|
Revision: 2681 http://hugin.svn.sourceforge.net/hugin/?rev=2681&view=rev Author: btownshend Date: 2008-01-21 15:40:51 -0800 (Mon, 21 Jan 2008) Log Message: ----------- Changed last 2 occurrences of HUGIN_OSX_BUNDLED to MAC_SELF_CONTAINED_BUNDLE Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp 2008-01-21 23:38:13 UTC (rev 2680) +++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp 2008-01-21 23:40:51 UTC (rev 2681) @@ -167,7 +167,7 @@ return cps; } } -#elif (defined __WXMAC__) && defined HUGIN_OSX_BUNDLED +#elif (defined __WXMAC__) && defined MAC_SELF_CONTAINED_BUNDLE wxString autopanoExe = wxConfigBase::Get()->Read(wxT("/AutoPanoSift/AutopanoExe"), wxT(HUGIN_APSIFT_EXE)); //if the autopano-sift front end specified in preference does not exist: Modified: hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp 2008-01-21 23:38:13 UTC (rev 2680) +++ hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp 2008-01-21 23:40:51 UTC (rev 2681) @@ -355,7 +355,7 @@ return false; } } -#elif (defined __WXMAC__ && defined HUGIN_OSX_BUNDLED) +#elif (defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE) wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE)); // TODO: for now, default path triggers non-custom path but to be fixed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |