solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix webviewchromium sample bakefile for non autoconf format

Browse source
This commit is contained in:
Tobias Taschner 2018-02-24 20:30:11 +01:00
parent 16a1c03388
commit dfbd83dc50
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
samples/webview/webview.bkl
View file

@ -20,7 +20,7 @@
</exe>
<exe id="webview_chromium_helper"
cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT[:3] != 'msv'">
cond="FORMAT=='autoconf' and PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT[:3] != 'msv'">
<sources>
cef_process_helper.cpp
</sources>
@ -33,7 +33,7 @@
<ldflags>$(LIBCEF_FRAMEWORK)</ldflags>
</if>
<add-target target="fix_cef_link" type="action"
cond="target and PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
cond="target and FORMAT=='autoconf' and PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
<dependency-of>all</dependency-of>
<command>
<!--make helper app bundle -->
@ -52,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' and USE_WEBVIEW_CHROMIUM=='1'">
<modify-target target="clean" cond="FORMAT=='autoconf' and PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
<command>rm -rf $(id).app</command>
</modify-target>
</exe>
@ -62,7 +62,7 @@
build the sample either.
-->
<exe id="webview_chromium" template="wx_sample" template_append="wx_append"
cond="USE_WEBVIEW_CHROMIUM=='1' and FORMAT[:3] != 'msv'">
cond="FORMAT=='autoconf' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT[:3] != 'msv'">
<sources>
webview.cpp
</sources>
@ -85,7 +85,7 @@
<win32-res>../sample.rc</win32-res>
<add-target target="package" type="action"
cond="PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
cond="FORMAT=='autoconf' and PLATFORM_MACOSX=='1' and USE_WEBVIEW_CHROMIUM=='1'">
<depends>webview_chromium_helper</depends>
<dependency-of>all</dependency-of>
<command>
@ -108,7 +108,7 @@
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 USE_WEBVIEW_CHROMIUM=='1' and SHARED=='1'">
cond="FORMAT=='autoconf' and 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>