From 6f974d9aa399e8a04208cc742100085e0ddc8316 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 24 Oct 2025 17:12:24 +0200 Subject: [PATCH 10/48] offer volume.mm to all baselib variants on osx --- Makefile.in | 117 +++++++++++++++++++------------------- build/bakefiles/files.bkl | 4 +- build/cmake/files.cmake | 4 +- build/files | 2 +- 4 files changed, 65 insertions(+), 62 deletions(-) diff --git a/Makefile.in b/Makefile.in index 08f7bf058e..64b669bc00 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1108,7 +1108,6 @@ ALL_BASE_SOURCES = \ src/common/msgout.cpp \ src/common/utilscmn.cpp \ src/osx/cocoa/utils.mm \ - src/osx/volume.mm \ src/msw/main.cpp \ src/msw/volume.cpp \ src/common/fs_inet.cpp \ @@ -2609,7 +2608,8 @@ COND_TOOLKIT__BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm + src/osx/core/stdpaths.mm \ + src/osx/volume.mm @COND_TOOLKIT_@BASE_OSX_SRC = $(COND_TOOLKIT__BASE_OSX_SRC) COND_TOOLKIT_COCOA_BASE_OSX_SRC = \ src/common/fdiodispatcher.cpp \ @@ -2634,7 +2634,8 @@ COND_TOOLKIT_COCOA_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm + src/osx/core/stdpaths.mm \ + src/osx/volume.mm @COND_TOOLKIT_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_COCOA_BASE_OSX_SRC) COND_TOOLKIT_GTK_BASE_OSX_SRC = \ src/common/fdiodispatcher.cpp \ @@ -2659,16 +2660,17 @@ COND_TOOLKIT_GTK_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm + src/osx/core/stdpaths.mm \ + src/osx/volume.mm @COND_TOOLKIT_GTK@BASE_OSX_SRC = $(COND_TOOLKIT_GTK_BASE_OSX_SRC) COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC = \ - src/osx/core/mimetype.cpp \ src/osx/core/cfstring.cpp \ src/osx/core/evtloop_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ src/osx/core/stdpaths.mm \ + src/osx/volume.mm \ src/common/fdiodispatcher.cpp \ src/common/selectdispatcher.cpp \ src/unix/appunix.cpp \ @@ -2685,16 +2687,17 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC = \ src/unix/wakeuppipe.cpp \ src/unix/fswatcher_kqueue.cpp \ src/osx/fswatcher_fsevents.cpp \ - src/osx/core/uilocale.mm + src/osx/core/uilocale.mm \ + src/osx/core/mimetype.cpp @COND_TOOLKIT_OSX_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC) COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC = \ - src/osx/core/mimetype.cpp \ src/osx/core/cfstring.cpp \ src/osx/core/evtloop_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ src/osx/core/stdpaths.mm \ + src/osx/volume.mm \ src/common/fdiodispatcher.cpp \ src/common/selectdispatcher.cpp \ src/unix/appunix.cpp \ @@ -2711,7 +2714,8 @@ COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC = \ src/unix/wakeuppipe.cpp \ src/unix/fswatcher_kqueue.cpp \ src/osx/fswatcher_fsevents.cpp \ - src/osx/core/uilocale.mm + src/osx/core/uilocale.mm \ + src/osx/core/mimetype.cpp @COND_TOOLKIT_OSX_IPHONE@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC) COND_TOOLKIT_X11_BASE_OSX_SRC = \ src/common/fdiodispatcher.cpp \ @@ -2736,7 +2740,8 @@ COND_TOOLKIT_X11_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm + src/osx/core/stdpaths.mm \ + src/osx/volume.mm @COND_TOOLKIT_X11@BASE_OSX_SRC = $(COND_TOOLKIT_X11_BASE_OSX_SRC) COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/app.h \ @@ -4290,13 +4295,13 @@ COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_uninst_cmd = rm -f \ $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_USE_SOVERSOLARIS_1@__monodll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_uninst_cmd) COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \ - monodll_core_mimetype.o \ monodll_cfstring.o \ monodll_evtloop_cf.o \ monodll_strconv_cf.o \ monodll_utils_base.o \ monodll_core_secretstore.o \ monodll_core_stdpaths.o \ + monodll_osx_volume.o \ monodll_fdiodispatcher.o \ monodll_selectdispatcher.o \ monodll_appunix.o \ @@ -4313,7 +4318,8 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_wakeuppipe.o \ monodll_fswatcher_kqueue.o \ monodll_fswatcher_fsevents.o \ - monodll_core_uilocale.o + monodll_core_uilocale.o \ + monodll_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_fdiodispatcher.o \ @@ -4362,7 +4368,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_WIN32_1@ = monodll_main.o monodll_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \ -@COND_TOOLKIT_OSX_COCOA@ = monodll_cocoa_utils.o monodll_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = monodll_cocoa_utils.o COND_PLATFORM_MACOSX_1___NET_PLATFORM_SRC_OBJECTS = \ monodll_socketiohandler.o \ monodll_sockunix.o \ @@ -6073,13 +6079,13 @@ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_monolib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_monolib/wx/wxprec.h.gch COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ - monolib_core_mimetype.o \ monolib_cfstring.o \ monolib_evtloop_cf.o \ monolib_strconv_cf.o \ monolib_utils_base.o \ monolib_core_secretstore.o \ monolib_core_stdpaths.o \ + monolib_osx_volume.o \ monolib_fdiodispatcher.o \ monolib_selectdispatcher.o \ monolib_appunix.o \ @@ -6096,7 +6102,8 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_wakeuppipe.o \ monolib_fswatcher_kqueue.o \ monolib_fswatcher_fsevents.o \ - monolib_core_uilocale.o + monolib_core_uilocale.o \ + monolib_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_fdiodispatcher.o \ @@ -6145,7 +6152,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_WIN32_1@ = monolib_main.o monolib_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \ -@COND_TOOLKIT_OSX_COCOA@ = monolib_cocoa_utils.o monolib_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = monolib_cocoa_utils.o COND_PLATFORM_MACOSX_1___NET_PLATFORM_SRC_OBJECTS_1 = \ monolib_socketiohandler.o \ monolib_sockunix.o \ @@ -7906,13 +7913,13 @@ COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_uninst_cmd = rm -f \ @COND_USE_SOVERSOLARIS_1@__basedll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_uninst_cmd) @COND_PLATFORM_WIN32_1@__basedll___win32rc = basedll_version_rc.o COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ - basedll_core_mimetype.o \ basedll_cfstring.o \ basedll_evtloop_cf.o \ basedll_strconv_cf.o \ basedll_utils_base.o \ basedll_core_secretstore.o \ basedll_core_stdpaths.o \ + basedll_osx_volume.o \ basedll_fdiodispatcher.o \ basedll_selectdispatcher.o \ basedll_appunix.o \ @@ -7929,7 +7936,8 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_wakeuppipe.o \ basedll_fswatcher_kqueue.o \ basedll_fswatcher_fsevents.o \ - basedll_core_uilocale.o + basedll_core_uilocale.o \ + basedll_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_fdiodispatcher.o \ @@ -7978,7 +7986,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_WIN32_1@ = basedll_main.o basedll_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \ -@COND_TOOLKIT_OSX_COCOA@ = basedll_cocoa_utils.o basedll_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = basedll_cocoa_utils.o COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname) @@ -7991,13 +7999,13 @@ COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_baselib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_baselib/wx/wxprec.h.gch COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ - baselib_core_mimetype.o \ baselib_cfstring.o \ baselib_evtloop_cf.o \ baselib_strconv_cf.o \ baselib_utils_base.o \ baselib_core_secretstore.o \ baselib_core_stdpaths.o \ + baselib_osx_volume.o \ baselib_fdiodispatcher.o \ baselib_selectdispatcher.o \ baselib_appunix.o \ @@ -8014,7 +8022,8 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_wakeuppipe.o \ baselib_fswatcher_kqueue.o \ baselib_fswatcher_fsevents.o \ - baselib_core_uilocale.o + baselib_core_uilocale.o \ + baselib_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_fdiodispatcher.o \ @@ -8063,7 +8072,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_WIN32_1@ = baselib_main.o baselib_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \ -@COND_TOOLKIT_OSX_COCOA@ = baselib_cocoa_utils.o baselib_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = baselib_cocoa_utils.o @COND_SHARED_1@____wxbase_namedll_DEP = $(__basedll___depname) @COND_SHARED_0@____wxbase_namelib_DEP = $(__baselib___depname) COND_MONOLITHIC_0_SHARED_1___netdll___depname = \ @@ -8234,9 +8243,9 @@ COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd = rm -f \ @COND_USE_SOVERSOLARIS_1@__coredll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd) @COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \ -@COND_PLATFORM_WIN32_1@ = coredll_main.o coredll_msw_volume.o +@COND_PLATFORM_WIN32_1@ = coredll_main.o coredll_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \ -@COND_TOOLKIT_OSX_COCOA@ = coredll_cocoa_utils.o coredll_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = coredll_cocoa_utils.o COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_4) \ $(__PLATFORM_SRC_OBJECTS_8) \ @@ -9744,9 +9753,9 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_corelib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_corelib/wx/wxprec.h.gch @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \ -@COND_PLATFORM_WIN32_1@ = corelib_main.o corelib_msw_volume.o +@COND_PLATFORM_WIN32_1@ = corelib_main.o corelib_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \ -@COND_TOOLKIT_OSX_COCOA@ = corelib_cocoa_utils.o corelib_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = corelib_cocoa_utils.o COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_6) \ $(__PLATFORM_SRC_OBJECTS_9) \ @@ -15681,9 +15690,6 @@ monodll_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(MONODLL_ODEP) monodll_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - monodll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -15702,12 +15708,18 @@ monodll_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONODLL_ODE monodll_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +monodll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + monodll_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp monodll_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -15729,9 +15741,6 @@ monodll_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(MONODLL_ODEP) monodll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -monodll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - monodll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -20466,9 +20475,6 @@ monolib_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(MONOLIB_ODEP) monolib_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - monolib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -20487,12 +20493,18 @@ monolib_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONOLIB_ODE monolib_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +monolib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + monolib_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp monolib_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -20514,9 +20526,6 @@ monolib_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(MONOLIB_ODEP) monolib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -monolib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - monolib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -25251,9 +25260,6 @@ basedll_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(BASEDLL_ODEP) basedll_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - basedll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -25272,12 +25278,18 @@ basedll_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(BASEDLL_ODE basedll_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +basedll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + basedll_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp basedll_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -25299,9 +25311,6 @@ basedll_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(BASEDLL_ODEP) basedll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -basedll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - @COND_PLATFORM_UNIX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp @@ -25725,9 +25734,6 @@ baselib_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(BASELIB_ODEP) baselib_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - baselib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -25746,12 +25752,18 @@ baselib_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(BASELIB_ODE baselib_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +baselib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + baselib_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp baselib_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + baselib_event.o: $(srcdir)/src/common/event.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -25773,9 +25785,6 @@ baselib_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(BASELIB_ODEP) baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -baselib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - @COND_PLATFORM_UNIX_1@baselib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp @@ -26013,15 +26022,12 @@ coredll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(COREDLL_ODEP) coredll_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp -coredll_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP) +coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp coredll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -coredll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - coredll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(COREDLL_ODEP) $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c @@ -29766,15 +29772,12 @@ corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CORELIB_ODEP) corelib_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp -corelib_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP) +corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp corelib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -corelib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - corelib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(CORELIB_ODEP) $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index c6ad88b2f3..0af19fcfd4 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -185,6 +185,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/utils_base.mm src/osx/core/secretstore.cpp src/osx/core/stdpaths.mm + src/osx/volume.mm wx/osx/core/cfdataref.h @@ -207,11 +208,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - src/osx/core/mimetype.cpp $(BASE_COREFOUNDATION_SRC) $(BASE_UNIX_AND_DARWIN_SRC) src/osx/fswatcher_fsevents.cpp src/osx/core/uilocale.mm + src/osx/core/mimetype.cpp $(BASE_COREFOUNDATION_HDR) @@ -222,7 +223,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/utils.mm - src/osx/volume.mm diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index a05b86f126..85113b7f1b 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -115,6 +115,7 @@ set(BASE_COREFOUNDATION_SRC src/osx/core/strconv_cf.cpp src/osx/cocoa/utils_base.mm src/osx/core/stdpaths.mm + src/osx/volume.mm ) set(BASE_COREFOUNDATION_HDR @@ -137,11 +138,11 @@ set(BASE_COREFOUNDATION_HDR ) set(BASE_OSX_SHARED_SRC - src/osx/core/mimetype.cpp src/osx/fswatcher_fsevents.cpp ${BASE_COREFOUNDATION_SRC} ${BASE_UNIX_AND_DARWIN_SRC} src/osx/core/uilocale.mm + src/osx/core/mimetype.cpp ) set(BASE_OSX_SHARED_HDR @@ -152,7 +153,6 @@ set(BASE_OSX_SHARED_HDR set(BASE_AND_GUI_OSX_COCOA_SRC src/osx/cocoa/utils.mm - src/osx/volume.mm ) set(BASE_OSX_NOTWXMAC_SRC diff --git a/build/files b/build/files index 50a7cc0117..427f2a47dd 100644 --- a/build/files +++ b/build/files @@ -141,6 +141,7 @@ BASE_COREFOUNDATION_SRC = src/osx/core/stdpaths.mm src/osx/core/strconv_cf.cpp src/osx/cocoa/utils_base.mm + src/osx/volume.mm BASE_COREFOUNDATION_HDR = wx/osx/carbon/region.h @@ -176,7 +177,6 @@ BASE_OSX_SHARED_HDR = # Base and GUI files used by OS X BASE_AND_GUI_OSX_COCOA_SRC = src/osx/cocoa/utils.mm - src/osx/volume.mm # files used by non-wxMac OS X builds BASE_OSX_NOTWXMAC_SRC = -- 2.24.3 (Apple Git-128)