Diff of /src/hugin1/hugin/MainFrame.cpp [6cdbff] .. [d5c5e9]  Maximize  Restore

Switch to side-by-side view

--- a/src/hugin1/hugin/MainFrame.cpp
+++ b/src/hugin1/hugin/MainFrame.cpp
@@ -529,15 +529,15 @@
         script.close();
 
         int createMakefile = 1;
-#ifdef __WXMAC__
+#if defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE
         createMakefile = 0;
 #endif
         if (createMakefile) {
             wxString makefn = scriptName.GetFullPath() + wxT(".mk");
             std::ofstream makefile(makefn.mb_str());
             std::string ptoFn = (const char *) scriptName.GetFullPath().mb_str();
-            wxString root = huginApp::Get()->GetXRCPath() + wxT("\\..\\");
-            PTPrograms progs = getPTProgramsConfig(root, wxConfigBase::Get());
+            wxString bindir = huginApp::Get()->GetUtilsBinDir();
+            PTPrograms progs = getPTProgramsConfig(bindir, wxConfigBase::Get());
             std::string resultFn;
             wxString resultFnwx = scriptName.GetFullPath();
             resultFn = resultFnwx.mb_str();
@@ -979,7 +979,7 @@
 	
     wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("about_dlg"));
 
-#ifdef __WXMAC__ && MAC_SELF_CONTAINED_BUNDLE
+#if __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE
     //rely on the system's locale choice
     strFile = MacGetPathTOBundledResourceFile(CFSTR("about.htm"));
     if(strFile!=wxT("")) XRCCTRL(dlg,"about_html",wxHtmlWindow)->LoadPage(strFile);
@@ -1022,7 +1022,7 @@
 
     if (m_help == 0)
     {
-#ifdef __WXMAC__ && MAC_SELF_CONTAINED_BUNDLE
+#if defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE
         // On Mac, xrc/data/help_LOCALE should be in the bundle as LOCALE.lproj/help
         // which we can rely on the operating sytem to pick the right locale's.
         wxString strFile = MacGetPathTOBundledResourceFile(CFSTR("help"));

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks