AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. more borland work

Browse Source 
2. added optimization and debug info flags


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-06-27 19:22:12 +00:00
parent 4843dc4cda
commit cdc0282e61
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build/bakefiles/common.bkl
View File

@ -61,9 +61,16 @@
<if cond="WXUNIV=='1'">__WXUNIVERSAL__</if> <if cond="WXUNIV=='1'">__WXUNIVERSAL__</if>
</set> </set>
<set var="WXNAMEPREFIX">wx</set> <if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set> <set var="WXNAMEPREFIX">wx</set>
<set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set> <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="WXNAMEPREFIX">wx$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<set var="WXVERSIONTAG"></set>
</if>
<set var="TOOLCHAIN_NAME"> <set var="TOOLCHAIN_NAME">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR) $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
@ -101,11 +108,24 @@
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Templates for libs: --> <!-- Templates for libs: -->
<!-- =============================================================== --> <!-- =============================================================== -->
<set var="DEBUGFLAG">
<if cond="BUILD=='debug'">on</if>
<if cond="BUILD=='release'">off</if>
</set>
<set var="OPTIMIZEFLAG">
<if cond="BUILD=='debug'">speed</if>
<if cond="BUILD=='release'">off</if>
</set>
<template id="anylib"> <template id="anylib">
<depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends> <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
<dirname>$(LIBDIRNAME)</dirname> <dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to> <install-to>$(LIBDIR)</install-to>
<debug-info>$(DEBUGFLAG)</debug-info>
<optimize>$(OPTIMIZEFLAG)</optimize>
<threading>multi</threading>
</template> </template>
@ -125,13 +145,13 @@
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Templates for wxWindows libs: --> <!-- Templates for wxWindows libs: -->
<!-- =============================================================== --> <!-- =============================================================== -->
<template id="wx"> <template id="wx">
<set var="wxid">$(wxwin.mk_wxid(id))</set> <set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define> <define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define> <define>$(WXUNIV_DEFINE)</define>
<include>$(TOP_SRCDIR)include</include> <include>$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path> <lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include> <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
<include>$(INC_TIFF)</include> <include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include> <include>$(INC_JPEG)</include>
@ -155,6 +175,8 @@
<template id="wx_lib_b" template="wx,anylib"> <template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set> <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname> <libname>$(WXLIBNAME)</libname>
<precomp-headers>on</precomp-headers>
<precomp-headers-file>wxprec</precomp-headers-file>
</template> </template>
<template id="wx_dll_b" template="wx_lib_b"> <template id="wx_dll_b" template="wx_lib_b">

6
build/bakefiles/common_samples.bkl
View File

@ -15,12 +15,18 @@
</if> </if>
</set> </set>
</if> </if>
<set var="DLLFLAG">
<if cond="SHARED=='1'">WXUSINGDLL</if>
</set>
<template id="wx_sample" template="wx"> <template id="wx_sample" template="wx">
<include>$(SRCDIR)</include> <include>$(SRCDIR)</include>
<!-- Always link against the wxWin library in monolithic build: --> <!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib> <sys-lib>$(WXLIB_MONO)</sys-lib>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags> <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<define>$(DLLFLAG)</define>
<app-type>gui</app-type>
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res> <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
</template> </template>

5
build/bakefiles/config.bkl
View File

@ -72,7 +72,10 @@
<set var="SAMPLES_RPATH_FLAG"/> <set var="SAMPLES_RPATH_FLAG"/>
<option name="EXTRALIBS"/> <option name="EXTRALIBS"/>
<set var="SRCDIR">..</set> <set var="SRCDIR">
<if cond="BUILDING_LIB=='1'">..</if>
<if cond="BUILDING_LIB=='0'">.</if>
</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set> <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
<set var="BUILDDIR">objs_$(COMPILER)</set> <set var="BUILDDIR">objs_$(COMPILER)</set>
</if> </if>

2
build/bakefiles/files.bkl
View File

@ -868,6 +868,8 @@
<set var="MSW_LOWLEVEL_HDR"> <set var="MSW_LOWLEVEL_HDR">
</set> </set>
<set var="MSW_SRC"> <set var="MSW_SRC">
src/generic/statusbr.cpp
src/msw/uxtheme.cpp
src/msw/ole/access.cpp src/msw/ole/access.cpp
src/msw/accel.cpp src/msw/accel.cpp
src/msw/bmpbuttn.cpp src/msw/bmpbuttn.cpp