silence bakefile warnings about the generation of project files for sample bakefiles using <wx-data>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
928f1a076c
commit
586235b181
@ -4,7 +4,7 @@
|
|||||||
<makefile>
|
<makefile>
|
||||||
|
|
||||||
<include file="common.bkl"/>
|
<include file="common.bkl"/>
|
||||||
|
|
||||||
<!-- =============================================================== -->
|
<!-- =============================================================== -->
|
||||||
<!-- Template for wxWidgets samples: -->
|
<!-- Template for wxWidgets samples: -->
|
||||||
<!-- =============================================================== -->
|
<!-- =============================================================== -->
|
||||||
@ -20,12 +20,12 @@
|
|||||||
<set var="DLLFLAG">
|
<set var="DLLFLAG">
|
||||||
<if cond="SHARED=='1'">WXUSINGDLL</if>
|
<if cond="SHARED=='1'">WXUSINGDLL</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<template id="wx_util_b" template="wx">
|
<template id="wx_util_b" template="wx">
|
||||||
<include>$(SRCDIR)</include>
|
<include>$(SRCDIR)</include>
|
||||||
<define>$(DLLFLAG)</define>
|
<define>$(DLLFLAG)</define>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template id="wx_util" template="wx_util_b">
|
<template id="wx_util" template="wx_util_b">
|
||||||
<app-type>gui</app-type>
|
<app-type>gui</app-type>
|
||||||
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
|
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
|
||||||
@ -37,7 +37,7 @@
|
|||||||
<res-include>$(RCDEFDIR)</res-include>
|
<res-include>$(RCDEFDIR)</res-include>
|
||||||
<res-include>$(TOP_SRCDIR)include</res-include>
|
<res-include>$(TOP_SRCDIR)include</res-include>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
|
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
|
||||||
<if cond="FORMAT=='autoconf'">
|
<if cond="FORMAT=='autoconf'">
|
||||||
<wx-os2-lib-resource/>
|
<wx-os2-lib-resource/>
|
||||||
@ -48,12 +48,12 @@
|
|||||||
<define>NOPCH</define>
|
<define>NOPCH</define>
|
||||||
</if>
|
</if>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template id="wx_util_console" template="wx_util_b">
|
<template id="wx_util_console" template="wx_util_b">
|
||||||
<app-type>console</app-type>
|
<app-type>console</app-type>
|
||||||
<define>wxUSE_GUI=0</define>
|
<define>wxUSE_GUI=0</define>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template id="wx_sample" template="wx_util">
|
<template id="wx_sample" template="wx_util">
|
||||||
<if cond="FORMAT=='autoconf'">
|
<if cond="FORMAT=='autoconf'">
|
||||||
<wx-mac-app-bundle/>
|
<wx-mac-app-bundle/>
|
||||||
@ -67,35 +67,45 @@
|
|||||||
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
|
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
|
||||||
</if>
|
</if>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
||||||
<!-- =============================================================== -->
|
<!-- =============================================================== -->
|
||||||
<!-- Support for samples data files: -->
|
<!-- Support for samples data files: -->
|
||||||
<!-- =============================================================== -->
|
<!-- =============================================================== -->
|
||||||
|
|
||||||
<define-rule name="wx-data" extends="copy-files">
|
<if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
|
||||||
<template>
|
<define-rule name="wx-data" extends="copy-files">
|
||||||
<dependency-of>all</dependency-of>
|
<template>
|
||||||
<dstdir>$(BUILDDIR)</dstdir>
|
<dependency-of>all</dependency-of>
|
||||||
<srcdir>$(SRCDIR)</srcdir>
|
<dstdir>$(BUILDDIR)</dstdir>
|
||||||
</template>
|
<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>
|
||||||
|
<if cond="FORMAT_SUPPORTS_ACTIONS=='0'">
|
||||||
|
<!-- empty stub for project-files formats which don't support <command> -->
|
||||||
|
<define-rule name="wx-data" extends="action">
|
||||||
|
<define-tag name="dstdir"/>
|
||||||
|
<define-tag name="srcdir"/>
|
||||||
|
<define-tag name="files"/>
|
||||||
|
</define-rule>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
|
||||||
<!--
|
|
||||||
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: -->
|
<!-- Misc platform specialities: -->
|
||||||
<!-- =============================================================== -->
|
<!-- =============================================================== -->
|
||||||
@ -108,7 +118,7 @@
|
|||||||
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
|
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
|
||||||
compiler):
|
compiler):
|
||||||
-->
|
-->
|
||||||
<define-tag name="wx-os2-lib-resource" rules="exe">
|
<define-tag name="wx-os2-lib-resource" rules="exe">
|
||||||
<set var="os2_lib_res">
|
<set var="os2_lib_res">
|
||||||
<if cond="PLATFORM_OS2=='1'">
|
<if cond="PLATFORM_OS2=='1'">
|
||||||
$(TOP_SRCDIR)include/wx/os2/wx.res
|
$(TOP_SRCDIR)include/wx/os2/wx.res
|
||||||
@ -117,5 +127,5 @@
|
|||||||
<set var="__objects" append="1">$(os2_lib_res)</set>
|
<set var="__objects" append="1">$(os2_lib_res)</set>
|
||||||
</define-tag>
|
</define-tag>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
</makefile>
|
</makefile>
|
||||||
|
Loading…
Reference in New Issue
Block a user