From d01ad2f5a76ca1c18227e8ded100b8c667213662 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 15 Nov 2007 18:02:08 +0000 Subject: [PATCH] rebaked after adding utilscocoa.mm to wxmac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index 700e3c8c79..e54c5d8e1b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4913,9 +4913,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_tbarwce.o \ monodll_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = \ -@COND_PLATFORM_MACOSX_1@ monodll_webkit.o monodll_fontdlgosx.o \ -@COND_PLATFORM_MACOSX_1@ monodll_colordlgosx.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS = \ + monodll_webkit.o \ + monodll_fontdlgosx.o \ + monodll_colordlgosx.o \ + monodll_utilscocoa.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@ monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ @@ -6793,9 +6796,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_tbarwce.o \ monolib_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = \ -@COND_PLATFORM_MACOSX_1@ monolib_webkit.o monolib_fontdlgosx.o \ -@COND_PLATFORM_MACOSX_1@ monolib_colordlgosx.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1 = \ + monolib_webkit.o \ + monolib_fontdlgosx.o \ + monolib_colordlgosx.o \ + monolib_utilscocoa.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_COCOA@ monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ @@ -8950,9 +8956,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_tbarwce.o \ coredll_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = \ -@COND_PLATFORM_MACOSX_1@ coredll_webkit.o coredll_fontdlgosx.o \ -@COND_PLATFORM_MACOSX_1@ coredll_colordlgosx.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2 = \ + coredll_webkit.o \ + coredll_fontdlgosx.o \ + coredll_colordlgosx.o \ + coredll_utilscocoa.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_COCOA@ coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ @@ -10445,9 +10454,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_tbarwce.o \ corelib_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = \ -@COND_PLATFORM_MACOSX_1@ corelib_webkit.o corelib_fontdlgosx.o \ -@COND_PLATFORM_MACOSX_1@ corelib_colordlgosx.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3 = \ + corelib_webkit.o \ + corelib_fontdlgosx.o \ + corelib_colordlgosx.o \ + corelib_utilscocoa.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_COCOA@ corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ @@ -13819,6 +13831,9 @@ monodll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONODLL_ODEP) monodll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm +monodll_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm + monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm @@ -18274,6 +18289,9 @@ monolib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONOLIB_ODEP) monolib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm +monolib_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm + monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm @@ -24055,6 +24073,9 @@ coredll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(COREDLL_ODEP) coredll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm +coredll_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm + coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm @@ -27127,6 +27148,9 @@ corelib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(CORELIB_ODEP) corelib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm +corelib_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm + corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm -- 2.47.2