Removed no longer needed mac subfolder in webview sample
This commit is contained in:
Tobias Taschner
parent
f8f93a9cab
commit
16a1c03388
6 changed files with 65 additions and 119 deletions
|
|
@ -122,6 +122,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1[wx.bkl
|
|||
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1=""
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1)
|
||||
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1[wx.bkl] ###
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1=""
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1)
|
||||
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1[wx.bkl] ###
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
|
||||
|
|
@ -194,6 +200,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1[wx.bkl
|
|||
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1=""
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1)
|
||||
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1[wx.bkl] ###
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1=""
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1)
|
||||
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1[wx.bkl] ###
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
|
||||
|
|
@ -290,7 +302,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[../../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] ###
|
||||
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,wx.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=""
|
||||
|
|
@ -362,12 +374,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=""
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1[../../samples/webview/webview.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$SHARED" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_SHARED_1)
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_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
|
||||
|
|
|
|||
28
configure
vendored
28
configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.1.
|
||||
# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.2.
|
||||
#
|
||||
# Report bugs to <wx-dev@googlegroups.com>.
|
||||
#
|
||||
|
|
@ -580,8 +580,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='wxWidgets'
|
||||
PACKAGE_TARNAME='wxwidgets'
|
||||
PACKAGE_VERSION='3.1.1'
|
||||
PACKAGE_STRING='wxWidgets 3.1.1'
|
||||
PACKAGE_VERSION='3.1.2'
|
||||
PACKAGE_STRING='wxWidgets 3.1.2'
|
||||
PACKAGE_BUGREPORT='wx-dev@googlegroups.com'
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
|
@ -794,7 +794,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
|
|||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1
|
||||
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
|
||||
COND_PLATFORM_MACOSX_1
|
||||
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
|
||||
|
|
@ -1969,7 +1969,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures wxWidgets 3.1.1 to adapt to many kinds of systems.
|
||||
\`configure' configures wxWidgets 3.1.2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -2038,7 +2038,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of wxWidgets 3.1.1:";;
|
||||
short | recursive ) echo "Configuration of wxWidgets 3.1.2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -2504,7 +2504,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
wxWidgets configure 3.1.1
|
||||
wxWidgets configure 3.1.2
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -3321,7 +3321,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by wxWidgets $as_me 3.1.1, which was
|
||||
It was created by wxWidgets $as_me 3.1.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -3784,7 +3784,7 @@ fi
|
|||
|
||||
wx_major_version_number=3
|
||||
wx_minor_version_number=1
|
||||
wx_release_number=1
|
||||
wx_release_number=2
|
||||
wx_subrelease_number=0
|
||||
|
||||
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
|
||||
|
|
@ -40911,9 +40911,9 @@ EOF
|
|||
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$SHARED" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1=""
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$SHARED" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
|
|
@ -42343,7 +42343,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by wxWidgets $as_me 3.1.1, which was
|
||||
This file was extended by wxWidgets $as_me 3.1.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -42409,7 +42409,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
wxWidgets config.status 3.1.1
|
||||
wxWidgets config.status 3.1.2
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -151,9 +151,11 @@ COND_PLATFORM_OS2_1___webview_chromium___os2_emxbindcmd = $(NM) \
|
|||
@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_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__package___depname \
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = package
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1@__copy_and_correct_webviewchromium___depname \
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1@ = \
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_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
|
||||
|
|
@ -276,7 +278,7 @@ webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
|
|||
@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@ $(top_srcdir)//samples/webview/cef_helper_info.plist.in >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" \
|
||||
|
|
@ -311,25 +313,25 @@ webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
|
|||
|
||||
@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_USE_WEBVIEW_CHROMIUM_1@package: $(__webview_chromium_helper___depname)
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/Frameworks/
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -Rf $(top_srcdir)//3rdparty/cef/Release//Chromium\ Embedded\ Framework.framework webview_chromium.app/Contents/Frameworks/
|
||||
@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@
|
||||
@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.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 -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
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1@copy_and_correct_webviewchromium: $(__package___depname)
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_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_USE_WEBVIEW_CHROMIUM_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_USE_WEBVIEW_CHROMIUM_1@ install_name_tool -change "@executable_path/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1@ "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \
|
||||
@COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_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
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.wxwidgets.webviewChromium.helper</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>${PRODUCT_NAME}</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>LSFileQuarantineEnabled</key>
|
||||
<true/>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.5.0</string>
|
||||
<key>LSUIElement</key>
|
||||
<string>1</string>
|
||||
<key>NSSupportsAutomaticGraphicsSwitching</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>$(PRODUCT_NAME) version 3.1.0, (c) 2005-2014 wxWidgets</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>wxmac.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.wxwidgets.samples.$(PRODUCT_NAME:rfc1034identifier)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>de</string>
|
||||
<string>en</string>
|
||||
<string>fr</string>
|
||||
<string>it</string>
|
||||
</array>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string>3.1.0, (c) 2005-2014 wxWidgets</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>3.1.0</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright 2005-2015 wxWidgets</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>wxNSApplication</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -19,7 +19,8 @@
|
|||
</if>
|
||||
</exe>
|
||||
|
||||
<exe id="webview_chromium_helper" cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT[:3] != 'msv'">
|
||||
<exe id="webview_chromium_helper"
|
||||
cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT[:3] != 'msv'">
|
||||
<sources>
|
||||
cef_process_helper.cpp
|
||||
</sources>
|
||||
|
|
@ -32,7 +33,7 @@
|
|||
<ldflags>$(LIBCEF_FRAMEWORK)</ldflags>
|
||||
</if>
|
||||
<add-target target="fix_cef_link" type="action"
|
||||
cond="target and PLATFORM_MACOSX=='1'">
|
||||
cond="target and PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
|
||||
<dependency-of>all</dependency-of>
|
||||
<command>
|
||||
<!--make helper app bundle -->
|
||||
|
|
@ -41,7 +42,7 @@
|
|||
mkdir -p webview_chromium_helper.app/Contents/Resources
|
||||
sed -e "s/\$${PRODUCT_NAME}/webview_chromium Helper/" \
|
||||
-e "s/\$${EXECUTABLE_NAME}/webview_chromium Helper/" \
|
||||
$(TOP_SRCDIR)/samples/webview/mac/helper-Info.plist >webview_chromium_helper.app/Contents/Info.plist
|
||||
$(TOP_SRCDIR)/samples/webview/cef_helper_info.plist.in >webview_chromium_helper.app/Contents/Info.plist
|
||||
/bin/echo "APPL????" >webview_chromium_helper.app/Contents/PkgInfo
|
||||
<!--Fix CEF link path -->
|
||||
install_name_tool -change "@executable_path/Chromium Embedded Framework" \
|
||||
|
|
@ -51,7 +52,7 @@
|
|||
cp -f $(TOP_SRCDIR)/src/osx/carbon/wxmac.icns webview_chromium_helper.app/Contents/Resources/wxmac.icns
|
||||
</command>
|
||||
</add-target>
|
||||
<modify-target target="clean" cond="PLATFORM_MACOSX=='1'">
|
||||
<modify-target target="clean" cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
|
||||
<command>rm -rf $(id).app</command>
|
||||
</modify-target>
|
||||
</exe>
|
||||
|
|
@ -83,7 +84,8 @@
|
|||
</if>
|
||||
<win32-res>../sample.rc</win32-res>
|
||||
|
||||
<add-target target="package" type="action" cond="PLATFORM_MACOSX=='1'">
|
||||
<add-target target="package" type="action"
|
||||
cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
|
||||
<depends>webview_chromium_helper</depends>
|
||||
<dependency-of>all</dependency-of>
|
||||
<command>
|
||||
|
|
@ -105,7 +107,8 @@
|
|||
1. Copy webview_chromium library to webview_chromium.app/Contents/Frameworks/
|
||||
2. correct the CEF Frameworks executable path of webview_chromium library.
|
||||
-->
|
||||
<add-target target="copy_and_correct_webviewchromium" type="action" cond="PLATFORM_MACOSX=='1' and SHARED=='1'">
|
||||
<add-target target="copy_and_correct_webviewchromium" type="action"
|
||||
cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1' and SHARED=='1'">
|
||||
<depends>package</depends>
|
||||
<dependency-of>all</dependency-of>
|
||||
<set var="webviewdll">$(DLLPREFIX)$(wxwin.mkDllName("webview")).dylib</set>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue