X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36c9f14147f99777449e4bbcc381ccae06d714f5..987355680ae1ff2bfb58cbb18a3c39f2e32282d6:/build/bakefiles/common_samples.bkl diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl index ce049f7410..c63cb21309 100644 --- a/build/bakefiles/common_samples.bkl +++ b/build/bakefiles/common_samples.bkl @@ -3,79 +3,15 @@ <makefile> - <include file="common.bkl"/> - <set var="file_common_samples_included">1</set> - - <!-- =============================================================== --> - <!-- Template for wxWindows samples: --> - <!-- =============================================================== --> - - <if cond="FORMAT=='autoconf'"> - <set var="MACOSX_RESOURCES"> - <if cond="TOOLKIT=='MAC'"> - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r $(SRCDIR)/$(WXTOPDIR)samples/sample.r - </if> - </set> + <if cond="not isdefined('OUT_OF_TREE_MAKEFILES')"> + <set var="OUT_OF_TREE_MAKEFILES">0</set> </if> - <set var="DLLFLAG"> - <if cond="SHARED=='1'">WXUSINGDLL</if> - </set> - - <template id="wx_util_b" template="wx"> - <include>$(SRCDIR)</include> - <define>$(DLLFLAG)</define> - </template> - - <template id="wx_util" template="wx_util_b"> - <app-type>gui</app-type> - <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res> - <include>$(WXTOPDIR)samples</include> <!-- for .rc files --> - <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res> - </template> - - <template id="wx_util_console" template="wx_util_b"> - <app-type>console</app-type> - </template> - - <template id="wx_sample" template="wx_util"> - <if cond="FORMAT=='autoconf'"> - <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> - <__command>$(LF)$(SAMPLES_RPATH_POSTLINK)</__command> - </if> - </template> - <template id="wx_sample_console" template="wx_util_console"> - <if cond="FORMAT=='autoconf'"> - <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> - <__command>$(SAMPLES_RPATH_POSTLINK)</__command> - </if> - </template> - - - <!-- =============================================================== --> - <!-- Support for samples data files: --> - <!-- =============================================================== --> - - <define-rule name="wx-data" extends="copy-files"> - <template> - <dependency-of>all</dependency-of> - <dstdir>$(BUILDDIR)</dstdir> - <srcdir>$(SRCDIR)</srcdir> - </template> - - <!-- - VS - FIXME: - Don't clean the files because it would wipe out sources files if - BUILDDIR==SRCDIR. This is same behaviour as in the old build system, - but it would be better to delete the files during "make clean" if - BUILDDIR!=SRCDIR. - - <define-tag name="files"> - <clean-files> - $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()])) - </clean-files> - </define-tag> - --> - </define-rule> + <if cond="OUT_OF_TREE_MAKEFILES=='1'"> + <include file="common_samples_outoftree.bkl"/> + </if> + <if cond="OUT_OF_TREE_MAKEFILES=='0'"> + <include file="common_samples_intree.bkl"/> + </if> </makefile>