macOS build fix.

[dcpomatic.git] / src / tools / dcpomatic_disk.cc

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 28799013f700f5e643abf455b83c2e191f4dd933..395b60a8857f83866d7b29bb86c4327c6196d5f6 100644 (file)
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -22,6 +22,7 @@
 #include "wx/disk_warning_dialog.h"
 #include "wx/drive_wipe_warning_dialog.h"
 #include "wx/editable_list.h"
+#include "wx/id.h"
 #include "wx/job_manager_view.h"
 #include "wx/message_dialog.h"
 #include "wx/try_unmount_dialog.h"
@@ -39,6 +40,7 @@
 #include "lib/signal_manager.h"
 #include "lib/util.h"
 #include "lib/version.h"
+#include <dcp/filesystem.h>
 #include <dcp/warnings.h>
 #include <wx/cmdline.h>
 #include <wx/wx.h>
@@ -68,7 +70,7 @@ using namespace boost::placeholders;
 
 #ifdef DCPOMATIC_OSX
 enum {
-       ID_tools_uninstall = 1,
+       ID_tools_uninstall = DCPOMATIC_MAIN_MENU,
 };
 #endif
 
@@ -85,7 +87,7 @@ public:
        boost::optional<boost::filesystem::path> get () const
        {
                auto const dcp = boost::filesystem::path(wx_to_std(GetPath()));
-               if (!boost::filesystem::exists(dcp / "ASSETMAP") && !boost::filesystem::exists(dcp / "ASSETMAP.xml")) {
+               if (!dcp::filesystem::exists(dcp / "ASSETMAP") && !dcp::filesystem::exists(dcp / "ASSETMAP.xml")) {
                        error_dialog (nullptr, _("No ASSETMAP or ASSETMAP.xml found in this folder.  Please choose a DCP folder."));
                        return {};
                }