DESTDIR =
WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).2
+WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../../samples -i $(top_srcdir)/include -i \
$(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r \
- $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
+ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
$(__proplist___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
-proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p proplist.app/Contents
mkdir -p proplist.app/Contents/MacOS
mkdir -p proplist.app/Contents/Resources
ln -f proplist$(EXEEXT) proplist.app/Contents/MacOS/proplist
- cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc proplist.app/Contents/Resources/proplist.rsrc
+ cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc proplist.app/Contents/Resources/proplist.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns proplist.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@proplist_bundle: $(____proplist_BUNDLE_TGT_REF_DEP)