<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
- <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj']">
+ <if cond="IS_MSVC_PRJ">
<set var="MSVC6PRJ_MERGED_TARGETS">
<if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
<data-files>
<srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
- <files>wx.bkl wx_unix.bkl wx_win32.bkl</files>
+ <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py</files>
<install-to>$(DATADIR)/bakefile/presets</install-to>
</data-files>
</command>
</action>
+ <modify-target target="install">
+ <command>
+ $(DYLIB_RPATH_INSTALL)
+ </command>
+ </modify-target>
+
<set var="RCDEFS_H">
<if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
</set>
</install-to>
</data-files-tree>
- <!-- FIXME: make this use <headers> once it supports prefix removal -->
- <if cond="BAKEFILE_VERSION!='0.2.3'">
- <warning>is it time to use per-target <headers> now?</warning>
- </if>
+ <!-- FIXME: make this use per-target <headers> once it supports
+ prefix removal -->
<data-files-tree>
<srcdir>$(SRCDIR)/include</srcdir>
<files>$(ALL_HEADERS)</files>
<linguas>it</linguas>
<install-to>$(LOCALEDIR)</install-to>
</gettext-catalogs>
-
+
<!-- Mac OS X resources: -->
<set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
</if>
- <!-- copy setup.h on DOS/OS2/Windows: -->
- <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+ <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
+ <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
<mkdir id="libdir">
<dir>$(LIBDIRNAME)</dir>
</mkdir>
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
<dst>$(SETUPHDIR)/wx/setup.h</dst>
</copy-file-to-file-if-not-exist>
-
</if>
@echo " wxWidgets comes with no guarantees and doesn't claim"
@echo " to be suitable for any purpose."
@echo " "
-@echo " Read the wxWidgets Licence on licencing conditions."
+@echo " Read the wxWindows Licence on licencing conditions."
@echo " "
@echo " ------------------------------------------------------"
@echo " "