[Hugin-cvs] SF.net SVN: hugin: [2686] hugin/trunk/src/hugin1

[<ip...@us...>]

Revision: 2686
          http://hugin.svn.sourceforge.net/hugin/?rev=2686&view=rev
Author:   ippei
Date:     2008-01-22 16:05:16 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
mac more fix and a revert

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/platform.h
    hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp

Modified: hugin/trunk/src/hugin1/base_wx/platform.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.h	2008-01-22 07:46:57 UTC (rev 2685)
+++ hugin/trunk/src/hugin1/base_wx/platform.h	2008-01-23 00:05:16 UTC (rev 2686)
@@ -28,6 +28,7 @@
 #define HUGIN1_BASE_PLATFORM_H
 
 #include "panoinc_WX.h"
+#include <config.h>
 
 #if defined __WXMAC__ 
 

Modified: hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp
===================================================================
--- hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2008-01-22 07:46:57 UTC (rev 2685)
+++ hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2008-01-23 00:05:16 UTC (rev 2686)
@@ -129,6 +129,21 @@
     PTPrograms progs = getPTProgramsConfig(wxT(""), wxConfigBase::Get());
 #endif
     
+#if defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE
+    {	 
+        wxString exec_path = MacGetPathToBundledExecutableFile(CFSTR("nona"));	 
+        if(exec_path != wxT(""))	 
+        {	 
+            progs.nona = exec_path.mb_str();	 
+        }	 
+        
+        exec_path = MacGetPathToBundledExecutableFile(CFSTR("hugin_hdrmerge"));	 
+        if(exec_path != wxT(""))	 
+        {	 
+            progs.hdrmerge = exec_path.mb_str();	 
+        }	 
+    }	 
+#endif
 
     // set the name of locale recource to look for
     m_locale.AddCatalog(wxT("hugin"));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.