From 19ad183af2be8c2db3a364cffbc8f8b738e61271 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 27 Oct 2025 14:53:52 +0100 Subject: [PATCH 21/48] have only one set of source files on osx for base keeping the name BASE_OSX_SHARED_ for the moment, easier to spot bugs --- Makefile.in | 428 +++++++--------------------- build/bakefiles/files.bkl | 38 +-- build/cmake/files.cmake | 17 +- build/cmake/lib/base/CMakeLists.txt | 4 +- build/files | 39 ++- 5 files changed, 132 insertions(+), 394 deletions(-) diff --git a/Makefile.in b/Makefile.in index 64b669bc00..51f04cb1ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -926,6 +926,9 @@ ALL_PORTS_BASE_HEADERS = \ wx/localedefs.h \ wx/uilocale.h \ wx/fs_data.h \ + wx/unix/fswatcher_inotify.h \ + wx/unix/stdpaths.h \ + wx/unix/mimetype.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -935,9 +938,6 @@ ALL_PORTS_BASE_HEADERS = \ wx/unix/pipe.h \ wx/unix/stackwalk.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/unix/fswatcher_inotify.h \ - wx/unix/stdpaths.h \ wx/msw/apptrait.h \ wx/msw/apptbase.h \ wx/msw/chkconf.h \ @@ -960,7 +960,32 @@ ALL_PORTS_BASE_HEADERS = \ wx/msw/wrapcdlg.h \ wx/msw/wrapwin.h \ wx/msw/fswatcher.h \ - $(BASE_OSX_HDR) \ + wx/osx/core/cfdataref.h \ + wx/osx/core/cfref.h \ + wx/osx/core/cfstring.h \ + wx/osx/core/hid.h \ + wx/osx/core/evtloop.h \ + wx/osx/core/objcid.h \ + wx/osx/core/private.h \ + wx/osx/core/colour.h \ + wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h \ + wx/osx/core/cfarray.h \ + wx/osx/core/cftype.h \ + wx/osx/core/joystick.h \ + wx/osx/core/mimetype.h \ + wx/osx/core/dataview.h \ + wx/osx/core/stdpaths.h \ + wx/unix/app.h \ + wx/unix/apptbase.h \ + wx/unix/apptrait.h \ + wx/unix/chkconf.h \ + wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ + wx/unix/pipe.h \ + wx/unix/stackwalk.h \ + wx/unix/fswatcher_kqueue.h \ + wx/osx/fswatcher_fsevents.h \ wx/fs_inet.h \ wx/protocol/file.h \ wx/protocol/ftp.h \ @@ -1062,6 +1087,9 @@ ALL_BASE_SOURCES = \ src/common/lzmastream.cpp \ src/common/uilocale.cpp \ src/common/fs_data.cpp \ + src/unix/fswatcher_inotify.cpp \ + src/unix/stdpaths.cpp \ + src/unix/secretstore.cpp \ src/common/fdiodispatcher.cpp \ src/common/selectdispatcher.cpp \ src/unix/appunix.cpp \ @@ -1079,9 +1107,6 @@ ALL_BASE_SOURCES = \ src/unix/fswatcher_kqueue.cpp \ src/unix/mimetype.cpp \ src/unix/uilocale.cpp \ - src/unix/fswatcher_inotify.cpp \ - src/unix/stdpaths.cpp \ - src/unix/secretstore.cpp \ src/msw/basemsw.cpp \ src/msw/crashrpt.cpp \ src/msw/debughlp.cpp \ @@ -1102,7 +1127,31 @@ ALL_BASE_SOURCES = \ src/msw/fswatcher.cpp \ src/msw/secretstore.cpp \ src/msw/uilocale.cpp \ - $(BASE_OSX_SRC) \ + 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 \ + src/unix/dir.cpp \ + src/unix/dlunix.cpp \ + src/unix/epolldispatcher.cpp \ + src/unix/evtloopunix.cpp \ + src/unix/fdiounix.cpp \ + src/unix/snglinst.cpp \ + src/unix/stackwalk.cpp \ + src/unix/timerunx.cpp \ + src/unix/threadpsx.cpp \ + src/unix/utilsunx.cpp \ + src/unix/wakeuppipe.cpp \ + src/unix/fswatcher_kqueue.cpp \ + src/osx/fswatcher_fsevents.cpp \ + src/osx/core/uilocale.mm \ + src/osx/core/mimetype.cpp \ src/common/event.cpp \ src/common/fs_mem.cpp \ src/common/msgout.cpp \ @@ -2585,249 +2634,7 @@ COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR = \ @COND_TOOLKIT_X11@OPENGL_PLATFORM_HDR = wx/unix/glx11.h wx/x11/glcanvas.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_PLATFORM_HDR = wx/aui/tabartgtk.h @COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h -COND_TOOLKIT__BASE_OSX_SRC = \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.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 -@COND_TOOLKIT_@BASE_OSX_SRC = $(COND_TOOLKIT__BASE_OSX_SRC) -COND_TOOLKIT_COCOA_BASE_OSX_SRC = \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.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 -@COND_TOOLKIT_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_COCOA_BASE_OSX_SRC) -COND_TOOLKIT_GTK_BASE_OSX_SRC = \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.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 -@COND_TOOLKIT_GTK@BASE_OSX_SRC = $(COND_TOOLKIT_GTK_BASE_OSX_SRC) -COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC = \ - 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 \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/osx/fswatcher_fsevents.cpp \ - 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/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 \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/osx/fswatcher_fsevents.cpp \ - 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 \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.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 -@COND_TOOLKIT_X11@BASE_OSX_SRC = $(COND_TOOLKIT_X11_BASE_OSX_SRC) -COND_TOOLKIT__BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR) -COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR) -COND_TOOLKIT_GTK_BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR) -COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ +COND_PLATFORM_MACOSX_1_BASE_PLATFORM_HDR = \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ @@ -2854,37 +2661,11 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/unix/stackwalk.h \ wx/unix/fswatcher_kqueue.h \ wx/osx/fswatcher_fsevents.h -@COND_TOOLKIT_OSX_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR) -COND_TOOLKIT_X11_BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR) -@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) +@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_MACOSX_1_BASE_PLATFORM_HDR) COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ + wx/unix/fswatcher_inotify.h \ + wx/unix/stdpaths.h \ + wx/unix/mimetype.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -2893,10 +2674,7 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/unix/fswatcher_inotify.h \ - wx/unix/stdpaths.h + wx/unix/fswatcher_kqueue.h @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR) COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/apptrait.h \ @@ -4322,6 +4100,9 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \ 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_fswatcher_inotify.o \ + monodll_unix_stdpaths.o \ + monodll_unix_secretstore.o \ monodll_fdiodispatcher.o \ monodll_selectdispatcher.o \ monodll_appunix.o \ @@ -4338,10 +4119,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_wakeuppipe.o \ monodll_fswatcher_kqueue.o \ monodll_unix_mimetype.o \ - monodll_unix_uilocale.o \ - monodll_fswatcher_inotify.o \ - monodll_unix_stdpaths.o \ - monodll_unix_secretstore.o + monodll_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_basemsw.o \ @@ -6106,6 +5884,9 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ 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_fswatcher_inotify.o \ + monolib_unix_stdpaths.o \ + monolib_unix_secretstore.o \ monolib_fdiodispatcher.o \ monolib_selectdispatcher.o \ monolib_appunix.o \ @@ -6122,10 +5903,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_wakeuppipe.o \ monolib_fswatcher_kqueue.o \ monolib_unix_mimetype.o \ - monolib_unix_uilocale.o \ - monolib_fswatcher_inotify.o \ - monolib_unix_stdpaths.o \ - monolib_unix_secretstore.o + monolib_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_basemsw.o \ @@ -7940,6 +7718,9 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ 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_fswatcher_inotify.o \ + basedll_unix_stdpaths.o \ + basedll_unix_secretstore.o \ basedll_fdiodispatcher.o \ basedll_selectdispatcher.o \ basedll_appunix.o \ @@ -7956,10 +7737,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_wakeuppipe.o \ basedll_fswatcher_kqueue.o \ basedll_unix_mimetype.o \ - basedll_unix_uilocale.o \ - basedll_fswatcher_inotify.o \ - basedll_unix_stdpaths.o \ - basedll_unix_secretstore.o + basedll_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_basemsw.o \ @@ -8026,6 +7804,9 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ 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_fswatcher_inotify.o \ + baselib_unix_stdpaths.o \ + baselib_unix_secretstore.o \ baselib_fdiodispatcher.o \ baselib_selectdispatcher.o \ baselib_appunix.o \ @@ -8042,10 +7823,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_wakeuppipe.o \ baselib_fswatcher_kqueue.o \ baselib_unix_mimetype.o \ - baselib_unix_uilocale.o \ - baselib_fswatcher_inotify.o \ - baselib_unix_stdpaths.o \ - baselib_unix_secretstore.o + baselib_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_basemsw.o \ @@ -15615,12 +15393,6 @@ monodll_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(MONODLL_ODEP) monodll_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -monodll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -monodll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - monodll_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -15630,6 +15402,12 @@ monodll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP) monodll_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +monodll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +monodll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp @@ -20400,12 +20178,6 @@ monolib_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(MONOLIB_ODEP) monolib_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -monolib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -monolib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - monolib_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -20415,6 +20187,12 @@ monolib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP) monolib_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +monolib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +monolib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp @@ -25185,12 +24963,6 @@ basedll_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(BASEDLL_ODEP) basedll_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -basedll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -basedll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - basedll_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -25200,6 +24972,12 @@ basedll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP) basedll_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +basedll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +basedll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp @@ -25659,12 +25437,6 @@ baselib_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(BASELIB_ODEP) baselib_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -baselib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -baselib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - baselib_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -25674,6 +25446,12 @@ baselib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP) baselib_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +baselib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +baselib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + baselib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 0af19fcfd4..5febfc75fb 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -108,15 +108,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! backtrace()) --> - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) src/unix/fswatcher_inotify.cpp src/unix/stdpaths.cpp src/unix/secretstore.cpp + $(BASE_UNIX_AND_DARWIN_SRC) + src/unix/mimetype.cpp + src/unix/uilocale.cpp - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) wx/unix/fswatcher_inotify.h wx/unix/stdpaths.h + wx/unix/mimetype.h + $(BASE_UNIX_AND_DARWIN_HDR) @@ -225,16 +228,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/utils.mm - - - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) - $(BASE_COREFOUNDATION_SRC) - - - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) - $(BASE_COREFOUNDATION_HDR) - - @@ -3217,16 +3210,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - $(BASE_OSX_SHARED_SRC) - $(BASE_OSX_SHARED_SRC) - $(BASE_OSX_NOTWXMAC_SRC) - $(BASE_OSX_NOTWXMAC_SRC) - $(BASE_OSX_NOTWXMAC_SRC) - - - - $(BASE_OSX_NOTWXMAC_SRC) + $(BASE_OSX_SHARED_SRC) $(BASE_UNIX_SRC) @@ -3245,15 +3229,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - $(BASE_OSX_SHARED_HDR) - $(BASE_OSX_NOTWXMAC_HDR) - $(BASE_OSX_NOTWXMAC_HDR) - $(BASE_OSX_NOTWXMAC_HDR) - - - - $(BASE_OSX_NOTWXMAC_HDR) + $(BASE_OSX_SHARED_HDR) $(BASE_UNIX_HDR) diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index 85113b7f1b..4f7e23a68b 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -43,16 +43,19 @@ set(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR ) set(BASE_UNIX_SRC - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC} src/unix/fswatcher_inotify.cpp src/unix/secretstore.cpp src/unix/stdpaths.cpp + ${BASE_UNIX_AND_DARWIN_SRC} + src/unix/mimetype.cpp + src/unix/uilocale.cpp ) set(BASE_UNIX_HDR - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR} wx/unix/fswatcher_inotify.h wx/unix/stdpaths.h + ${BASE_UNIX_AND_DARWIN_HDR} + wx/unix/mimetype.h ) set(BASE_WIN32_SRC @@ -155,16 +158,6 @@ set(BASE_AND_GUI_OSX_COCOA_SRC src/osx/cocoa/utils.mm ) -set(BASE_OSX_NOTWXMAC_SRC - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC} - ${BASE_COREFOUNDATION_SRC} -) - -set(BASE_OSX_NOTWXMAC_HDR - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR} - ${BASE_COREFOUNDATION_HDR} -) - set(QT_UNIX_SRC src/unix/dialup.cpp src/unix/joystick.cpp diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt index c98f732213..a158c0eba9 100644 --- a/build/cmake/lib/base/CMakeLists.txt +++ b/build/cmake/lib/base/CMakeLists.txt @@ -14,13 +14,11 @@ if(WIN32) wx_append_sources(BASE_FILES BASE_WIN32) wx_append_sources(BASE_FILES BASE_AND_GUI_WIN32) elseif(APPLE) + wx_append_sources(BASE_FILES BASE_OSX_SHARED) if(WXOSX_COCOA OR WXOSX_IPHONE) - wx_append_sources(BASE_FILES BASE_OSX_SHARED) if(WXOSX_COCOA) wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA) endif() - else() - wx_append_sources(BASE_FILES BASE_OSX_NOTWXMAC) endif() elseif(UNIX) wx_append_sources(BASE_FILES BASE_UNIX) diff --git a/build/files b/build/files index 427f2a47dd..1da1d33fa8 100644 --- a/build/files +++ b/build/files @@ -53,28 +53,31 @@ BASE_UNIX_AND_DARWIN_HDR = # Files used on all Unix systems, including Darwin with any port but wxMac # (this is really an aberration, we should also use these files for wxMac, # it's not done because of some OS 9 support leftovers only now) -BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC = - $(BASE_UNIX_AND_DARWIN_SRC) - src/unix/mimetype.cpp - src/unix/uilocale.cpp +#BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC = +# $(BASE_UNIX_AND_DARWIN_SRC) +# src/unix/mimetype.cpp +# src/unix/uilocale.cpp -BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR = - $(BASE_UNIX_AND_DARWIN_HDR) - wx/unix/mimetype.h +#BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR = +# $(BASE_UNIX_AND_DARWIN_HDR) +# wx/unix/mimetype.h # Files used on all non-Darwin Unix systems (because Darwin provides other, # better, native equivalents of the functionality they implement (e.g. # CFSocket instead of BSD sockets) or doesn't provide it at all (epoll, # backtrace()) BASE_UNIX_SRC = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) + $(BASE_UNIX_AND_DARWIN_SRC) src/unix/fswatcher_inotify.cpp + src/unix/mimetype.cpp src/unix/secretstore.cpp src/unix/stdpaths.cpp + src/unix/uilocale.cpp BASE_UNIX_HDR = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) + $(BASE_UNIX_AND_DARWIN_HDR) wx/unix/fswatcher_inotify.h + wx/unix/mimetype.h wx/unix/stdpaths.h @@ -163,31 +166,21 @@ BASE_COREFOUNDATION_HDR = # Base files used by OS X ports (not Carbon) BASE_OSX_SHARED_SRC = + $(BASE_UNIX_AND_DARWIN_SRC) + $(BASE_COREFOUNDATION_SRC) src/osx/core/mimetype.cpp src/osx/core/uilocale.mm src/osx/fswatcher_fsevents.cpp - $(BASE_COREFOUNDATION_SRC) - $(BASE_UNIX_AND_DARWIN_SRC) BASE_OSX_SHARED_HDR = - wx/osx/fswatcher_fsevents.h - $(BASE_COREFOUNDATION_HDR) $(BASE_UNIX_AND_DARWIN_HDR) + $(BASE_COREFOUNDATION_HDR) + wx/osx/fswatcher_fsevents.h # Base and GUI files used by OS X BASE_AND_GUI_OSX_COCOA_SRC = src/osx/cocoa/utils.mm -# files used by non-wxMac OS X builds -BASE_OSX_NOTWXMAC_SRC = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) - $(BASE_COREFOUNDATION_SRC) - -BASE_OSX_NOTWXMAC_HDR = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) - $(BASE_COREFOUNDATION_HDR) - - ## Qt QT_UNIX_SRC= -- 2.24.3 (Apple Git-128)