X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e54bb212fb448d9f9e450e1456f846d5f681e525..c5172ed1bf56c880c4ae928eae4da21c402a2ba3:/build/bakefiles/common_samples.bkl diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl index 4fd44dd3cd..f9a5e3da58 100644 --- a/build/bakefiles/common_samples.bkl +++ b/build/bakefiles/common_samples.bkl @@ -13,7 +13,7 @@ <if cond="FORMAT=='autoconf'"> <set var="MACOSX_RESOURCES"> <if cond="TOOLKIT=='MAC'"> - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r $(WXTOPDIR)samples/sample.r + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r </if> </set> </if> @@ -30,6 +30,7 @@ <template id="wx_util" template="wx_util_b"> <app-type>gui</app-type> <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res> + <include>$(SRCDIR)/$(WXTOPDIR)samples</include> <!-- for .rc files --> <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res> </template> @@ -38,10 +39,17 @@ </template> <template id="wx_sample" template="wx_util"> - <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> + <if cond="FORMAT=='autoconf'"> + <wx-mac-app-bundle/> + <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> + <__command>$(LF)$(SAMPLES_RPATH_POSTLINK)</__command> + </if> </template> <template id="wx_sample_console" template="wx_util_console"> - <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> + <if cond="FORMAT=='autoconf'"> + <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> + <__command>$(SAMPLES_RPATH_POSTLINK)</__command> + </if> </template> @@ -71,4 +79,8 @@ --> </define-rule> + <if cond="FORMAT=='autoconf'"> + <include file="mac_bundles.bkl"/> + </if> + </makefile>