From d12ba8b02227821957d28e57bfa5fd4f49ed4249 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Mon, 2 Mar 2009 18:30:23 +0000 Subject: [PATCH] Rebake after OS X Cocoa header changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 476703d..ae4db8a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1935,10 +1935,8 @@ COND_USE_STC_1___wxscintilla___depname = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = wx/gtk/glcanvas.h wx/unix/glx11.h @COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h -@COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = \ -@COND_TOOLKIT_OSX_CARBON@ wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h -@COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = \ -@COND_TOOLKIT_OSX_COCOA@ wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h +@COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h +@COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h @COND_TOOLKIT_WINCE@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h COND_TOOLKIT__BASE_OSX_SRC = \ @@ -3271,8 +3269,7 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \ wx/osx/dataview.h \ wx/osx/joystick.h \ wx/osx/sound.h \ - wx/osx/carbon/sound.h \ - wx/osx/carbon/taskbarosx.h \ + wx/osx/taskbarosx.h \ wx/osx/core/joystick.h @COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR) @COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \ -- 2.7.4