upgrade to bakefile-0.1.4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-04-06 09:34:56 +00:00
parent 79f8a0d85f
commit a63d2334f2
5 changed files with 4 additions and 97 deletions

View File

@ -3,11 +3,7 @@
<makefile>
<requires version="0.1.3"/>
<!-- FIXME: remove this kludge when upgraded to 0.1.4: -->
<if cond="BAKEFILE_VERSION=='0.1.3'">
<define-tag name="pic" rules="exe,dll,lib,module"/>
</if>
<requires version="0.1.4"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
@ -305,15 +301,6 @@ InputPath=..\include\wx\msw\$(vc_setup_h)
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
<!-- FIXME: temporary kludge! remove after upgrade to 0.1.4 -->
<if cond="FORMAT=='msvc6prj'">
<set var="__custom_build_files">
$(_custom_build_files)
</set>
<set var="__custom_build_include_wx_msw_setup_h">
$(_custom_build_include_wx_msw_setup_h)
</set>
</if>
</if>
</define-tag>

View File

@ -1,80 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<!--
Contains rule definitions that Bakefile requires in every format, implemented
as empty stubs. This is used by our private formats that don't generate real
makefiles, e.g. wx24dsp or rpmspec ones.
-->
<makefile>
<include file="win32.bkl"/>
<set var="CC">cc</set>
<set var="CXX">c++</set>
<set var="CPPFLAGS"/>
<set var="CFLAGS"/>
<set var="CXXFLAGS"/>
<set var="LDFLAGS"/>
<define-rule name="__fake">
<template>
<__fake_hook/>
</template>
<define-tag name="app-type"/>
<define-tag name="sources"/>
<define-tag name="libname"/>
<define-tag name="dllname"/>
<define-tag name="dirname"/>
<define-tag name="dependency-of"/>
<define-tag name="debug-info"/>
<define-tag name="debug-runtime-libs"/>
<define-tag name="runtime-libs"/>
<define-tag name="optimize"/>
<define-tag name="warnings"/>
<define-tag name="threading"/>
<define-tag name="cxx-rtti"/>
<define-tag name="cxx-exceptions"/>
<define-tag name="cppflags"/>
<define-tag name="cflags"/>
<define-tag name="cxxflags"/>
<define-tag name="ldflags"/>
<define-tag name="ldlibs"/>
<define-tag name="define"/>
<define-tag name="include"/>
<define-tag name="install-to"/>
<define-tag name="install-if"/>
<define-tag name="installable"/>
<define-tag name="dir"/>
<define-tag name="lib-path"/>
<define-tag name="precomp-headers"/>
<define-tag name="precomp-headers-gen"/>
<define-tag name="precomp-headers-header"/>
<define-tag name="precomp-headers-file"/>
<define-tag name="precomp-headers-exclude"/>
<define-tag name="version"/>
<define-tag name="so_version"/>
<define-tag name="mac_version"/>
<define-tag name="depends"/>
<define-tag name="objects-depend"/>
<define-tag name="sys-lib"/>
<define-tag name="library"/>
<define-tag name="command"/>
<define-tag name="mac-res"/>
<define-tag name="win32-res"/>
<define-tag name="is-phony"/>
<define-tag name="__fake_hook"/>
</define-rule>
<define-rule name="exe" extends="__fake"/>
<define-rule name="dll" extends="__fake"/>
<define-rule name="module" extends="__fake"/>
<define-rule name="lib" extends="__fake"/>
<define-rule name="action" extends="__fake"/>
<define-rule name="phony" extends="__fake"/>
<define-rule name="subproject" extends="__fake"/>
</makefile>

View File

@ -3,7 +3,7 @@
<makefile>
<include file="__fake.bkl"/>
<include file="presets/fake.bkl"/>
<set var="COMPILER">vc</set>

View File

@ -3,7 +3,7 @@
<makefile>
<include file="__fake.bkl"/>
<include file="presets/fake.bkl"/>
<set var="COMPILER">gcc</set>
<set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>

View File

@ -5,7 +5,7 @@
<include file="win32.bkl"/>
<set var="COMPILER">vc</set>
<include file="__fake.bkl"/>
<include file="presets/fake.bkl"/>
<set var="ALL_SOURCES" eval="0">
$(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)