X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fd4bec3461d6adf369dc31d4b40f408a657f6d0..7c3f702506c52162aa913bdf26ba180c7107c705:/build/bakefiles/common_samples.bkl?ds=sidebyside diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl index af2928f0b2..c63cb21309 100644 --- a/build/bakefiles/common_samples.bkl +++ b/build/bakefiles/common_samples.bkl @@ -3,119 +3,15 @@ <makefile> - <include file="common.bkl"/> - <set var="file_common_samples_included">1</set> - - <!-- =============================================================== --> - <!-- Template for wxWidgets samples: --> - <!-- =============================================================== --> - - <if cond="FORMAT=='autoconf'"> - <set var="MACOSX_RESOURCES"> - <if cond="TOOLKIT=='MAC'"> - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r 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> - <!-- resource files includes: --> - <include>$(SRCDIR)/$(WXTOPDIR)samples</include> - <!-- this include is not added via <include> for autoconf, see - common.bkl: --> - <res-include cond="FORMAT=='autoconf'"> - $(TOP_SRCDIR)include - </res-include> - - <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res> - <if cond="FORMAT=='autoconf'"> - <wx-os2-lib-resource/> - </if> - - <!-- FIXME: temporary, until bakefile can reuse existing pch files --> - <if cond="FORMAT!='autoconf'"> - <define>NOPCH</define> - </if> - </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'"> - <wx-mac-app-bundle/> - <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> - <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command> - </if> - </template> - <template id="wx_sample_console" template="wx_util_console"> - <if cond="FORMAT=='autoconf'"> - <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> - <postlink-command>$(SAMPLES_RPATH_POSTLINK)</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> - - - <!-- =============================================================== --> - <!-- Misc platform specialities: --> - <!-- =============================================================== --> - - <if cond="FORMAT=='autoconf'"> - <include file="mac_bundles.bkl"/> - - <!-- - A hack to include precompiled OS/2 resource file in apps instead of - compiling it from .rc file (gcc on OS/2 doesn't ship with resource - compiler): - --> - <define-tag name="wx-os2-lib-resource" rules="exe"> - <set var="os2_lib_res"> - <if cond="PLATFORM_OS2=='1'"> - $(TOP_SRCDIR)include/wx/os2/wx.res - </if> - </set> - <set var="__objects" append="1">$(os2_lib_res)</set> - </define-tag> + <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>