<subproject id="samples">
<installable>no</installable>
<dir cond="FORMAT=='autoconf'">samples</dir>
- <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>
+ <dir cond="FORMAT!='autoconf'">../../samples</dir>
</subproject>
<if cond="FORMAT=='autoconf'">
<data-files>
<srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
- <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.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>
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
- (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) ../`basename $(LIBDIR)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
</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>
<!-- 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']">
+ <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0'">
<mkdir id="libdir">
<dir>$(LIBDIRNAME)</dir>
</mkdir>
<set var="SETUP_H_SUBDIR">
<if cond="WXUNIV=='1'">univ</if>
- <if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
- <if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
+ <if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
+ <if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>
</set>
<copy-file-to-file-if-not-exist id="master_setup.h">
<!-- create rcdefs.h on Windows: -->
- <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
+ <if cond="FORMAT in ['borland','mingw','msvc','watcom']">
<mkdir id="libdir_setup_wx_msw">
<depends>libdir_setup_wx</depends>
@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 " "