solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

removed duplicated code and really fixed setup.h problems in regex.lib

Browse source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-02-01 22:41:33 +00:00
parent cb979facf3
commit cb9548d9a7
3 changed files with 203 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

35
build/bakefiles/regex.bkl
View file

@ -1,39 +1,8 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
</set>
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="FORMAT=='msvc6prj'">
<msvc-project-files>
$(addPrefixToList('include\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
</define-tag>
<define-tag name="msvc-copy-setup-h" rules="dll,lib">
<if cond="FORMAT=='msvc6prj'">
<msvc-headers>wx/msw/setup.h</msvc-headers>
<set var="__custom_build_files" append="1">
include\wx\msw\setup.h
</set>
<set var="__custom_build_include_wx_msw_setup_h">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
</if>
</define-tag>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_REGEX"/>
</if>
@ -47,7 +16,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="3rdparty_lib"
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>