Remove additional macOS helper generation from makefiles
These additional helper bundles where only required with older CEF versions
This commit is contained in:
Tobias Taschner
parent
073589ad6c
commit
ca6d2d2601
7 changed files with 201 additions and 432 deletions
|
|
@ -290,7 +290,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.b
|
|||
COND_MONOLITHIC_0_USE_WEBVIEW_1=""
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_1)
|
||||
dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1[../../samples/caret/caret.bkl,../../samples/dragimag/dragimag.bkl,../../samples/regtest/regtest.bkl] ###
|
||||
dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1[../../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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/minimal/minimal.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/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
|
||||
COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
|
||||
COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1=""
|
||||
|
|
@ -350,7 +350,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
|
|||
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/minimal/minimal.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/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/demos.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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/html_samples.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/minimal/minimal.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/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1=""
|
||||
|
|
@ -362,6 +362,12 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0[../../sa
|
|||
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_SHARED_1[../../samples/webview/webview.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$SHARED" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_SHARED_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
|
||||
|
|
@ -440,6 +446,12 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
|
|||
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1[../../samples/webview/webview.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_OS2_1[../../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/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/minimal/minimal.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/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
|
||||
COND_PLATFORM_OS2_1="#"
|
||||
if test "x$PLATFORM_OS2" = "x1" ; then
|
||||
|
|
@ -452,7 +464,7 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../de
|
|||
COND_PLATFORM_UNIX_0=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_0)
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/minimal/minimal.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/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/demos.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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/html_samples.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/minimal/minimal.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/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
COND_PLATFORM_UNIX_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1=""
|
||||
|
|
@ -524,7 +536,7 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bk
|
|||
COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4)
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/minimal/minimal.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/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/demos.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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/html_samples.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/minimal/minimal.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/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
COND_PLATFORM_WIN32_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1=""
|
||||
|
|
@ -1094,6 +1106,12 @@ dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demo
|
|||
COND_USE_THREADS_1=""
|
||||
fi
|
||||
AC_SUBST(COND_USE_THREADS_1)
|
||||
dnl ### begin block 20_COND_USE_WEBVIEW_CHROMIUM_1[../../samples/webview/webview.bkl] ###
|
||||
COND_USE_WEBVIEW_CHROMIUM_1="#"
|
||||
if test "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
|
||||
COND_USE_WEBVIEW_CHROMIUM_1=""
|
||||
fi
|
||||
AC_SUBST(COND_USE_WEBVIEW_CHROMIUM_1)
|
||||
dnl ### begin block 20_COND_USE_WEBVIEW_WEBKIT2_1[../../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/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.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/minimal/minimal.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/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.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/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
COND_USE_WEBVIEW_WEBKIT2_1="#"
|
||||
if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then
|
||||
|
|
|
|||
|
|
@ -17,12 +17,14 @@ NM = @NM@
|
|||
BK_DEPS = @BK_DEPS@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
DLLPREFIX = @DLLPREFIX@
|
||||
LIBS = @LIBS@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
VENDOR = @VENDOR@
|
||||
WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
|
|
@ -43,7 +45,9 @@ wx_top_builddir = @wx_top_builddir@
|
|||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 3.1
|
||||
WX_RELEASE_NODOT = 31
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
|
||||
LIBDIRNAME = $(wx_top_builddir)/lib
|
||||
WEBVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
|
|
@ -52,43 +56,60 @@ WEBVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
|||
WEBVIEW_OBJECTS = \
|
||||
webview_webview.o \
|
||||
$(__webview___win32rc)
|
||||
WEBVIEW_CHROMIUM_HELPER_CXXFLAGS = -I$(top_srcdir)//3rdparty/cef $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
WEBVIEW_CHROMIUM_HELPER_OBJECTS = \
|
||||
webview_chromium_helper_cef_process_helper.o
|
||||
WEBVIEW_CHROMIUM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
|
||||
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
|
||||
-DwxWEBVIEW_SAMPLE_CHROMIUM -I$(top_srcdir)//3rdparty/cef $(CXXWARNINGS) \
|
||||
$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
||||
WEBVIEW_CHROMIUM_OBJECTS = \
|
||||
webview_chromium_webview.o \
|
||||
$(__webview_chromium___win32rc)
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
||||
COND_PLATFORM_MACOSX_1_LIBCEF_FRAMEWORK = \
|
||||
-F$(top_srcdir)/3rdparty/cef/Release/ -framework Chromium\ Embedded\ \
|
||||
Framework
|
||||
@COND_PLATFORM_MACOSX_1@LIBCEF_FRAMEWORK = $(COND_PLATFORM_MACOSX_1_LIBCEF_FRAMEWORK)
|
||||
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@COMPILER_VERSION \
|
||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = \
|
||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
|
||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
|
||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION)
|
||||
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
|
||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
|
||||
@COND_BUILD_debug@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
|
||||
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
|
||||
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
|
||||
@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
|
||||
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
|
||||
@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
|
||||
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
|
||||
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
|
||||
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
|
||||
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
|
||||
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
|
||||
@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
|
||||
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
|
||||
@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL
|
||||
COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \
|
||||
grep -q pmwin.763 ; then emxbind -ep webview$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__webview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___webview___os2_emxbindcmd)
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_PLATFORM_MACOSX_1@__webview_app_Contents_PkgInfo___depname \
|
||||
@COND_PLATFORM_MACOSX_1@ = webview.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@__webview_bundle___depname = webview_bundle
|
||||
@COND_TOOLKIT_COCOA@____webview_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_COCOA@ $(__webview_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_MAC@____webview_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_MAC@ $(__webview_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_CARBON@____webview_BUNDLE_TGT_REF_DEP \
|
||||
|
|
@ -97,8 +118,56 @@ COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \
|
|||
@COND_TOOLKIT_OSX_COCOA@ = $(__webview_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_IPHONE@____webview_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = $(__webview_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_COCOA@____webview_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_COCOA@ $(__webview_app_Contents_PkgInfo___depname)
|
||||
@COND_PLATFORM_WIN32_1@__webview___win32rc = webview_sample_rc.o
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__webview_chromium_helper___depname \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ webview_chromium_helper$(EXEEXT)
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__fix_cef_link___depname \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = fix_cef_link
|
||||
@COND_USE_WEBVIEW_CHROMIUM_1@__webview_chromium___depname \
|
||||
@COND_USE_WEBVIEW_CHROMIUM_1@ = webview_chromium$(EXEEXT)
|
||||
COND_PLATFORM_OS2_1___webview_chromium___os2_emxbindcmd = $(NM) \
|
||||
webview_chromium$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
|
||||
webview_chromium$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__webview_chromium___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___webview_chromium___os2_emxbindcmd)
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__webview_chromium_app_Contents_PkgInfo___depname \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ webview_chromium.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__webview_chromium_bundle___depname \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = webview_chromium_bundle
|
||||
@COND_TOOLKIT_COCOA@____webview_chromium_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_COCOA@ = \
|
||||
@COND_TOOLKIT_COCOA@ $(__webview_chromium_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_MAC@____webview_chromium_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_MAC@ = $(__webview_chromium_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_CARBON@____webview_chromium_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_CARBON@ = \
|
||||
@COND_TOOLKIT_OSX_CARBON@ $(__webview_chromium_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_COCOA@____webview_chromium_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_COCOA@ = \
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(__webview_chromium_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_IPHONE@____webview_chromium_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ $(__webview_chromium_app_Contents_PkgInfo___depname)
|
||||
@COND_PLATFORM_WIN32_1@__webview_chromium___win32rc \
|
||||
@COND_PLATFORM_WIN32_1@ = webview_chromium_sample_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__package___depname = package
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@__copy_and_correct_webviewchromium___depname \
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@ = copy_and_correct_webviewchromium
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
|
||||
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
|
||||
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
|
||||
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
|
||||
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
|
||||
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
|
||||
@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI
|
||||
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
|
||||
@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0_USE_WEBVIEW_1@__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p)
|
||||
|
|
@ -114,7 +183,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
|||
COND_MONOLITHIC_0___WXLIB_BASE_p = \
|
||||
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
|
||||
@COND_PLATFORM_WIN32_1@__webview___win32rc = webview_sample_rc.o
|
||||
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
||||
|
|
@ -137,10 +205,22 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
|
|||
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
|
||||
@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
|
||||
@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_PLATFORM_MACOSX_1@__LIBCEF_WRAPPER_PATH_p = \
|
||||
@COND_PLATFORM_MACOSX_1@ -L$(top_srcdir)//3rdparty/cef/libcef_dll_wrapper/
|
||||
@COND_PLATFORM_UNIX_1@__LIBCEF_WRAPPER_PATH_p = \
|
||||
@COND_PLATFORM_UNIX_1@ -L$(top_srcdir)//3rdparty/cef/libcef_dll_wrapper/
|
||||
@COND_PLATFORM_WIN32_1@__LIBCEF_WRAPPER_PATH_p = \
|
||||
@COND_PLATFORM_WIN32_1@ -L$(top_srcdir)//3rdparty/cef/libcef_dll_wrapper/Release/
|
||||
@COND_PLATFORM_MACOSX_1@__LIBCEF_NAME_p =
|
||||
@COND_PLATFORM_UNIX_1@__LIBCEF_NAME_p = -lcef
|
||||
@COND_PLATFORM_WIN32_1@__LIBCEF_NAME_p = -llibcef
|
||||
@COND_PLATFORM_MACOSX_1@__LIBCEF_DLL_WRAPPER_NAME_p = -lcef_dll_wrapper
|
||||
@COND_PLATFORM_UNIX_1@__LIBCEF_DLL_WRAPPER_NAME_p = -lcef_dll_wrapper
|
||||
@COND_PLATFORM_WIN32_1@__LIBCEF_DLL_WRAPPER_NAME_p = -llibcef_dll_wrapper
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: webview$(EXEEXT) $(__webview_bundle___depname)
|
||||
all: webview$(EXEEXT) $(__webview_bundle___depname) $(__webview_chromium_helper___depname) $(__fix_cef_link___depname) $(__webview_chromium___depname) $(__webview_chromium_bundle___depname) $(__package___depname) $(__copy_and_correct_webviewchromium___depname)
|
||||
|
||||
install:
|
||||
|
||||
|
|
@ -153,6 +233,10 @@ clean:
|
|||
rm -f ./*.o
|
||||
rm -f webview$(EXEEXT)
|
||||
rm -rf webview.app
|
||||
rm -f webview_chromium_helper$(EXEEXT)
|
||||
rm -rf webview_chromium_helper.app
|
||||
rm -f webview_chromium$(EXEEXT)
|
||||
rm -rf webview_chromium.app
|
||||
|
||||
distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
|
@ -183,14 +267,88 @@ webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
|
|||
|
||||
@COND_PLATFORM_MACOSX_1@webview_bundle: $(____webview_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_chromium_helper$(EXEEXT): $(WEBVIEW_CHROMIUM_HELPER_OBJECTS)
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(CXX) -o $@ $(WEBVIEW_CHROMIUM_HELPER_OBJECTS) -L$(top_srcdir)//3rdparty/cef/Release/ $(__LIBCEF_WRAPPER_PATH_p) $(LIBCEF_FRAMEWORK) $(LDFLAGS) $(__LIBCEF_NAME_p) $(__LIBCEF_DLL_WRAPPER_NAME_p) $(LIBS)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@fix_cef_link:
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium_helper.app
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium_helper.app/Contents/MacOS
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium_helper.app/Contents/Resources
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ sed -e "s/\$${PRODUCT_NAME}/webview_chromium Helper/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${EXECUTABLE_NAME}/webview_chromium Helper/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(top_srcdir)//samples/webview/mac/helper-Info.plist >webview_chromium_helper.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ /bin/echo "APPL????" >webview_chromium_helper.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ install_name_tool -change "@executable_path/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ webview_chromium_helper
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f webview_chromium_helper webview_chromium_helper.app/Contents/MacOS/webview_chromium\ Helper
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f $(top_srcdir)//src/osx/carbon/wxmac.icns webview_chromium_helper.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_USE_WEBVIEW_CHROMIUM_1@webview_chromium$(EXEEXT): $(WEBVIEW_CHROMIUM_OBJECTS) $(__webview_chromium___win32rc)
|
||||
@COND_USE_WEBVIEW_CHROMIUM_1@ $(CXX) -o $@ $(WEBVIEW_CHROMIUM_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBCEF_FRAMEWORK) -Wl,-rpath,. -L$(top_srcdir)//3rdparty/cef/Release/ $(__LIBCEF_WRAPPER_PATH_p) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIBCEF_NAME_p) $(__LIBCEF_DLL_WRAPPER_NAME_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
@COND_USE_WEBVIEW_CHROMIUM_1@ $(__webview_chromium___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_chromium.app/Contents/PkgInfo: $(__webview_chromium___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/MacOS
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/Resources
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/EXECUTABLE/webview_chromium/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/VERSION/$(WX_VERSION)/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >webview_chromium.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ /bin/echo "APPL????" >webview_chromium.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ ln -f webview_chromium$(EXEEXT) webview_chromium.app/Contents/MacOS/webview_chromium
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns webview_chromium.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_chromium_bundle: $(____webview_chromium_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@package: $(__webview_chromium_helper___depname)
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p webview_chromium.app/Contents/Frameworks/
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app
|
||||
@COND_PLATFORM_MACOSX_1@ cp -Rf $(top_srcdir)//3rdparty/cef/Release//Chromium\ Embedded\ Framework.framework webview_chromium.app/Contents/Frameworks/
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ install_name_tool -change "@executable_path/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1@ "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1@ webview_chromium.app/Contents/MacOS/webview_chromium
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ cp -Rf webview_chromium_helper.app/ webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app/
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@copy_and_correct_webviewchromium: $(__package___depname)
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@ cp $(wx_top_builddir)/lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG).dylib webview_chromium.app/Contents/Frameworks/
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@ cp $(wx_top_builddir)/lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG).dylib webview_chromium.app/Contents/Frameworks/
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@ install_name_tool -change "@executable_path/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@ "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1@ $(wx_top_builddir)/lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG).dylib
|
||||
|
||||
webview_webview.o: $(srcdir)/webview.cpp
|
||||
$(CXXC) -c -o $@ $(WEBVIEW_CXXFLAGS) $(srcdir)/webview.cpp
|
||||
|
||||
webview_sample_rc.o: $(srcdir)/../sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
|
||||
|
||||
webview_chromium_helper_cef_process_helper.o: $(srcdir)/cef_process_helper.cpp
|
||||
$(CXXC) -c -o $@ $(WEBVIEW_CHROMIUM_HELPER_CXXFLAGS) $(srcdir)/cef_process_helper.cpp
|
||||
|
||||
webview_chromium_webview.o: $(srcdir)/webview.cpp
|
||||
$(CXXC) -c -o $@ $(WEBVIEW_CHROMIUM_CXXFLAGS) $(srcdir)/webview.cpp
|
||||
|
||||
webview_chromium_sample_rc.o: $(srcdir)/../sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define wxWEBVIEW_SAMPLE_CHROMIUM --include-dir $(top_srcdir)//3rdparty/cef
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include ./.deps/*.d
|
||||
|
||||
.PHONY: all install uninstall clean distclean webview_bundle
|
||||
.PHONY: all install uninstall clean distclean webview_bundle \
|
||||
webview_chromium_bundle
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
// Copyright (c) 2008-2013 Marshall A. Greenblatt. Portions Copyright (c)
|
||||
// 2006-2009 Google Inc. All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the name Chromium Embedded
|
||||
// Framework nor the names of its contributors may be used to endorse
|
||||
// or promote products derived from this software without specific prior
|
||||
// written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
Files in this directory have been copied from other locations in the Chromium
|
||||
Emebedded Framework source tree. They have been minimal modified to work in
|
||||
wxWidgets. Below is a list of original file locations in CEF:
|
||||
|
||||
<cef_src>/tools/make_more_helper.sh
|
||||
<cef_src>/tools/change_mach_o_flags.sh
|
||||
|
|
@ -1,273 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
# Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
"""Usage: change_mach_o_flags.py [--executable-heap] [--no-pie] <executablepath>
|
||||
|
||||
Arranges for the executable at |executable_path| to have its data (heap)
|
||||
pages protected to prevent execution on Mac OS X 10.7 ("Lion"), and to have
|
||||
the PIE (position independent executable) bit set to enable ASLR (address
|
||||
space layout randomization). With --executable-heap or --no-pie, the
|
||||
respective bits are cleared instead of set, making the heap executable or
|
||||
disabling PIE/ASLR.
|
||||
|
||||
This script is able to operate on thin (single-architecture) Mach-O files
|
||||
and fat (universal, multi-architecture) files. When operating on fat files,
|
||||
it will set or clear the bits for each architecture contained therein.
|
||||
|
||||
NON-EXECUTABLE HEAP
|
||||
|
||||
Traditionally in Mac OS X, 32-bit processes did not have data pages set to
|
||||
prohibit execution. Although user programs could call mprotect and
|
||||
mach_vm_protect to deny execution of code in data pages, the kernel would
|
||||
silently ignore such requests without updating the page tables, and the
|
||||
hardware would happily execute code on such pages. 64-bit processes were
|
||||
always given proper hardware protection of data pages. This behavior was
|
||||
controllable on a system-wide level via the vm.allow_data_exec sysctl, which
|
||||
is set by default to 1. The bit with value 1 (set by default) allows code
|
||||
execution on data pages for 32-bit processes, and the bit with value 2
|
||||
(clear by default) does the same for 64-bit processes.
|
||||
|
||||
In Mac OS X 10.7, executables can "opt in" to having hardware protection
|
||||
against code execution on data pages applied. This is done by setting a new
|
||||
bit in the |flags| field of an executable's |mach_header|. When
|
||||
MH_NO_HEAP_EXECUTION is set, proper protections will be applied, regardless
|
||||
of the setting of vm.allow_data_exec. See xnu-1699.22.73/osfmk/vm/vm_map.c
|
||||
override_nx and xnu-1699.22.73/bsd/kern/mach_loader.c load_machfile.
|
||||
|
||||
The Apple toolchain has been revised to set the MH_NO_HEAP_EXECUTION when
|
||||
producing executables, provided that -allow_heap_execute is not specified
|
||||
at link time. Only linkers shipping with Xcode 4.0 and later (ld64-123.2 and
|
||||
later) have this ability. See ld64-123.2.1/src/ld/Options.cpp
|
||||
Options::reconfigureDefaults() and
|
||||
ld64-123.2.1/src/ld/HeaderAndLoadCommands.hpp
|
||||
HeaderAndLoadCommandsAtom<A>::flags().
|
||||
|
||||
This script sets the MH_NO_HEAP_EXECUTION bit on Mach-O executables. It is
|
||||
intended for use with executables produced by a linker that predates Apple's
|
||||
modifications to set this bit itself. It is also useful for setting this bit
|
||||
for non-i386 executables, including x86_64 executables. Apple's linker only
|
||||
sets it for 32-bit i386 executables, presumably under the assumption that
|
||||
the value of vm.allow_data_exec is set in stone. However, if someone were to
|
||||
change vm.allow_data_exec to 2 or 3, 64-bit x86_64 executables would run
|
||||
without hardware protection against code execution on data pages. This
|
||||
script can set the bit for x86_64 executables, guaranteeing that they run
|
||||
with appropriate protection even when vm.allow_data_exec has been tampered
|
||||
with.
|
||||
|
||||
POSITION-INDEPENDENT EXECUTABLES/ADDRESS SPACE LAYOUT RANDOMIZATION
|
||||
|
||||
This script sets or clears the MH_PIE bit in an executable's Mach-O header,
|
||||
enabling or disabling position independence on Mac OS X 10.5 and later.
|
||||
Processes running position-independent executables have varying levels of
|
||||
ASLR protection depending on the OS release. The main executable's load
|
||||
address, shared library load addresess, and the heap and stack base
|
||||
addresses may be randomized. Position-independent executables are produced
|
||||
by supplying the -pie flag to the linker (or defeated by supplying -no_pie).
|
||||
Executables linked with a deployment target of 10.7 or higher have PIE on
|
||||
by default.
|
||||
|
||||
This script is never strictly needed during the build to enable PIE, as all
|
||||
linkers used are recent enough to support -pie. However, it's used to
|
||||
disable the PIE bit as needed on already-linked executables.
|
||||
"""
|
||||
|
||||
import optparse
|
||||
import os
|
||||
import struct
|
||||
import sys
|
||||
|
||||
|
||||
# <mach-o/fat.h>
|
||||
FAT_MAGIC = 0xcafebabe
|
||||
FAT_CIGAM = 0xbebafeca
|
||||
|
||||
# <mach-o/loader.h>
|
||||
MH_MAGIC = 0xfeedface
|
||||
MH_CIGAM = 0xcefaedfe
|
||||
MH_MAGIC_64 = 0xfeedfacf
|
||||
MH_CIGAM_64 = 0xcffaedfe
|
||||
MH_EXECUTE = 0x2
|
||||
MH_PIE = 0x00200000
|
||||
MH_NO_HEAP_EXECUTION = 0x01000000
|
||||
|
||||
|
||||
class MachOError(Exception):
|
||||
"""A class for exceptions thrown by this module."""
|
||||
|
||||
pass
|
||||
|
||||
|
||||
def CheckedSeek(file, offset):
|
||||
"""Seeks the file-like object at |file| to offset |offset| and raises a
|
||||
MachOError if anything funny happens."""
|
||||
|
||||
file.seek(offset, os.SEEK_SET)
|
||||
new_offset = file.tell()
|
||||
if new_offset != offset:
|
||||
raise MachOError, \
|
||||
'seek: expected offset %d, observed %d' % (offset, new_offset)
|
||||
|
||||
|
||||
def CheckedRead(file, count):
|
||||
"""Reads |count| bytes from the file-like |file| object, raising a
|
||||
MachOError if any other number of bytes is read."""
|
||||
|
||||
bytes = file.read(count)
|
||||
if len(bytes) != count:
|
||||
raise MachOError, \
|
||||
'read: expected length %d, observed %d' % (count, len(bytes))
|
||||
|
||||
return bytes
|
||||
|
||||
|
||||
def ReadUInt32(file, endian):
|
||||
"""Reads an unsinged 32-bit integer from the file-like |file| object,
|
||||
treating it as having endianness specified by |endian| (per the |struct|
|
||||
module), and returns it as a number. Raises a MachOError if the proper
|
||||
length of data can't be read from |file|."""
|
||||
|
||||
bytes = CheckedRead(file, 4)
|
||||
|
||||
(uint32,) = struct.unpack(endian + 'I', bytes)
|
||||
return uint32
|
||||
|
||||
|
||||
def ReadMachHeader(file, endian):
|
||||
"""Reads an entire |mach_header| structure (<mach-o/loader.h>) from the
|
||||
file-like |file| object, treating it as having endianness specified by
|
||||
|endian| (per the |struct| module), and returns a 7-tuple of its members
|
||||
as numbers. Raises a MachOError if the proper length of data can't be read
|
||||
from |file|."""
|
||||
|
||||
bytes = CheckedRead(file, 28)
|
||||
|
||||
magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags = \
|
||||
struct.unpack(endian + '7I', bytes)
|
||||
return magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags
|
||||
|
||||
|
||||
def ReadFatArch(file):
|
||||
"""Reads an entire |fat_arch| structure (<mach-o/fat.h>) from the file-like
|
||||
|file| object, treating it as having endianness specified by |endian|
|
||||
(per the |struct| module), and returns a 5-tuple of its members as numbers.
|
||||
Raises a MachOError if the proper length of data can't be read from
|
||||
|file|."""
|
||||
|
||||
bytes = CheckedRead(file, 20)
|
||||
|
||||
cputype, cpusubtype, offset, size, align = struct.unpack('>5I', bytes)
|
||||
return cputype, cpusubtype, offset, size, align
|
||||
|
||||
|
||||
def WriteUInt32(file, uint32, endian):
|
||||
"""Writes |uint32| as an unsinged 32-bit integer to the file-like |file|
|
||||
object, treating it as having endianness specified by |endian| (per the
|
||||
|struct| module)."""
|
||||
|
||||
bytes = struct.pack(endian + 'I', uint32)
|
||||
assert len(bytes) == 4
|
||||
|
||||
file.write(bytes)
|
||||
|
||||
|
||||
def HandleMachOFile(file, options, offset=0):
|
||||
"""Seeks the file-like |file| object to |offset|, reads its |mach_header|,
|
||||
and rewrites the header's |flags| field if appropriate. The header's
|
||||
endianness is detected. Both 32-bit and 64-bit Mach-O headers are supported
|
||||
(mach_header and mach_header_64). Raises MachOError if used on a header that
|
||||
does not have a known magic number or is not of type MH_EXECUTE. The
|
||||
MH_PIE and MH_NO_HEAP_EXECUTION bits are set or cleared in the |flags| field
|
||||
according to |options| and written to |file| if any changes need to be made.
|
||||
If already set or clear as specified by |options|, nothing is written."""
|
||||
|
||||
CheckedSeek(file, offset)
|
||||
magic = ReadUInt32(file, '<')
|
||||
if magic == MH_MAGIC or magic == MH_MAGIC_64:
|
||||
endian = '<'
|
||||
elif magic == MH_CIGAM or magic == MH_CIGAM_64:
|
||||
endian = '>'
|
||||
else:
|
||||
raise MachOError, \
|
||||
'Mach-O file at offset %d has illusion of magic' % offset
|
||||
|
||||
CheckedSeek(file, offset)
|
||||
magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags = \
|
||||
ReadMachHeader(file, endian)
|
||||
assert magic == MH_MAGIC or magic == MH_MAGIC_64
|
||||
if filetype != MH_EXECUTE:
|
||||
raise MachOError, \
|
||||
'Mach-O file at offset %d is type 0x%x, expected MH_EXECUTE' % \
|
||||
(offset, filetype)
|
||||
|
||||
original_flags = flags
|
||||
|
||||
if options.no_heap_execution:
|
||||
flags |= MH_NO_HEAP_EXECUTION
|
||||
else:
|
||||
flags &= ~MH_NO_HEAP_EXECUTION
|
||||
|
||||
if options.pie:
|
||||
flags |= MH_PIE
|
||||
else:
|
||||
flags &= ~MH_PIE
|
||||
|
||||
if flags != original_flags:
|
||||
CheckedSeek(file, offset + 24)
|
||||
WriteUInt32(file, flags, endian)
|
||||
|
||||
|
||||
def HandleFatFile(file, options, fat_offset=0):
|
||||
"""Seeks the file-like |file| object to |offset| and loops over its
|
||||
|fat_header| entries, calling HandleMachOFile for each."""
|
||||
|
||||
CheckedSeek(file, fat_offset)
|
||||
magic = ReadUInt32(file, '>')
|
||||
assert magic == FAT_MAGIC
|
||||
|
||||
nfat_arch = ReadUInt32(file, '>')
|
||||
|
||||
for index in xrange(0, nfat_arch):
|
||||
cputype, cpusubtype, offset, size, align = ReadFatArch(file)
|
||||
assert size >= 28
|
||||
|
||||
# HandleMachOFile will seek around. Come back here after calling it, in
|
||||
# case it sought.
|
||||
fat_arch_offset = file.tell()
|
||||
HandleMachOFile(file, options, offset)
|
||||
CheckedSeek(file, fat_arch_offset)
|
||||
|
||||
|
||||
def main(me, args):
|
||||
parser = optparse.OptionParser('%prog [options] <executable_path>')
|
||||
parser.add_option('--executable-heap', action='store_false',
|
||||
dest='no_heap_execution', default=True,
|
||||
help='Clear the MH_NO_HEAP_EXECUTION bit')
|
||||
parser.add_option('--no-pie', action='store_false',
|
||||
dest='pie', default=True,
|
||||
help='Clear the MH_PIE bit')
|
||||
(options, loose_args) = parser.parse_args(args)
|
||||
if len(loose_args) != 1:
|
||||
parser.print_usage()
|
||||
return 1
|
||||
|
||||
executable_path = loose_args[0]
|
||||
executable_file = open(executable_path, 'rb+')
|
||||
|
||||
magic = ReadUInt32(executable_file, '<')
|
||||
if magic == FAT_CIGAM:
|
||||
# Check FAT_CIGAM and not FAT_MAGIC because the read was little-endian.
|
||||
HandleFatFile(executable_file, options)
|
||||
elif magic == MH_MAGIC or magic == MH_CIGAM or \
|
||||
magic == MH_MAGIC_64 or magic == MH_CIGAM_64:
|
||||
HandleMachOFile(executable_file, options)
|
||||
else:
|
||||
raise MachOError, '%s is not a Mach-O or fat file' % executable_file
|
||||
|
||||
executable_file.close()
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main(sys.argv[0], sys.argv[1:]))
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Modify from cef/tools/make_more_helpers.sh to adjust Makefile builds.
|
||||
# Remove in-build BUILT_PRODUCTS_DIR, CONTENTS_FOLDER_PATH variables.
|
||||
# Usage: make_more_helpers.sh <app_directory> <app_name>
|
||||
|
||||
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
# Usage: make_more_helpers.sh <directory_within_contents> <app_name>
|
||||
#
|
||||
# This script creates additional helper .app bundles for Chromium, based on
|
||||
# the existing helper .app bundle, changing their Mach-O header's flags to
|
||||
# enable and disable various features. Based on Chromium Helper.app, it will
|
||||
# create Chromium Helper EH.app, which has the MH_NO_HEAP_EXECUTION bit
|
||||
# cleared to support Chromium child processes that require an executable heap,
|
||||
# and Chromium Helper NP.app, which has the MH_PIE bit cleared to support
|
||||
# Chromium child processes that cannot tolerate ASLR.
|
||||
#
|
||||
# This script expects to be called from the chrome_exe target as a postbuild,
|
||||
# and operates directly within the built-up browser app's versioned directory.
|
||||
#
|
||||
# Each helper is adjusted by giving it the proper bundle name, renaming the
|
||||
# executable, adjusting several Info.plist keys, and changing the executable's
|
||||
# Mach-O flags.
|
||||
|
||||
set -eu
|
||||
|
||||
make_helper() {
|
||||
local containing_dir="${1}"
|
||||
local app_name="${2}"
|
||||
local feature="${3}"
|
||||
local flags="${4}"
|
||||
|
||||
local helper_name="${app_name} Helper"
|
||||
local helper_stem="${containing_dir}/${helper_name}"
|
||||
local original_helper="${helper_stem}.app"
|
||||
if [[ ! -d "${original_helper}" ]]; then
|
||||
echo "${0}: error: ${original_helper} is a required directory" >& 2
|
||||
exit 1
|
||||
fi
|
||||
local original_helper_exe="${original_helper}/Contents/MacOS/${helper_name}"
|
||||
if [[ ! -f "${original_helper_exe}" ]]; then
|
||||
echo "${0}: error: ${original_helper_exe} is a required file" >& 2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local feature_helper="${helper_stem} ${feature}.app"
|
||||
|
||||
rsync -acC --delete --include '*.so' "${original_helper}/" "${feature_helper}"
|
||||
|
||||
local helper_feature="${helper_name} ${feature}"
|
||||
local helper_feature_exe="${feature_helper}/Contents/MacOS/${helper_feature}"
|
||||
mv "${feature_helper}/Contents/MacOS/${helper_name}" "${helper_feature_exe}"
|
||||
|
||||
local change_flags="$(dirname "${0}")/change_mach_o_flags.py"
|
||||
"${change_flags}" ${flags} "${helper_feature_exe}"
|
||||
|
||||
local feature_info="${feature_helper}/Contents/Info"
|
||||
local feature_info_plist="${feature_info}.plist"
|
||||
|
||||
defaults write "${feature_info}" "CFBundleDisplayName" "${helper_feature}"
|
||||
defaults write "${feature_info}" "CFBundleExecutable" "${helper_feature}"
|
||||
|
||||
cfbundleid="$(defaults read "${feature_info}" "CFBundleIdentifier")"
|
||||
feature_cfbundleid="${cfbundleid}.${feature}"
|
||||
defaults write "${feature_info}" "CFBundleIdentifier" "${feature_cfbundleid}"
|
||||
|
||||
cfbundlename="$(defaults read "${feature_info}" "CFBundleName")"
|
||||
feature_cfbundlename="${cfbundlename} ${feature}"
|
||||
defaults write "${feature_info}" "CFBundleName" "${feature_cfbundlename}"
|
||||
|
||||
# As usual, defaults might have put the plist into whatever format excites
|
||||
# it, but Info.plists get converted back to the expected XML format.
|
||||
plutil -convert xml1 "${feature_info_plist}"
|
||||
|
||||
# `defaults` also changes the file permissions, so make the file
|
||||
# world-readable again.
|
||||
chmod a+r "${feature_info_plist}"
|
||||
}
|
||||
|
||||
if [[ ${#} -ne 2 ]]; then
|
||||
echo "usage: ${0} <directory_within_contents> <app_name>" >& 2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#DIRECTORY_WITHIN_CONTENTS="${1}"
|
||||
APP_NAME="${2}"
|
||||
|
||||
#CONTENTS_DIR="${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}"
|
||||
#CONTAINING_DIR="${CONTENTS_DIR}/${DIRECTORY_WITHIN_CONTENTS}"
|
||||
CONTAINING_DIR="${1}"
|
||||
|
||||
make_helper "${CONTAINING_DIR}" "${APP_NAME}" "EH" "--executable-heap"
|
||||
make_helper "${CONTAINING_DIR}" "${APP_NAME}" "NP" "--no-pie"
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
</if>
|
||||
</exe>
|
||||
|
||||
<exe id="webview_chromium_helper" cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
|
||||
<exe id="webview_chromium_helper" cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT[:3] != 'msv'">
|
||||
<sources>
|
||||
cef_process_helper.cpp
|
||||
</sources>
|
||||
|
|
@ -98,8 +98,6 @@
|
|||
|
||||
<!--Copy helper app-->
|
||||
cp -Rf webview_chromium_helper.app/ webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app/
|
||||
$(TOP_SRCDIR)/samples/webview/mac/tools/make_more_helpers.sh $(wx_top_builddir)/samples/webview/webview_chromium.app/Contents/Frameworks \
|
||||
webview_chromium
|
||||
</command>
|
||||
</add-target>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue