<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
- <if cond="FORMAT in ['msvc6prj','msevc4prj']">
+ <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>
<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'">
<depends>xmllib</depends>
<command>
- (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) all) || true
+ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi)
</command>
</action>
<action id="clean-wxrc" cond="USE_XRC=='1'">
<dependency-of>clean</dependency-of>
<command>
- (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) clean) || true
+ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi)
</command>
</action>
<action id="install-wxrc" cond="USE_XRC=='1'">
<dependency-of>install</dependency-of>
<depends>wxrc</depends>
<command>
- (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true
+ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi)
</command>
</action>
<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>
$(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) $(DESTDIR)$(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'">
- lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/msw/rcdefs.h
- </if>
+ <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
</set>
- <data-files>
- <srcdir>$(BUILDDIR)</srcdir>
+
+ <data-files-tree>
+ <srcdir>
+ $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ </srcdir>
<files>
- lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h
- $(RCDEFS_H)
+ setup.h $(RCDEFS_H)
</files>
- <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
- </data-files>
+ <install-to>
+ $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ </install-to>
+ </data-files-tree>
- <headers>
+ <!-- FIXME: make this use per-target <headers> once it supports
+ prefix removal -->
+ <data-files-tree>
<srcdir>$(SRCDIR)/include</srcdir>
<files>$(ALL_HEADERS)</files>
<install-to>
$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
</install-to>
- </headers>
+ </data-files-tree>
<!-- Locales: -->
<using module="gettext"/>
<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>
<dependency-of>all</dependency-of>
<set var="__targetname">$(MACOS_R)</set>
<command>
- $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
+ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
$(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
</command>
<clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
</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'">
<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">
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
<dst>$(SETUPHDIR)/wx/setup.h</dst>
</copy-file-to-file-if-not-exist>
-
</if>
<action id="rcdefs.h">
+ <!-- Can't seem to set id to a name with a dollar sign
+ so use __targetname as a temporary work around -->
+ <set var="__targetname">$(SETUPHDIR)\wx\msw\rcdefs.h</set>
+
<dependency-of>setup_h</dependency-of>
<depends>libdir_setup_wx_msw</depends>
<depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
<command>
- $(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+ $(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</command>
</action>
@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 " "
projects / wxWidgets.git / blobdiff