Compiling works(see attached errors and patch)
But the problems in PTBatcherGUI remain, although enblend and ExifTool are
bundled inside the .app (see screenshots)
Blender: Unknown blender (enblend —version failed)
ExifTool: FAILED
Niklas
Am Montag, 25. April 2016 15:57:41 UTC+2 schrieb T. Modes:
>
>
>
> Am Dienstag, 19. April 2016 20:36:18 UTC+2 schrieb Niklas Mischkulnig:
>>
>> But then: #if defined __WXMAC__ && defined *MAC_SELF_CONTAINED_BUNDLE ;
>> *sure
>> __WXMAC__ is set but MAC_SELF_CONTAINED_BUNDLE isn't (doing that creates a
>> whole lot more compile errors). That means that it searches in path.
>> What's going on, especially with ExifTool, the code, which searches it,
>> is quite complex?
>>
>
> When MAC_SELF_CONTAINED_BUNDLE is defined special code for the Mac bundles
> is used to look for the binaries in the bundle (it calls the function
> MacGetPathToBundledExecutableFile).
> So I assume for a bundled version this define is needed. (And may explain
> the problems with enblend/enfuse/assistant).
> I changed the code from the makefile version to now the wxWidgets version
> for stitching and assistant some time ago. Since then nobody has build a
> Mac bundle. So it may be that there are some glitches which I introduced
> when I reworked the code. Maybe only an include is missing? But without the
> (exact) error messages this is impossible to say.
>
> Thomas
>
>
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/69dd77bf-8a04-4228-b7a3-ab685bdd475f%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
diff --git a/clean/src/hugin1/hugin/PanoPanel.cpp b/cmake/hugin/src/hugin1/hugin/PanoPanel.cpp
index 2c232f8..14d3151 100644
--- a/clean/src/hugin1/hugin/PanoPanel.cpp
+++ b/cmake/hugin/src/hugin1/hugin/PanoPanel.cpp
@@ -1072,7 +1072,7 @@ void PanoPanel::DoStitch()
DEBUG_ERROR("hugin_stitch_project could not be found in the bundle.");
return;
}
- hugin_stitch_project = hugin_utils::wxQuoteFilename(hugin_stitch_project);
+ hugin_stitch_project = wxQuoteFilename(hugin_stitch_project);
#elif defined __WXMAC__
// HuginStitchProject installed in INSTALL_OSX_BUNDLE_DIR
wxFileName hugin_stitch_project_app(wxT(INSTALL_OSX_BUNDLE_DIR), wxEmptyString);
@@ -1256,7 +1256,7 @@ void PanoPanel::DoSendToBatch()
//Found PTBatcherGui inside the (registered) PTBatcherGui bundle. Call it directly.
//We need to call the binary from it's own bundle and not from the hugin bundle otherwise we get no menu as OSX assumes that the hugin bundle
//will provide the menu
- cmd = hugin_utils::wxQuoteString(cmd);
+ cmd = wxQuoteString(cmd);
cmd += wxT(" ")+switches+hugin_utils::wxQuoteFilename(projectFile)+wxT(" ")+hugin_utils::wxQuoteFilename(dlg.GetPath());
wxExecute(cmd);
}
@@ -1341,7 +1341,7 @@ void PanoPanel::DoUserDefinedStitch()
DEBUG_ERROR("hugin_stitch_project could not be found in the bundle.");
return;
}
- hugin_stitch_project = hugin_utils::wxQuoteFilename(hugin_stitch_project);
+ hugin_stitch_project = wxQuoteFilename(hugin_stitch_project);
#elif defined __WXMAC__
// HuginStitchProject installed in INSTALL_OSX_BUNDLE_DIR
wxFileName hugin_stitch_project_app(wxT(INSTALL_OSX_BUNDLE_DIR), wxEmptyString);
