projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include wx/msw/metafile.h when wxUSE_WIN_METAFILES_ALWAYS==1
[wxWidgets.git]
/
build
/
bakefiles
/
common.bkl
diff --git
a/build/bakefiles/common.bkl
b/build/bakefiles/common.bkl
index 0222f6dee184596a70cdd50566fc4298fdcea797..4f885e79e482fdaa0c13a54448a252193ad182f6 100644
(file)
--- a/
build/bakefiles/common.bkl
+++ b/
build/bakefiles/common.bkl
@@
-130,7
+130,7
@@
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
</set>
<set var="WXLIB_MEDIA">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
</set>
<set var="WXLIB_MEDIA">
- <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
+ <if cond="MONOLITHIC=='0'
and USE_MEDIA=='1'
">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
</set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
</set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
@@
-149,6
+149,9
@@
<set var="WXLIB_DBGRID">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
</set>
<set var="WXLIB_DBGRID">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
</set>
+ <set var="WXLIB_AUI">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
+ </set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@@
-161,7
+164,9
@@
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+ <if cond="TARGET_CPU=='amd64'">_amd64</if>
<if cond="TARGET_CPU=='AMD64'">_amd64</if>
<if cond="TARGET_CPU=='AMD64'">_amd64</if>
+ <if cond="TARGET_CPU=='ia64'">_ia64</if>
<if cond="TARGET_CPU=='IA64'">_ia64</if>
</set>
<if cond="TARGET_CPU=='IA64'">_ia64</if>
</set>
@@
-275,7
+280,9
@@
</set>
<set var="LINK_TARGET_CPU">
</set>
<set var="LINK_TARGET_CPU">
+ <if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
+ <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
</set>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
</set>
@@
-302,6
+309,7
@@
<if cond="FORMAT=='msvc'">
<ldflags>$(LINK_TARGET_CPU)</ldflags>
</if>
<if cond="FORMAT=='msvc'">
<ldflags>$(LINK_TARGET_CPU)</ldflags>
</if>
+ <include cond="FORMAT=='msevc4prj'">$(TOP_SRCDIR)build/wince/missing</include>
</template>
<template id="anylib">
</template>
<template id="anylib">
@@
-400,6
+408,7
@@
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<msvc-headers-setup-h>
msw/genrcdefs.h
</msvc-headers-setup-h>
<msvc-headers-setup-h>
msw/genrcdefs.h
</msvc-headers-setup-h>
+ <!-- FIXME: we need another way to get the compiler name -->
<set var="VC_COMPILER">
<if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
<if cond="FORMAT!='msevc4prj'">cl</if>
<set var="VC_COMPILER">
<if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
<if cond="FORMAT!='msevc4prj'">cl</if>
@@
-449,6
+458,13
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
+ <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
+ <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
+ <set var="MGLPMLIBPATH">
+ <if cond="DOS32=='DOS4GW'">dos4gw</if>
+ </set>
+ </if>
+
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
@@
-462,6
+478,10
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
+ <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
+ <lib-path>$(MGLLIBPATH)</lib-path>
+ <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
+ </if>
<warnings>max</warnings>
<cppflags-watcom>
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
<warnings>max</warnings>
<cppflags-watcom>
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
@@
-477,9
+497,6
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base_nomono">
<!-- link against builtin 3rd party libs, if needed: -->
<!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base_nomono">
<!-- link against builtin 3rd party libs, if needed: -->
- <sys-lib>$(LIB_TIFF)</sys-lib>
- <sys-lib>$(LIB_JPEG)</sys-lib>
- <sys-lib>$(LIB_PNG)</sys-lib>
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
@@
-494,6
+511,13
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
</if>
</if>
</if>
</if>
+ <!-- system libraries on mgl: -->
+ <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
+ <sys-lib>mgl</sys-lib>
+ <sys-lib>mglcpp</sys-lib>
+ <sys-lib>pm</sys-lib>
+ </if>
+
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
@@
-524,7
+548,7
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
- <if cond="FORMAT=='
msvc' or FORMAT=='msvc6prj' or FORMAT=='
borland'">
+ <if cond="FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
<if cond="FORMAT!='msevc4prj'">
<sys-lib>oleacc</sys-lib>
</if>
<if cond="FORMAT!='msevc4prj'">
@@
-535,7
+559,10
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<!-- for GUI libs/samples: -->
<!-- for GUI libs/samples: -->
- <template id="wx_append_nomono" template="wx_append_base_nomono">
+ <template id="wx_append_nomono" template_append="wx_append_base_nomono">
+ <sys-lib>$(LIB_TIFF)</sys-lib>
+ <sys-lib>$(LIB_JPEG)</sys-lib>
+ <sys-lib>$(LIB_PNG)</sys-lib>
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
@@
-557,10
+584,10
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<libname>$(WXLIBNAME)</libname>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<libname>$(WXLIBNAME)</libname>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
- <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
- <sources>$(WXTOPDIR)src/
msw
/dummy.cpp</sources>
+ <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','
MGL','PM','
WINCE']">
+ <sources>$(WXTOPDIR)src/
common
/dummy.cpp</sources>
<precomp-headers-gen>
<precomp-headers-gen>
- $(WXTOPDIR)src/
msw
/dummy.cpp
+ $(WXTOPDIR)src/
common
/dummy.cpp
</precomp-headers-gen>
</if>
<precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
</precomp-headers-gen>
</if>
<precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
@@
-608,8
+635,8
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
<if cond="FORMAT=='autoconf'">
<if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
<if cond="FORMAT=='autoconf'">
- <res-include>$(TOP_SRCDIR)include</res-include>
<res-include>$(RCDEFDIR)</res-include>
<res-include>$(RCDEFDIR)</res-include>
+ <res-include>$(TOP_SRCDIR)include</res-include>
</if>
</if>
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
</if>
</if>
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
@@
-630,6
+657,9
@@
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
</template>
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
</template>
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
+ <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
+ <include>$(DOLLAR)(%SCITECH)/include</include>
+ </if>
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
projects / wxWidgets.git / blobdiff