From c0e7bd33bc336015c4ea16172ceef78ffbe3bf27 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 1 Oct 2018 14:02:48 +0200 Subject: [PATCH] Don't duplicate src/osx/cocoa/stdpaths.mm in wxiOS files list This file is already included in BASE_OSX_SHARED_SRC, which is part of wxiOS sources, so there is no need to repeat it in OSX_IPHONE_SRC as well. This fixes warnings about ignoring duplicate rules in the makefile in command line builds. --- Makefile.in | 28 ++++++---------------------- build/bakefiles/files.bkl | 1 - build/cmake/files.cmake | 1 - build/files | 1 - 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3608d2d88d..314c394af7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5630,7 +5630,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \ monodll_iphone_toolbar.o \ monodll_iphone_utils.o \ monodll_iphone_window.o \ - monodll_cocoa_stdpaths.o \ monodll_iphone_settings.o \ monodll_sound_osx.o \ monodll_core_sound.o \ @@ -7608,7 +7607,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \ monolib_iphone_toolbar.o \ monolib_iphone_utils.o \ monolib_iphone_window.o \ - monolib_cocoa_stdpaths.o \ monolib_iphone_settings.o \ monolib_sound_osx.o \ monolib_core_sound.o \ @@ -9733,7 +9731,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \ coredll_iphone_toolbar.o \ coredll_iphone_utils.o \ coredll_iphone_window.o \ - coredll_stdpaths.o \ coredll_iphone_settings.o \ coredll_sound_osx.o \ coredll_core_sound.o \ @@ -11453,7 +11450,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \ corelib_iphone_toolbar.o \ corelib_iphone_utils.o \ corelib_iphone_window.o \ - corelib_stdpaths.o \ corelib_iphone_settings.o \ corelib_sound_osx.o \ corelib_core_sound.o \ @@ -15850,6 +15846,9 @@ monodll_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONODLL_ODE monodll_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp +monodll_cocoa_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm + monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -17503,12 +17502,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@monodll_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp -@COND_PLATFORM_MACOSX_1@monodll_cocoa_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm - -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_cocoa_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(MONODLL_ODEP) -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm - @COND_PLATFORM_UNIX_1@monodll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp @@ -21124,6 +21117,9 @@ monolib_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONOLIB_ODE monolib_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp +monolib_cocoa_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm + monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -22777,12 +22773,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@monolib_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp -@COND_PLATFORM_MACOSX_1@monolib_cocoa_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm - -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_cocoa_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm - @COND_PLATFORM_UNIX_1@monolib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp @@ -27784,9 +27774,6 @@ coredll_iphone_utils.o: $(srcdir)/src/osx/iphone/utils.mm $(COREDLL_ODEP) coredll_iphone_window.o: $(srcdir)/src/osx/iphone/window.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/window.mm -coredll_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm - coredll_iphone_settings.o: $(srcdir)/src/osx/iphone/settings.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/settings.mm @@ -32053,9 +32040,6 @@ corelib_iphone_utils.o: $(srcdir)/src/osx/iphone/utils.mm $(CORELIB_ODEP) corelib_iphone_window.o: $(srcdir)/src/osx/iphone/window.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/window.mm -corelib_stdpaths.o: $(srcdir)/src/osx/cocoa/stdpaths.mm $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stdpaths.mm - corelib_iphone_settings.o: $(srcdir)/src/osx/iphone/settings.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/settings.mm diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index e6fb2354fb..b4834f11f5 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2699,7 +2699,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/iphone/toolbar.mm src/osx/iphone/utils.mm src/osx/iphone/window.mm - src/osx/cocoa/stdpaths.mm src/osx/iphone/settings.mm src/osx/sound_osx.cpp src/osx/core/sound.cpp diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index c240f3df2a..75d55340a6 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -2552,7 +2552,6 @@ set(OSX_COCOA_HDR set(OSX_IPHONE_SRC ${OSX_COMMON_SRC} src/generic/regiong.cpp - src/osx/cocoa/stdpaths.mm # iphone files src/osx/iphone/anybutton.mm src/osx/iphone/button.mm diff --git a/build/files b/build/files index 9194199f57..77280b9913 100644 --- a/build/files +++ b/build/files @@ -2534,7 +2534,6 @@ OSX_IPHONE_SRC = $(OSX_COMMON_SRC) src/generic/animateg.cpp src/generic/regiong.cpp - src/osx/cocoa/stdpaths.mm src/osx/core/sound.cpp src/osx/iphone/anybutton.mm src/osx/iphone/button.mm