Specify CEF Framework link in bakefile system instead configure.

Add CEF framework link in configure will cause each binary builds with
CEF framework path option. We only need to link CEF framework on
building webview library.
This commit is contained in:
Haojian Wu 2014-07-19 17:20:40 +08:00 committed by Tobias Taschner
parent 500eb4754b
commit a119eaee7f
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
3 changed files with 8 additions and 5 deletions

View file

@ -606,4 +606,10 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
</if>
</set>
<set var="LIBCEF_FRAMEWORK">
<if cond="PLATFORM_MACOSX=='1'">
-F$(TOP_SRCDIR)cef/Release/ -framework Chromium\ Embedded\ framework
</if>
</set>
</makefile>

View file

@ -191,6 +191,7 @@
<lib-path>$(LIBCEF_WRAPPER_PATH)</lib-path>
<sys-lib>$(LIBCEF_NAME)</sys-lib>
<sys-lib>$(LIBCEF_DLL_WRAPPER_NAME)</sys-lib>
<ldflags>$(LIBCEF_FRAMEWORK)</ldflags>>
</dll>
<lib id="webviewlib" template="wx_lib"

View file

@ -7223,10 +7223,6 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
wxUSE_WEBVIEW="yes"
AC_DEFINE(wxUSE_WEBVIEW_IE)
fi
elif test "$wxUSE_WEBVIEW_CHROMIUM" = "yes"; then
if "$wxUSE_MAC" = 1; then
CEF_LINK="$EXTRA_FRAMEWORKS -F\\$(top_srcdir)cef/Debug -framework Chromium\ Embedded\ framework"
fi
fi
fi
@ -7859,7 +7855,7 @@ EXTRALIBS_HTML="$MSPACK_LINK"
EXTRALIBS_MEDIA="$GST_LIBS"
EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK $CEF_LINK`
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK`
fi
if test "$wxUSE_OPENGL" = "yes"; then
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"