diff --git a/Makefile.in b/Makefile.in index 752eeaad34..518dfe3b6c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1657,6 +1657,7 @@ COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \ @COND_TOOLKIT_WINCE@ wx/msw/wince/chkconf.h @COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp @COND_TOOLKIT_WINCE@NET_WINCE_HDR = wx/msw/wince/net.h +@COND_PLATFORM_MACOSX_1@MAC_LOWLEVEL_HDR = wx/mac/common/glgrab.h @COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h @COND_TOOLKIT_COCOA@OPENGL_HDR = wx/cocoa/glcanvas.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR = wx/gtk1/glcanvas.h @@ -1894,7 +1895,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR = \ wx/gtk/win_gtk.h \ wx/gtk/window.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR) -@COND_TOOLKIT_MAC@LOWLEVEL_HDR = +@COND_TOOLKIT_MAC@LOWLEVEL_HDR = $(MAC_LOWLEVEL_HDR) COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ wx/generic/caret.h \ wx/generic/colour.h \ @@ -11089,7 +11090,7 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ @COND_SHARED_0@____SHARED = @COND_SHARED_1@____SHARED = $(PIC_FLAG) @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \ -@COND_PLATFORM_MACOSX_1@ = monodll_gsockosx.o monodll_hid.o \ +@COND_PLATFORM_MACOSX_1@ = monodll_glgrab.o monodll_gsockosx.o monodll_hid.o \ @COND_PLATFORM_MACOSX_1@ monodll_utilsexc_cf.o COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ @@ -11152,7 +11153,7 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarx11.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS) @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \ -@COND_PLATFORM_MACOSX_1@ = monolib_gsockosx.o monolib_hid.o \ +@COND_PLATFORM_MACOSX_1@ = monolib_glgrab.o monolib_gsockosx.o monolib_hid.o \ @COND_PLATFORM_MACOSX_1@ monolib_utilsexc_cf.o COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_taskbarcmn.o \ @@ -11215,10 +11216,10 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_taskbarx11.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0) @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 \ -@COND_PLATFORM_MACOSX_1@ = coredll_gsockosx.o coredll_hid.o \ +@COND_PLATFORM_MACOSX_1@ = coredll_glgrab.o coredll_gsockosx.o coredll_hid.o \ @COND_PLATFORM_MACOSX_1@ coredll_utilsexc_cf.o @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \ -@COND_PLATFORM_MACOSX_1@ = corelib_gsockosx.o corelib_hid.o \ +@COND_PLATFORM_MACOSX_1@ = corelib_glgrab.o corelib_gsockosx.o corelib_hid.o \ @COND_PLATFORM_MACOSX_1@ corelib_utilsexc_cf.o @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 \ @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ = advdll_taskbarcmn.o advdll_joystick.o \ @@ -14915,6 +14916,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_glgrab.o: $(srcdir)/src/mac/common/glgrab.c $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/mac/common/glgrab.c + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/gsockosx.cpp @@ -19043,6 +19047,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_glgrab.o: $(srcdir)/src/mac/common/glgrab.c $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/mac/common/glgrab.c + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/gsockosx.cpp @@ -23549,6 +23556,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_glgrab.o: $(srcdir)/src/mac/common/glgrab.c $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/mac/common/glgrab.c + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/gsockosx.cpp @@ -26510,6 +26520,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_glgrab.o: $(srcdir)/src/mac/common/glgrab.c $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/mac/common/glgrab.c + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/gsockosx.cpp diff --git a/configure b/configure index 20fdc81136..5d1b9e3039 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 53657 2008-05-19 19:46:44Z CE . +# From configure.in Id: configure.in 53806 2008-05-29 00:45:58Z KO . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8. # @@ -32373,7 +32373,7 @@ if test "$wxUSE_OPENGL" = "yes"; then { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} wxUSE_OPENGL="no" - elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then + elif test "$wxUSE_COCOA" = "1"; then OPENGL_LIBS="-framework OpenGL -framework AGL" elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" @@ -46465,7 +46465,7 @@ if test "$wxUSE_MAC" = 1 ; then fi fi if test "$USE_DARWIN" = 1; then - LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System -framework QuickTime" + LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System -framework QuickTime -framework OpenGL -framework AGL" else LDFLAGS="$LDFLAGS -lCarbonLib" fi