AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

integrating Kevin's work, command line builds for osx variants

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2008-09-07 15:59:51 +00:00
parent c80e8cbeab
commit 2ea057f984
6 changed files with 4268 additions and 3742 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7346
Makefile.in
View File

File diff suppressed because it is too large Load Diff

112
autoconf_inc.m4
View File

@ -326,48 +326,30 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0[../../samples/dia
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_=""
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_X11[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_X11)
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[../../samples/ipc/ipc.bkl,../../samples/sockets/sockets.bkl,../../tests/test.bkl,wx.bkl] ###
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
@ -650,18 +632,6 @@ dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/
COND_TOOLKIT_MAC=""
fi
AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block 20_COND_TOOLKIT_MAC_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MAC_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MGL[wx.bkl] ###
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
@ -716,6 +686,48 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MSW_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,wx.bkl] ###
COND_TOOLKIT_OSX_CARBON="#"
if test "x$TOOLKIT" = "xOSX_CARBON" ; then
COND_TOOLKIT_OSX_CARBON=""
fi
AC_SUBST(COND_TOOLKIT_OSX_CARBON)
dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_OSX_CARBON_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,wx.bkl] ###
COND_TOOLKIT_OSX_COCOA="#"
if test "x$TOOLKIT" = "xOSX_COCOA" ; then
COND_TOOLKIT_OSX_COCOA=""
fi
AC_SUBST(COND_TOOLKIT_OSX_COCOA)
dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl] ###
COND_TOOLKIT_OSX_IPHONE="#"
if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
COND_TOOLKIT_OSX_IPHONE=""
fi
AC_SUBST(COND_TOOLKIT_OSX_IPHONE)
dnl ### begin block 20_COND_TOOLKIT_PM[wx.bkl] ###
COND_TOOLKIT_PM="#"
if test "x$TOOLKIT" = "xPM" ; then

272
build/bakefiles/files.bkl
View File

@ -199,37 +199,32 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/core/private/strconv_cf.h
</set>
<!-- Base files used by wxMac on OS X -->
<!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC -->
<set var="BASE_MAC_SRC" hints="files">
<!-- Base files used by OS X ports (not Carbon) -->
<set var="BASE_OSX_SHARED_SRC" hints="files">
src/osx/core/mimetype.cpp
$(BASE_COREFOUNDATION_SRC)
$(BASE_UNIX_AND_DARWIN_SRC)
</set>
<set var="BASE_MAC_HDR" hints="files">
<set var="BASE_OSX_SHARED_HDR" hints="files">
$(BASE_COREFOUNDATION_HDR)
$(BASE_UNIX_AND_DARWIN_HDR)
</set>
<!-- Base and GUI files used by OS X -->
<set var="BASE_AND_GUI_MAC_SRC" hints="files">
<set var="BASE_AND_GUI_OSX_CARBON_SRC" hints="files">
src/osx/carbon/utils.cpp
src/osx/carbon/uma.cpp
</set>
<!-- Base files used only by OS X builds -->
<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
$(BASE_MAC_SRC)
$(BASE_UNIX_AND_DARWIN_SRC)
</set>
<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
$(BASE_MAC_HDR)
$(BASE_UNIX_AND_DARWIN_HDR)
<set var="BASE_AND_GUI_OSX_COCOA_SRC" hints="files">
src/osx/cocoa/utils.mm
</set>
<!-- Base files used by non-wxMac OS X builds -->
<set var="BASE_MACOSX_NOTWXMAC_SRC" hints="files">
<set var="BASE_OSX_NOTWXMAC_SRC" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
$(BASE_COREFOUNDATION_SRC)
</set>
<set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
<set var="BASE_OSX_NOTWXMAC_HDR" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
$(BASE_COREFOUNDATION_HDR)
</set>
@ -2155,8 +2150,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxMac -->
<!-- ====================================================================== -->
<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
<set var="OSX_LOWLEVEL_SRC" hints="files">
<!-- Shared wxMac and wxCocoa files -->
<if cond="PLATFORM_MACOSX=='1'">
src/osx/accel.cpp
src/osx/artmac.cpp
src/osx/bmpbuttn_osx.cpp
@ -2205,89 +2201,96 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/core/printmac.cpp
src/osx/core/timer.cpp
src/osx/core/utilsexc_cf.cpp
</if>
</set>
<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
<set var="OSX_LOWLEVEL_HDR" hints="files">
</set>
<set var="MAC_LOWLEVEL_SRC" hints="files">
<if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
<!--
<set var="OSX_LOWLEVEL_SRC" hints="files">
<if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_SRC)</if>
</set>
<set var="MAC_LOWLEVEL_HDR" hints="files">
<if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_HDR)</if>
<set var="OSX_LOWLEVEL_HDR" hints="files">
<if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_HDR)</if>
</set>
-->
<set var="MAC_OSX_SRC" hints="files">
<set var="OSX_CARBON_COCOA_SRC" hints="files">
<if cond="PLATFORM_MACOSX=='1'">
<!-- wxWebKit files -->
src/html/htmlctrl/webkit/webkit.mm
<!-- (TODO Move one level up) -->
<!-- Native color/font dialogs -->
src/osx/carbon/fontdlgosx.mm
src/osx/carbon/colordlgosx.mm
src/osx/carbon/fontdlgosx.mm
<!-- other shared files -->
src/osx/carbon/clipbrd.cpp
src/osx/carbon/cursor.cpp
src/osx/carbon/fontdlg.cpp
src/osx/carbon/gdiobj.cpp
src/osx/carbon/icon.cpp
src/osx/carbon/app.cpp
src/osx/carbon/combobox.cpp
src/osx/carbon/control.cpp
src/osx/carbon/dataobj.cpp
src/osx/carbon/dcclient.cpp
src/osx/carbon/dcprint.cpp
src/osx/carbon/dcscreen.cpp
src/osx/carbon/graphics.cpp
src/osx/carbon/dnd.cpp
src/osx/carbon/font.cpp
src/osx/carbon/frame.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/overlay.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/printdlg.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/settings.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/tabctrl.cpp
src/osx/carbon/tooltip.cpp
<!-- cocoa bridge -->
src/osx/carbon/utilscocoa.mm
</if>
</set>
<set var="MAC_SRC" hints="files">
<set var="OSX_CARBON_SRC" hints="files">
<!-- carbon files -->
src/osx/carbon/app.cpp
$(OSX_CARBON_COCOA_SRC)
src/osx/carbon/bmpbuttn.cpp
src/osx/carbon/button.cpp
src/osx/carbon/checkbox.cpp
src/osx/carbon/choice.cpp
src/osx/carbon/clipbrd.cpp
src/osx/carbon/colordlg.cpp
src/osx/carbon/combobox.cpp
src/osx/carbon/control.cpp
src/osx/carbon/cursor.cpp
src/osx/carbon/dataobj.cpp
src/osx/carbon/dcclient.cpp
src/osx/carbon/dcprint.cpp
src/osx/carbon/dcscreen.cpp
src/osx/carbon/dialog.cpp
src/osx/carbon/dirdlg.cpp
src/osx/carbon/dnd.cpp
src/osx/carbon/evtloop.cpp
src/osx/carbon/filedlg.cpp
src/osx/carbon/font.cpp
src/osx/carbon/fontdlg.cpp
src/osx/carbon/frame.cpp
src/osx/carbon/gauge.cpp
src/osx/carbon/gdiobj.cpp
src/osx/carbon/graphics.cpp
src/osx/carbon/icon.cpp
src/osx/carbon/listbox.cpp
src/osx/carbon/listctrl_mac.cpp
src/osx/carbon/mdi.cpp
src/osx/carbon/menu.cpp
src/osx/carbon/menuitem.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/msgdlg.cpp
src/osx/carbon/nonownedwnd.cpp
src/osx/carbon/notebmac.cpp
src/osx/carbon/overlay.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/printdlg.cpp
src/osx/carbon/radiobut.cpp
src/osx/carbon/region.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/scrolbar.cpp
src/osx/carbon/settings.cpp
src/osx/carbon/slider.cpp
src/osx/carbon/spinbutt.cpp
src/osx/carbon/srchctrl.cpp
src/osx/carbon/statbmp.cpp
src/osx/carbon/statbox.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/statlmac.cpp
src/osx/carbon/stattext.cpp
src/osx/carbon/tabctrl.cpp
src/osx/carbon/textctrl.cpp
src/osx/carbon/tglbtn.cpp
src/osx/carbon/toolbar.cpp
src/osx/carbon/tooltip.cpp
src/osx/carbon/window.cpp
src/html/htmlctrl/webkit/webkit.mm
<!-- Generic implementations used by wxMac: -->
src/generic/caret.cpp
src/generic/clrpickerg.cpp
@ -2303,7 +2306,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
<set var="MAC_CMN_HDR" hints="files">
<set var="OSX_SHARED_HDR" hints="files">
wx/osx/accel.h
wx/osx/app.h
wx/osx/bitmap.h
@ -2384,7 +2387,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/window.h
</set>
<!-- wxMac Carbon header files -->
<set var="MAC_HDR" hints="files">
<set var="OSX_CARBON_HDR" hints="files">
<!-- core files -->
wx/osx/core/colour.h
<!-- carbon files -->
@ -2480,6 +2483,66 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/html/webkit.h
</set>
<!-- ====================================================================== -->
<!-- wxMac/Cocoa -->
<!-- ====================================================================== -->
<set var="OSX_COCOA_SRC" hints="files">
$(OSX_CARBON_COCOA_SRC)
src/osx/cocoa/bmpbuttn.mm
src/osx/cocoa/button.mm
src/osx/cocoa/checkbox.mm
src/osx/cocoa/choice.mm
src/osx/cocoa/dialog.mm
src/osx/cocoa/dirdlg.mm
src/osx/cocoa/evtloop.mm
src/osx/cocoa/filedlg.mm
src/osx/cocoa/gauge.mm
src/osx/cocoa/glcanvas.mm
src/osx/cocoa/listbox.mm
src/osx/cocoa/menu.mm
src/osx/cocoa/menuitem.mm
src/osx/cocoa/msgdlg.mm
src/osx/cocoa/nonownedwnd.mm
src/osx/cocoa/notebook.mm
src/osx/cocoa/radiobut.mm
src/osx/cocoa/scrolbar.mm
src/osx/cocoa/slider.mm
src/osx/cocoa/spinbutt.mm
src/osx/cocoa/srchctrl.mm
src/osx/cocoa/statbox.mm
src/osx/cocoa/statline.mm
src/osx/cocoa/stattext.mm
src/osx/cocoa/textctrl.mm
src/osx/cocoa/tglbtn.mm
src/osx/cocoa/toolbar.mm
src/osx/cocoa/window.mm
src/generic/caret.cpp
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/generic/fdrepdlg.cpp
src/generic/filepickerg.cpp
src/generic/fontdlgg.cpp
src/generic/fontpickerg.cpp
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/regiong.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
</set>
<set var="OSX_COCOA_HDR" hints="files">
</set>
<!-- ====================================================================== -->
<!-- wxMac/iPhone -->
<!-- ====================================================================== -->
<set var="OSX_IPHONE_SRC" hints="files">
src/osx/iphone/nonownedwnd.mm
src/osx/iphone/utils.mm
src/osx/iphone/window.mm
</set>
<!-- ====================================================================== -->
<!-- wxCocoa -->
@ -2909,7 +2972,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/joystick.h
</set>
<set var="ADVANCED_MAC_SRC" hints="files">
<set var="ADVANCED_OSX_CARBON_SRC" hints="files">
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/carbon/aboutdlg.cpp
@ -2920,7 +2983,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/carbon/taskbar.cpp
src/osx/core/hidjoystick.cpp
</set>
<set var="ADVANCED_MAC_HDR" hints="files">
<set var="ADVANCED_OSX_CARBON_HDR" hints="files">
wx/generic/animate.h
wx/osx/dataview.h
wx/osx/joystick.h
@ -2933,12 +2997,38 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/core/joystick.h
</set>
<set var="ADVANCED_OSX_COCOA_SRC" hints="files">
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/cocoa/aboutdlg.mm
<!-- src/osx/carbon/drawer.cpp -->
<!-- src/osx/carbon/dataview.cpp -->
<!-- src/osx/carbon/databrow.cpp -->
<!-- src/osx/carbon/sound.cpp -->
src/osx/carbon/taskbar.cpp
src/osx/core/hidjoystick.cpp
</set>
<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
wx/generic/animate.h
wx/osx/dataview.h
wx/osx/joystick.h
wx/osx/sound.h
<!--wx/osx/carbon/drawer.h -->
<!--wx/osx/carbon/dataview.h -->
<!--wx/osx/carbon/databrow.h -->
wx/osx/carbon/sound.h
wx/osx/carbon/taskbarosx.h
wx/osx/core/joystick.h
</set>
<set var="ADVANCED_COCOA_SRC" hints="files">
src/cocoa/taskbar.mm
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/core/hidjoystick.cpp
</set>
<set var="ADVANCED_COCOA_HDR" hints="files">
wx/cocoa/taskbar.h
wx/generic/animate.h
@ -3044,10 +3134,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
</set>
<set var="MEDIA_MAC_SRC" hints="files">
<set var="MEDIA_OSX_CARBON_SRC" hints="files">
src/osx/carbon/mediactrl.cpp
</set>
<set var="MEDIA_MAC_HDR" hints="files">
<set var="MEDIA_OSX_CARBON_HDR" hints="files">
</set>
<set var="MEDIA_COCOA_SRC" hints="files">
@ -3291,7 +3381,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- ====================================================================== -->
<set var="OPENGL_SRC_PLATFORM" hints="files">
<if cond="TOOLKIT=='MAC'">src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp</if>
<if cond="TOOLKIT=='OSX_CARBON'">src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp</if>
<if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
src/gtk/glcanvas.cpp
@ -3314,7 +3404,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="OPENGL_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MAC'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>
<if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>
<if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
wx/gtk/glcanvas.h
@ -3416,28 +3506,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- Nested if would be nicer, but this works -->
<!-- These are the files for PLATFORM_MACOSX -->
<set var="BASE_MACOSX_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<set var="BASE_OSX_SRC" hints="files">
<if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
<!-- FIXME: a hack because there are two wxBase versions on
Mac; once fixed, this would no longer be needed -->
<if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_SRC)</if>
</set>
<set var="BASE_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
<if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
</set>
<set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(BASE_AND_GUI_OSX_CARBON_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(BASE_AND_GUI_OSX_COCOA_SRC)</if>
</set>
<set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
@ -3449,22 +3541,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- Nested if would be nicer, but this works -->
<!-- These are the files for PLATFORM_MACOSX -->
<set var="BASE_MACOSX_HDR" hints="files">
<if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<set var="BASE_OSX_HDR" hints="files">
<if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
<!-- FIXME: a hack because there are two wxBase versions on
Mac; once fixed, this would no longer be needed -->
<if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_HDR)</if>
</set>
<set var="BASE_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
<if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
@ -3506,7 +3599,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
@ -3519,7 +3613,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
@ -3538,7 +3633,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(OSX_CARBON_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
</set>
@ -3548,7 +3644,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(OSX_SHARED_HDR) $(OSX_CARBON_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
<if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
</set>
@ -3566,7 +3663,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
@ -3578,7 +3676,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ADVANCED_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
@ -3613,7 +3712,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="MEDIA_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
@ -3623,7 +3722,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="MEDIA_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
@ -3666,7 +3765,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(BASE_CMN_HDR)
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
$(BASE_MACOSX_HDR)
$(BASE_OSX_HDR)
$(BASE_PALMOS_HDR)
$(BASE_MSDOS_HDR)
$(NET_CMN_HDR)
@ -3681,12 +3780,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ALL_BASE_SOURCES" make_var="1" hints="files">
$(BASE_CMN_SRC)
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
$(BASE_MAC_SRC)
$(BASE_OSX_SRC)
$(BASE_OS2_SRC)
$(BASE_MSDOS_SRC)
$(BASE_PALMOS_SRC)
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_MAC_SRC)
$(BASE_AND_GUI_OSX_CARBON_SRC)
$(BASE_AND_GUI_OSX_COCOA_SRC)
$(BASE_AND_GUI_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
$(XML_SRC)

4
build/bakefiles/mac_bundles.bkl
View File

@ -29,7 +29,11 @@
<set var="BUNDLE">$(id).app/Contents</set>
<set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
<set var="BUNDLE_TGT_REF">
<!-- TODO Remove Mac -->
<if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(BUNDLE)/PkgInfo</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(BUNDLE)/PkgInfo</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(BUNDLE)/PkgInfo</if>
<if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
</set>

222
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 55019 2008-08-08 02:59:32Z VZ .
# From configure.in Id: configure.in 55464 2008-09-05 08:03:35Z RR .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@ -862,14 +862,10 @@ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
COND_PLATFORM_MACOSX_1
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
COND_PLATFORM_MACOSX_1_TOOLKIT_
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF
COND_PLATFORM_MACOSX_1_TOOLKIT_X11
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_PLATFORM_MACOSX_1_USE_GUI_1
COND_PLATFORM_MACOSX_1_USE_OPENGL_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
@ -917,8 +913,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_USE_GUI_1
COND_TOOLKIT_MAC
COND_TOOLKIT_MAC_USE_GUI_1
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MGL
COND_TOOLKIT_MGL_USE_GUI_1
COND_TOOLKIT_MOTIF
@ -928,6 +922,13 @@ COND_TOOLKIT_MSW
COND_TOOLKIT_MSW_USE_GUI_1
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MSW_WXUNIV_0
COND_TOOLKIT_OSX_CARBON
COND_TOOLKIT_OSX_CARBON_USE_GUI_1
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_OSX_COCOA
COND_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_OSX_IPHONE
COND_TOOLKIT_PM
COND_TOOLKIT_PM_USE_GUI_1
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
@ -1876,7 +1877,9 @@ Optional Packages:
--with-themes=all|list use only the specified comma-separated list of wxUniversal themes
--with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"
--with-motif use Motif/Lesstif
--with-mac use Mac OS X
--with-osx_carbon use Mac OS X (Carbon)
--with-osx_cocoa use Mac OS X (Cocoa)
--with-mac use Mac OS X (Default)
--with-cocoa use Cocoa
--with-wine use Wine
--with-msw use MS-Windows
@ -2594,11 +2597,12 @@ USE_ALPHA=
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB"
ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
DEFAULT_wxUSE_COCOA=0
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MAC=0
DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MICROWIN=0
DEFAULT_wxUSE_MOTIF=0
@ -2609,7 +2613,8 @@ DEFAULT_wxUSE_DFB=0
DEFAULT_DEFAULT_wxUSE_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MAC=0
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_DEFAULT_wxUSE_MGL=0
DEFAULT_DEFAULT_wxUSE_MICROWIN=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
@ -2893,14 +2898,14 @@ _ACEOF
#define TARGET_CARBON 1
_ACEOF
DEFAULT_DEFAULT_wxUSE_MAC=1
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
powerpc-apple-macos* )
USE_UNIX=0
ac_cv_c_bigendian=yes
SO_SUFFIX=shlib
DEFAULT_DEFAULT_wxUSE_MAC=1
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
@ -2937,7 +2942,6 @@ DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ACCESSIBILITY=no
DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
DEFAULT_wxUSE_IPV6=no
DEFAULT_wxUSE_MEDIACTRL=no
DEFAULT_wxUSE_TAB_DIALOG=no
@ -3306,9 +3310,21 @@ if test "${with_motif+set}" = set; then
fi
# Check whether --with-osx_carbon was given.
if test "${with_osx_carbon+set}" = set; then
withval=$with_osx_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
fi
# Check whether --with-osx_cocoa was given.
if test "${with_osx_cocoa+set}" = set; then
withval=$with_osx_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
fi
# Check whether --with-mac was given.
if test "${with_mac+set}" = set; then
withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1
withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
fi
@ -3458,6 +3474,8 @@ echo "${ECHO_T}$result" >&6; }
{ echo "$as_me:$LINENO: checking for toolkit" >&5
echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
# In Wine, we need to default to MSW, not GTK or MOTIF
if test "$wxUSE_WINE" = "yes"; then
DEFAULT_DEFAULT_wxUSE_GTK=0
@ -3498,9 +3516,9 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
done
fi
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
+ ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+ ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+ ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
@ -3547,6 +3565,11 @@ echo "${ECHO_T}base only" >&6; }
fi
fi
wxUSE_MAC=0
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
wxUSE_MAC=1
fi
{ echo "$as_me:$LINENO: checking for --with-libpng" >&5
@ -32504,7 +32527,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
if test "$wxUSE_MAC" = 1; then
if test "$wxUSE_OSX_CARBON" = 1; then
{ echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; }
if test "$GCC" = yes; then
@ -32526,11 +32549,16 @@ echo "${ECHO_T}none" >&6; }
CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
fi
TOOLKIT=MAC
GUIDIST=MACX_DIST
TOOLKIT=OSX_CARBON
GUIDIST=OSX_CARBON_DIST
WXBASEPORT="_carbon"
fi
if test "$wxUSE_OSX_COCOA" = 1; then
TOOLKIT=OSX_COCOA
GUIDIST=OSX_COCOA_DIST
fi
if test "$wxUSE_COCOA" = 1; then
TOOLKIT=COCOA
GUIDIST=COCOA_DIST
@ -33008,7 +33036,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_OSX_CARBON" = 1 -o test "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
@ -44857,7 +44885,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
if test "$TOOLKIT" = "MSW"; then
wxUSE_JOYSTICK=yes
elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
if test "$USE_DARWIN" = 1; then
{ echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5
echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; }
@ -46071,9 +46099,6 @@ _ACEOF
USE_HTML=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
if test "$wxUSE_MAC" = 1; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
fi
fi
if test "$wxUSE_WEBKIT" = "yes"; then
if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
@ -46152,6 +46177,9 @@ _ACEOF
else
wxUSE_WEBKIT=no
fi
if test "$wxUSE_WEBKIT" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
fi
fi
USE_XRC=0
@ -46889,14 +46917,10 @@ if test "$wxUSE_MAC" = 1 ; then
if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
if test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework QuickTime"
else
LDFLAGS="$LDFLAGS -lQuickTimeLib"
fi
fi
if test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System"
else
LDFLAGS="$LDFLAGS -lCarbonLib"
fi
fi
if test "$wxUSE_COCOA" = 1 ; then
@ -47102,7 +47126,11 @@ fi
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
if test "$TOOLKIT" = "MAC"; then
TOOLKIT_LOWERCASE=osx
else
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
fi
@ -49683,44 +49711,24 @@ EOF
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_=""
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1=""
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
@ -49958,16 +49966,6 @@ EOF
COND_TOOLKIT_MAC=""
fi
COND_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MAC_USE_GUI_1=""
fi
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=""
@ -50013,6 +50011,41 @@ EOF
COND_TOOLKIT_MSW_WXUNIV_0=""
fi
COND_TOOLKIT_OSX_CARBON="#"
if test "x$TOOLKIT" = "xOSX_CARBON" ; then
COND_TOOLKIT_OSX_CARBON=""
fi
COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
fi
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_OSX_COCOA="#"
if test "x$TOOLKIT" = "xOSX_COCOA" ; then
COND_TOOLKIT_OSX_COCOA=""
fi
COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_OSX_IPHONE="#"
if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
COND_TOOLKIT_OSX_IPHONE=""
fi
COND_TOOLKIT_PM="#"
if test "x$TOOLKIT" = "xPM" ; then
COND_TOOLKIT_PM=""
@ -50316,7 +50349,7 @@ fi
MACSETFILE="\$(SETFILE)"
if test "$wxUSE_MAC" = 1; then
if test "$wxUSE_OSX_CARBON" = 1; then
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
RESCOMP="$REZ"
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
@ -51689,14 +51722,10 @@ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF!$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
@ -51734,6 +51763,10 @@ COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -51775,18 +51808,12 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
@ -51796,6 +51823,13 @@ COND_TOOLKIT_MSW!$COND_TOOLKIT_MSW$ac_delim
COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim
@ -51871,7 +51905,6 @@ SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -51913,6 +51946,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
RESCOMP!$RESCOMP$ac_delim
RESFLAGS!$RESFLAGS$ac_delim
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
@ -51928,7 +51962,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

54
configure.in
View File

@ -94,13 +94,14 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
dnl the list of all available toolkits
dnl
dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB"
ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
dnl which are either yes or no
DEFAULT_wxUSE_COCOA=0
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MAC=0
DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MICROWIN=0
DEFAULT_wxUSE_MOTIF=0
@ -114,7 +115,8 @@ dnl they're used if no --with-<toolkit> options were given to detect the
dnl toolkit to use by default for the target platform
DEFAULT_DEFAULT_wxUSE_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MAC=0
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_DEFAULT_wxUSE_MGL=0
DEFAULT_DEFAULT_wxUSE_MICROWIN=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
@ -321,7 +323,7 @@ case "${host}" in
AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__)
AC_DEFINE(TARGET_CARBON)
DEFAULT_DEFAULT_wxUSE_MAC=1
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
powerpc-apple-macos* )
@ -333,7 +335,7 @@ case "${host}" in
SO_SUFFIX=shlib
dnl AC_DEFINE(TARGET_CARBON)
dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
DEFAULT_DEFAULT_wxUSE_MAC=1
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
@ -453,7 +455,9 @@ dnl we use AC_ARG_WITH and not WX_ARG_WITH for the toolkit options as they
dnl shouldn't default to wxUSE_ALL_FEATURES
AC_ARG_WITH(gtk, [[ --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(osx_carbon, [ --with-osx_carbon use Mac OS X (Carbon) ], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(osx_cocoa, [ --with-osx_cocoa use Mac OS X (Cocoa) ], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X (Default) ], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(cocoa, [ --with-cocoa use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(wine, [ --with-wine use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
@ -472,6 +476,8 @@ dnl we have a default one
AC_MSG_CHECKING(for toolkit)
# In Wine, we need to default to MSW, not GTK or MOTIF
if test "$wxUSE_WINE" = "yes"; then
DEFAULT_DEFAULT_wxUSE_GTK=0
@ -514,9 +520,9 @@ if test "$wxUSE_GUI" = "yes"; then
dnl we suppose that expr is available (maybe there is a better way to do
dnl this? what about using ALL_TOOLKITS? TODO)
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
+ ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+ ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+ ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
dnl Allow wxUSE_PM only for OS/2 with EMX.
case "${host}" in
@ -557,6 +563,11 @@ else
fi
fi
wxUSE_MAC=0
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
wxUSE_MAC=1
fi
dnl ---------------------------------------------------------------------------
dnl external libraries
dnl ---------------------------------------------------------------------------
@ -3405,7 +3416,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
fi
fi
if test "$wxUSE_MAC" = 1; then
if test "$wxUSE_OSX_CARBON" = 1; then
AC_MSG_CHECKING([for compiler syntax to enable Pascal strings])
if test "$GCC" = yes; then
AC_MSG_RESULT([gcc])
@ -3424,14 +3435,19 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
fi
TOOLKIT=MAC
TOOLKIT=OSX_CARBON
dnl we can't call this MAC_DIST or autoconf thinks its a macro
GUIDIST=MACX_DIST
GUIDIST=OSX_CARBON_DIST
dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
dnl are different, so they need different names:
WXBASEPORT="_carbon"
fi
if test "$wxUSE_OSX_COCOA" = 1; then
TOOLKIT=OSX_COCOA
GUIDIST=OSX_COCOA_DIST
fi
if test "$wxUSE_COCOA" = 1; then
TOOLKIT=COCOA
GUIDIST=COCOA_DIST
@ -3619,7 +3635,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
wxUSE_OPENGL="no"
elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
elif test "$wxUSE_OSX_CARBON" = 1 -o test "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
@ -6874,9 +6890,6 @@ if test "$wxUSE_HTML" = "yes"; then
AC_DEFINE(wxUSE_HTML)
USE_HTML=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
if test "$wxUSE_MAC" = 1; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
fi
fi
if test "$wxUSE_WEBKIT" = "yes"; then
if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
@ -6901,6 +6914,9 @@ if test "$wxUSE_WEBKIT" = "yes"; then
else
wxUSE_WEBKIT=no
fi
if test "$wxUSE_WEBKIT" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
fi
fi
USE_XRC=0
@ -7327,14 +7343,10 @@ if test "$wxUSE_MAC" = 1 ; then
if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
if test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework QuickTime"
else
LDFLAGS="$LDFLAGS -lQuickTimeLib"
fi
fi
if test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System"
else
LDFLAGS="$LDFLAGS -lCarbonLib"
fi
fi
if test "$wxUSE_COCOA" = 1 ; then
@ -7718,7 +7730,7 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
dnl resources are bundled both with shared library and applications
dnl since the carb resource *must* be included in the application
if test "$wxUSE_MAC" = 1; then
if test "$wxUSE_OSX_CARBON" = 1; then
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
RESCOMP="$REZ"
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"