Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the wx-config man page.

Browse Source 
Remove some cruft from the docs package.
Bump version in configure.
Update aclocal.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-09-29 09:07:08 +00:00
parent 1a6a834724
commit 7714864e2f
142 changed files with 1230 additions and 1348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/access/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o accesstest$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
$(__accesstest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p accesstest.app/Contents
mkdir -p accesstest.app/Contents/MacOS
mkdir -p accesstest.app/Contents/Resources
@@ -154,7 +154,7 @@ accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbo
ln -f accesstest$(EXEEXT) accesstest.app/Contents/MacOS/accesstest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc accesstest.app/Contents/Resources/accesstest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc accesstest.app/Contents/Resources/accesstest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns accesstest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@accesstest_bundle: $(____accesstest_BUNDLE_TGT_REF_DEP)

10
samples/artprov/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -99,7 +99,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -108,7 +108,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o arttest$(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: ###
@@ -137,7 +137,7 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
$(__arttest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p arttest.app/Contents
mkdir -p arttest.app/Contents/MacOS
mkdir -p arttest.app/Contents/Resources
@@ -155,7 +155,7 @@ arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc arttest.app/Contents/Resources/arttest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc arttest.app/Contents/Resources/arttest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns arttest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@arttest_bundle: $(____arttest_BUNDLE_TGT_REF_DEP)

10
samples/calendar/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -103,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -112,7 +112,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o calendar$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -141,7 +141,7 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
$(__calendar___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p calendar.app/Contents
mkdir -p calendar.app/Contents/MacOS
mkdir -p calendar.app/Contents/Resources
@@ -159,7 +159,7 @@ calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc calendar.app/Contents/Resources/calendar.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc calendar.app/Contents/Resources/calendar.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns calendar.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP)

10
samples/caret/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -97,7 +97,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -106,7 +106,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o caret$(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: ###
@@ -135,7 +135,7 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
$(__caret___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p caret.app/Contents
mkdir -p caret.app/Contents/MacOS
mkdir -p caret.app/Contents/Resources
@@ -153,7 +153,7 @@ caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc caret.app/Contents/Resources/caret.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc caret.app/Contents/Resources/caret.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns caret.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@caret_bundle: $(____caret_BUNDLE_TGT_REF_DEP)

10
samples/checklst/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CHECKLST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o checklst$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc)
$(__checklst___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p checklst.app/Contents
mkdir -p checklst.app/Contents/MacOS
mkdir -p checklst.app/Contents/Resources
@@ -154,7 +154,7 @@ checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f checklst$(EXEEXT) checklst.app/Contents/MacOS/checklst
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc checklst.app/Contents/Resources/checklst.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc checklst.app/Contents/Resources/checklst.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns checklst.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@checklst_bundle: $(____checklst_BUNDLE_TGT_REF_DEP)

10
samples/config/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o conftest$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
$(__conftest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p conftest.app/Contents
mkdir -p conftest.app/Contents/MacOS
mkdir -p conftest.app/Contents/Resources
@@ -154,7 +154,7 @@ conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc conftest.app/Contents/Resources/conftest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc conftest.app/Contents/Resources/conftest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP)

2
samples/console/Makefile.in
View File

@@ -78,7 +78,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)

10
samples/controls/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o controls$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
$(__controls___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p controls.app/Contents
mkdir -p controls.app/Contents/MacOS
mkdir -p controls.app/Contents/Resources
@@ -154,7 +154,7 @@ controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc controls.app/Contents/Resources/controls.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc controls.app/Contents/Resources/controls.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@controls_bundle: $(____controls_BUNDLE_TGT_REF_DEP)

10
samples/db/Makefile.in
View File

@@ -39,7 +39,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -112,7 +112,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -121,7 +121,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o dbtest$(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: ###
@@ -150,7 +150,7 @@ distclean: clean
@COND_USE_ODBC_1@ $(__dbtest___os2_emxbindcmd)
@COND_USE_ODBC_1@ $(SAMPLES_RPATH_POSTLINK)
dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p dbtest.app/Contents
mkdir -p dbtest.app/Contents/MacOS
mkdir -p dbtest.app/Contents/Resources
@@ -168,7 +168,7 @@ dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/
ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dbtest.app/Contents/Resources/dbtest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dbtest.app/Contents/Resources/dbtest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@dbtest_bundle: $(____dbtest_BUNDLE_TGT_REF_DEP)

10
samples/dialogs/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -112,7 +112,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -121,7 +121,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o dialogs$(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: ###
@@ -150,7 +150,7 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
$(__dialogs___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p dialogs.app/Contents
mkdir -p dialogs.app/Contents/MacOS
mkdir -p dialogs.app/Contents/Resources
@@ -168,7 +168,7 @@ dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dialogs.app/Contents/Resources/dialogs.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dialogs.app/Contents/Resources/dialogs.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@dialogs_bundle: $(____dialogs_BUNDLE_TGT_REF_DEP)

10
samples/dialup/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o nettest$(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: ###
@@ -136,7 +136,7 @@ nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
$(__nettest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p nettest.app/Contents
mkdir -p nettest.app/Contents/MacOS
mkdir -p nettest.app/Contents/Resources
@@ -154,7 +154,7 @@ nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc nettest.app/Contents/Resources/nettest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc nettest.app/Contents/Resources/nettest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)

10
samples/display/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o display$(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: ###
@@ -136,7 +136,7 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
$(__display___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p display.app/Contents
mkdir -p display.app/Contents/MacOS
mkdir -p display.app/Contents/Resources
@@ -154,7 +154,7 @@ display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f display$(EXEEXT) display.app/Contents/MacOS/display
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc display.app/Contents/Resources/display.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc display.app/Contents/Resources/display.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@display_bundle: $(____display_BUNDLE_TGT_REF_DEP)

10
samples/dnd/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -95,7 +95,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -104,7 +104,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o dnd$(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: ###
@@ -133,7 +133,7 @@ dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
$(__dnd___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p dnd.app/Contents
mkdir -p dnd.app/Contents/MacOS
mkdir -p dnd.app/Contents/Resources
@@ -151,7 +151,7 @@ dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i
ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dnd.app/Contents/Resources/dnd.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dnd.app/Contents/Resources/dnd.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dnd.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@dnd_bundle: $(____dnd_BUNDLE_TGT_REF_DEP)

10
samples/docview/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -60,7 +60,7 @@ DOCVIEW_OBJECTS = \
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \
@COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
@COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT)
COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d \
@@ -106,7 +106,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -139,7 +139,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
$(__docview___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p docview.app/Contents
mkdir -p docview.app/Contents/MacOS
mkdir -p docview.app/Contents/Resources
@@ -157,7 +157,7 @@ docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc docview.app/Contents/Resources/docview.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc docview.app/Contents/Resources/docview.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docview.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP)

10
samples/docvwmdi/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -100,7 +100,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -109,7 +109,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o docview$(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: ###
@@ -138,7 +138,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
$(__docview___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p docview.app/Contents
mkdir -p docview.app/Contents/MacOS
mkdir -p docview.app/Contents/Resources
@@ -156,7 +156,7 @@ docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc docview.app/Contents/Resources/docview.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc docview.app/Contents/Resources/docview.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docview.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP)

10
samples/dragimag/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o dragimag$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
$(__dragimag___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p dragimag.app/Contents
mkdir -p dragimag.app/Contents/MacOS
mkdir -p dragimag.app/Contents/Resources
@@ -154,7 +154,7 @@ dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dragimag.app/Contents/Resources/dragimag.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dragimag.app/Contents/Resources/dragimag.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@dragimag_bundle: $(____dragimag_BUNDLE_TGT_REF_DEP)

10
samples/drawing/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o drawing$(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: ###
@@ -136,7 +136,7 @@ drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
$(__drawing___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p drawing.app/Contents
mkdir -p drawing.app/Contents/MacOS
mkdir -p drawing.app/Contents/Resources
@@ -154,7 +154,7 @@ drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc drawing.app/Contents/Resources/drawing.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc drawing.app/Contents/Resources/drawing.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns drawing.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@drawing_bundle: $(____drawing_BUNDLE_TGT_REF_DEP)

10
samples/dynamic/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o dynamic$(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: ###
@@ -136,7 +136,7 @@ dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc)
$(__dynamic___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p dynamic.app/Contents
mkdir -p dynamic.app/Contents/MacOS
mkdir -p dynamic.app/Contents/Resources
@@ -154,7 +154,7 @@ dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f dynamic$(EXEEXT) dynamic.app/Contents/MacOS/dynamic
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dynamic.app/Contents/Resources/dynamic.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dynamic.app/Contents/Resources/dynamic.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynamic.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@dynamic_bundle: $(____dynamic_BUNDLE_TGT_REF_DEP)

10
samples/erase/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -97,7 +97,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -106,7 +106,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o erase$(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: ###
@@ -135,7 +135,7 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
$(__erase___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p erase.app/Contents
mkdir -p erase.app/Contents/MacOS
mkdir -p erase.app/Contents/Resources
@@ -153,7 +153,7 @@ erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc erase.app/Contents/Resources/erase.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc erase.app/Contents/Resources/erase.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns erase.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@erase_bundle: $(____erase_BUNDLE_TGT_REF_DEP)

10
samples/event/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -97,7 +97,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -106,7 +106,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o event$(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: ###
@@ -135,7 +135,7 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
$(__event___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p event.app/Contents
mkdir -p event.app/Contents/MacOS
mkdir -p event.app/Contents/Resources
@@ -153,7 +153,7 @@ event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
ln -f event$(EXEEXT) event.app/Contents/MacOS/event
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc event.app/Contents/Resources/event.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc event.app/Contents/Resources/event.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns event.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@event_bundle: $(____event_BUNDLE_TGT_REF_DEP)

10
samples/except/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o except$(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: ###
@@ -136,7 +136,7 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
$(__except___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p except.app/Contents
mkdir -p except.app/Contents/MacOS
mkdir -p except.app/Contents/Resources
@@ -154,7 +154,7 @@ except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f except$(EXEEXT) except.app/Contents/MacOS/except
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc except.app/Contents/Resources/except.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc except.app/Contents/Resources/except.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns except.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@except_bundle: $(____except_BUNDLE_TGT_REF_DEP)

10
samples/exec/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -96,7 +96,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -105,7 +105,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o exec$(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: ###
@@ -134,7 +134,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
$(__exec___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p exec.app/Contents
mkdir -p exec.app/Contents/MacOS
mkdir -p exec.app/Contents/Resources
@@ -152,7 +152,7 @@ exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc exec.app/Contents/Resources/exec.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc exec.app/Contents/Resources/exec.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@exec_bundle: $(____exec_BUNDLE_TGT_REF_DEP)

10
samples/font/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -96,7 +96,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -105,7 +105,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o font$(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: ###
@@ -134,7 +134,7 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
$(__font___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p font.app/Contents
mkdir -p font.app/Contents/MacOS
mkdir -p font.app/Contents/Resources
@@ -152,7 +152,7 @@ font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f font$(EXEEXT) font.app/Contents/MacOS/font
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc font.app/Contents/Resources/font.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc font.app/Contents/Resources/font.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns font.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@font_bundle: $(____font_BUNDLE_TGT_REF_DEP)

10
samples/grid/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -101,7 +101,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -110,7 +110,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o grid$(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: ###
@@ -139,7 +139,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
$(__grid___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p grid.app/Contents
mkdir -p grid.app/Contents/MacOS
mkdir -p grid.app/Contents/Resources
@@ -157,7 +157,7 @@ grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc grid.app/Contents/Resources/grid.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc grid.app/Contents/Resources/grid.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@grid_bundle: $(____grid_BUNDLE_TGT_REF_DEP)

10
samples/help/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -100,7 +100,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -109,7 +109,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o help$(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: ###
@@ -138,7 +138,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
$(__help___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p help.app/Contents
mkdir -p help.app/Contents/MacOS
mkdir -p help.app/Contents/Resources
@@ -156,7 +156,7 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f help$(EXEEXT) help.app/Contents/MacOS/help
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc help.app/Contents/Resources/help.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc help.app/Contents/Resources/help.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP)

10
samples/htlbox/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o htlbox$(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: ###
@@ -140,7 +140,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
$(__htlbox___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p htlbox.app/Contents
mkdir -p htlbox.app/Contents/MacOS
mkdir -p htlbox.app/Contents/Resources
@@ -158,7 +158,7 @@ htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc htlbox.app/Contents/Resources/htlbox.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc htlbox.app/Contents/Resources/htlbox.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP)

10
samples/html/about/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -101,7 +101,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -110,7 +110,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o about$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -139,7 +139,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
$(__about___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p about.app/Contents
mkdir -p about.app/Contents/MacOS
mkdir -p about.app/Contents/Resources
@@ -157,7 +157,7 @@ about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
ln -f about$(EXEEXT) about.app/Contents/MacOS/about
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc about.app/Contents/Resources/about.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc about.app/Contents/Resources/about.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@about_bundle: $(____about_BUNDLE_TGT_REF_DEP)

10
samples/html/help/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -100,7 +100,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -109,7 +109,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o help$(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: ###
@@ -138,7 +138,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
$(__help___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p help.app/Contents
mkdir -p help.app/Contents/MacOS
mkdir -p help.app/Contents/Resources
@@ -156,7 +156,7 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f help$(EXEEXT) help.app/Contents/MacOS/help
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc help.app/Contents/Resources/help.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc help.app/Contents/Resources/help.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP)

10
samples/html/helpview/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o helpview$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -140,7 +140,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
$(__helpview___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p helpview.app/Contents
mkdir -p helpview.app/Contents/MacOS
mkdir -p helpview.app/Contents/Resources
@@ -158,7 +158,7 @@ helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc helpview.app/Contents/Resources/helpview.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc helpview.app/Contents/Resources/helpview.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)

10
samples/html/htmlctrl/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o htmlctrl$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
$(__htmlctrl___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p htmlctrl.app/Contents
mkdir -p htmlctrl.app/Contents/MacOS
mkdir -p htmlctrl.app/Contents/Resources
@@ -154,7 +154,7 @@ htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc htmlctrl.app/Contents/Resources/htmlctrl.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc htmlctrl.app/Contents/Resources/htmlctrl.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlctrl.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@htmlctrl_bundle: $(____htmlctrl_BUNDLE_TGT_REF_DEP)

10
samples/html/printing/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o printing$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -140,7 +140,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
$(__printing___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p printing.app/Contents
mkdir -p printing.app/Contents/MacOS
mkdir -p printing.app/Contents/Resources
@@ -158,7 +158,7 @@ printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc printing.app/Contents/Resources/printing.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc printing.app/Contents/Resources/printing.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP)

10
samples/html/test/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -103,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -112,7 +112,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o test$(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: ###
@@ -141,7 +141,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
$(__test___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p test.app/Contents
mkdir -p test.app/Contents/MacOS
mkdir -p test.app/Contents/Resources
@@ -159,7 +159,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f test$(EXEEXT) test.app/Contents/MacOS/test
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc test.app/Contents/Resources/test.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc test.app/Contents/Resources/test.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)

10
samples/html/virtual/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o virtual$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -140,7 +140,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
$(__virtual___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p virtual.app/Contents
mkdir -p virtual.app/Contents/MacOS
mkdir -p virtual.app/Contents/Resources
@@ -158,7 +158,7 @@ virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc virtual.app/Contents/Resources/virtual.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc virtual.app/Contents/Resources/virtual.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@virtual_bundle: $(____virtual_BUNDLE_TGT_REF_DEP)

10
samples/html/widget/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o widget$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -140,7 +140,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
$(__widget___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p widget.app/Contents
mkdir -p widget.app/Contents/MacOS
mkdir -p widget.app/Contents/Resources
@@ -158,7 +158,7 @@ widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc widget.app/Contents/Resources/widget.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc widget.app/Contents/Resources/widget.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@widget_bundle: $(____widget_BUNDLE_TGT_REF_DEP)

10
samples/html/zip/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -99,7 +99,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -108,7 +108,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o zip$(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: ###
@@ -137,7 +137,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
$(__zip___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p zip.app/Contents
mkdir -p zip.app/Contents/MacOS
mkdir -p zip.app/Contents/Resources
@@ -155,7 +155,7 @@ zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i
ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc zip.app/Contents/Resources/zip.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc zip.app/Contents/Resources/zip.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP)

10
samples/image/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -97,7 +97,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -106,7 +106,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o image$(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: ###
@@ -135,7 +135,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
$(__image___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p image.app/Contents
mkdir -p image.app/Contents/MacOS
mkdir -p image.app/Contents/Resources
@@ -153,7 +153,7 @@ image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
ln -f image$(EXEEXT) image.app/Contents/MacOS/image
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc image.app/Contents/Resources/image.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc image.app/Contents/Resources/image.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@image_bundle: $(____image_BUNDLE_TGT_REF_DEP)

10
samples/internat/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o internat$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
$(__internat___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p internat.app/Contents
mkdir -p internat.app/Contents/MacOS
mkdir -p internat.app/Contents/Resources
@@ -154,7 +154,7 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc internat.app/Contents/Resources/internat.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc internat.app/Contents/Resources/internat.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP)

16
samples/ipc/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -90,12 +90,12 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o client$(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_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2)
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o server$(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_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__
@@ -128,7 +128,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -163,7 +163,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
$(__client___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p client.app/Contents
mkdir -p client.app/Contents/MacOS
mkdir -p client.app/Contents/Resources
@@ -181,7 +181,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f client$(EXEEXT) client.app/Contents/MacOS/client
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc client.app/Contents/Resources/client.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc client.app/Contents/Resources/client.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
@@ -193,7 +193,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
$(__server___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p server.app/Contents
mkdir -p server.app/Contents/MacOS
mkdir -p server.app/Contents/Resources
@@ -211,7 +211,7 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f server$(EXEEXT) server.app/Contents/MacOS/server
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc server.app/Contents/Resources/server.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc server.app/Contents/Resources/server.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)

10
samples/joytest/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -103,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -112,7 +112,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o joytest$(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: ###
@@ -141,7 +141,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
$(__joytest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p joytest.app/Contents
mkdir -p joytest.app/Contents/MacOS
mkdir -p joytest.app/Contents/Resources
@@ -159,7 +159,7 @@ joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc joytest.app/Contents/Resources/joytest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc joytest.app/Contents/Resources/joytest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@joytest_bundle: $(____joytest_BUNDLE_TGT_REF_DEP)

10
samples/keyboard/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o keyboard$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
$(__keyboard___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p keyboard.app/Contents
mkdir -p keyboard.app/Contents/MacOS
mkdir -p keyboard.app/Contents/Resources
@@ -154,7 +154,7 @@ keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc keyboard.app/Contents/Resources/keyboard.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc keyboard.app/Contents/Resources/keyboard.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP)

10
samples/layout/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o layout$(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: ###
@@ -136,7 +136,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
$(__layout___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p layout.app/Contents
mkdir -p layout.app/Contents/MacOS
mkdir -p layout.app/Contents/Resources
@@ -154,7 +154,7 @@ layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc layout.app/Contents/Resources/layout.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc layout.app/Contents/Resources/layout.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP)

10
samples/listbox/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
LISTBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o listbox$(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: ###
@@ -136,7 +136,7 @@ listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc)
$(__listbox___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p listbox.app/Contents
mkdir -p listbox.app/Contents/MacOS
mkdir -p listbox.app/Contents/Resources
@@ -154,7 +154,7 @@ listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f listbox$(EXEEXT) listbox.app/Contents/MacOS/listbox
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc listbox.app/Contents/Resources/listbox.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc listbox.app/Contents/Resources/listbox.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns listbox.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@listbox_bundle: $(____listbox_BUNDLE_TGT_REF_DEP)

10
samples/listctrl/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o listctrl$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
$(__listctrl___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p listctrl.app/Contents
mkdir -p listctrl.app/Contents/MacOS
mkdir -p listctrl.app/Contents/Resources
@@ -154,7 +154,7 @@ listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc listctrl.app/Contents/Resources/listctrl.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc listctrl.app/Contents/Resources/listctrl.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns listctrl.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@listctrl_bundle: $(____listctrl_BUNDLE_TGT_REF_DEP)

10
samples/mdi/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -95,7 +95,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -104,7 +104,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o mdi$(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: ###
@@ -133,7 +133,7 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
$(__mdi___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p mdi.app/Contents
mkdir -p mdi.app/Contents/MacOS
mkdir -p mdi.app/Contents/Resources
@@ -151,7 +151,7 @@ mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i
ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc mdi.app/Contents/Resources/mdi.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc mdi.app/Contents/Resources/mdi.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mdi.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@mdi_bundle: $(____mdi_BUNDLE_TGT_REF_DEP)

10
samples/memcheck/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o memcheck$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
$(__memcheck___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p memcheck.app/Contents
mkdir -p memcheck.app/Contents/MacOS
mkdir -p memcheck.app/Contents/Resources
@@ -154,7 +154,7 @@ memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc memcheck.app/Contents/Resources/memcheck.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc memcheck.app/Contents/Resources/memcheck.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@memcheck_bundle: $(____memcheck_BUNDLE_TGT_REF_DEP)

10
samples/menu/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -96,7 +96,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -105,7 +105,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o menu$(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: ###
@@ -134,7 +134,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
$(__menu___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p menu.app/Contents
mkdir -p menu.app/Contents/MacOS
mkdir -p menu.app/Contents/Resources
@@ -152,7 +152,7 @@ menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc menu.app/Contents/Resources/menu.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc menu.app/Contents/Resources/menu.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP)

10
samples/mfc/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o mfctest$(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: ###
@@ -136,7 +136,7 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
$(__mfctest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p mfctest.app/Contents
mkdir -p mfctest.app/Contents/MacOS
mkdir -p mfctest.app/Contents/Resources
@@ -154,7 +154,7 @@ mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc mfctest.app/Contents/Resources/mfctest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc mfctest.app/Contents/Resources/mfctest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@mfctest_bundle: $(____mfctest_BUNDLE_TGT_REF_DEP)

10
samples/minifram/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o minifram$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc)
$(__minifram___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p minifram.app/Contents
mkdir -p minifram.app/Contents/MacOS
mkdir -p minifram.app/Contents/Resources
@@ -154,7 +154,7 @@ minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f minifram$(EXEEXT) minifram.app/Contents/MacOS/minifram
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc minifram.app/Contents/Resources/minifram.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc minifram.app/Contents/Resources/minifram.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minifram.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@minifram_bundle: $(____minifram_BUNDLE_TGT_REF_DEP)

10
samples/minimal/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o minimal$(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: ###
@@ -136,7 +136,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
$(__minimal___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p minimal.app/Contents
mkdir -p minimal.app/Contents/MacOS
mkdir -p minimal.app/Contents/Resources
@@ -154,7 +154,7 @@ minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc minimal.app/Contents/Resources/minimal.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc minimal.app/Contents/Resources/minimal.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@minimal_bundle: $(____minimal_BUNDLE_TGT_REF_DEP)

10
samples/mobile/styles/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o styles$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
$(__styles___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p styles.app/Contents
mkdir -p styles.app/Contents/MacOS
mkdir -p styles.app/Contents/Resources
@@ -154,7 +154,7 @@ styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc styles.app/Contents/Resources/styles.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc styles.app/Contents/Resources/styles.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@styles_bundle: $(____styles_BUNDLE_TGT_REF_DEP)

10
samples/mobile/wxedit/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
WXEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o wxedit$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
$(__wxedit___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p wxedit.app/Contents
mkdir -p wxedit.app/Contents/MacOS
mkdir -p wxedit.app/Contents/Resources
@@ -154,7 +154,7 @@ wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f wxedit$(EXEEXT) wxedit.app/Contents/MacOS/wxedit
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc wxedit.app/Contents/Resources/wxedit.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc wxedit.app/Contents/Resources/wxedit.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxedit.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@wxedit_bundle: $(____wxedit_BUNDLE_TGT_REF_DEP)

10
samples/multimon/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o multimon_test$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -140,7 +140,7 @@ multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc)
$(__multimon_test___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p multimon_test.app/Contents
mkdir -p multimon_test.app/Contents/MacOS
mkdir -p multimon_test.app/Contents/Resources
@@ -158,7 +158,7 @@ multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac
ln -f multimon_test$(EXEEXT) multimon_test.app/Contents/MacOS/multimon_test
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc multimon_test.app/Contents/Resources/multimon_test.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc multimon_test.app/Contents/Resources/multimon_test.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns multimon_test.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@multimon_test_bundle: $(____multimon_test_BUNDLE_TGT_REF_DEP)

10
samples/nativdlg/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o nativdlg$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
$(__nativdlg___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p nativdlg.app/Contents
mkdir -p nativdlg.app/Contents/MacOS
mkdir -p nativdlg.app/Contents/Resources
@@ -154,7 +154,7 @@ nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f nativdlg$(EXEEXT) nativdlg.app/Contents/MacOS/nativdlg
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc nativdlg.app/Contents/Resources/nativdlg.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc nativdlg.app/Contents/Resources/nativdlg.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nativdlg.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@nativdlg_bundle: $(____nativdlg_BUNDLE_TGT_REF_DEP)

10
samples/notebook/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o notebook$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
$(__notebook___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p notebook.app/Contents
mkdir -p notebook.app/Contents/MacOS
mkdir -p notebook.app/Contents/Resources
@@ -154,7 +154,7 @@ notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc notebook.app/Contents/Resources/notebook.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc notebook.app/Contents/Resources/notebook.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns notebook.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@notebook_bundle: $(____notebook_BUNDLE_TGT_REF_DEP)

10
samples/oleauto/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o oleauto$(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: ###
@@ -136,7 +136,7 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
$(__oleauto___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p oleauto.app/Contents
mkdir -p oleauto.app/Contents/MacOS
mkdir -p oleauto.app/Contents/Resources
@@ -154,7 +154,7 @@ oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f oleauto$(EXEEXT) oleauto.app/Contents/MacOS/oleauto
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc oleauto.app/Contents/Resources/oleauto.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc oleauto.app/Contents/Resources/oleauto.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns oleauto.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@oleauto_bundle: $(____oleauto_BUNDLE_TGT_REF_DEP)

10
samples/opengl/cube/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -97,7 +97,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -106,7 +106,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o cube$(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: ###
@@ -135,7 +135,7 @@ cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
$(__cube___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p cube.app/Contents
mkdir -p cube.app/Contents/MacOS
mkdir -p cube.app/Contents/Resources
@@ -153,7 +153,7 @@ cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc cube.app/Contents/Resources/cube.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc cube.app/Contents/Resources/cube.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)

10
samples/opengl/isosurf/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -99,7 +99,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -108,7 +108,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o isosurf$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -137,7 +137,7 @@ isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
$(__isosurf___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p isosurf.app/Contents
mkdir -p isosurf.app/Contents/MacOS
mkdir -p isosurf.app/Contents/Resources
@@ -155,7 +155,7 @@ isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc isosurf.app/Contents/Resources/isosurf.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc isosurf.app/Contents/Resources/isosurf.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@isosurf_bundle: $(____isosurf_BUNDLE_TGT_REF_DEP)

10
samples/opengl/penguin/Makefile.in
View File

@@ -40,7 +40,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS)
@@ -107,7 +107,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -116,7 +116,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -o penguin$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -145,7 +145,7 @@ penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
$(__penguin___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p penguin.app/Contents
mkdir -p penguin.app/Contents/MacOS
mkdir -p penguin.app/Contents/Resources
@@ -163,7 +163,7 @@ penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc penguin.app/Contents/Resources/penguin.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc penguin.app/Contents/Resources/penguin.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@penguin_bundle: $(____penguin_BUNDLE_TGT_REF_DEP)

10
samples/ownerdrw/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o ownerdrw$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
$(__ownerdrw___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p ownerdrw.app/Contents
mkdir -p ownerdrw.app/Contents/MacOS
mkdir -p ownerdrw.app/Contents/Resources
@@ -154,7 +154,7 @@ ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f ownerdrw$(EXEEXT) ownerdrw.app/Contents/MacOS/ownerdrw
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc ownerdrw.app/Contents/Resources/ownerdrw.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc ownerdrw.app/Contents/Resources/ownerdrw.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ownerdrw.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@ownerdrw_bundle: $(____ownerdrw_BUNDLE_TGT_REF_DEP)

10
samples/png/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -95,7 +95,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -104,7 +104,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o png$(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: ###
@@ -133,7 +133,7 @@ png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc)
$(__png___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p png.app/Contents
mkdir -p png.app/Contents/MacOS
mkdir -p png.app/Contents/Resources
@@ -151,7 +151,7 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i
ln -f png$(EXEEXT) png.app/Contents/MacOS/png
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc png.app/Contents/Resources/png.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc png.app/Contents/Resources/png.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns png.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@png_bundle: $(____png_BUNDLE_TGT_REF_DEP)

10
samples/printing/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o printing$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
$(__printing___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p printing.app/Contents
mkdir -p printing.app/Contents/MacOS
mkdir -p printing.app/Contents/Resources
@@ -154,7 +154,7 @@ printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc printing.app/Contents/Resources/printing.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc printing.app/Contents/Resources/printing.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP)

10
samples/propsize/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o propsize$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc)
$(__propsize___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p propsize.app/Contents
mkdir -p propsize.app/Contents/MacOS
mkdir -p propsize.app/Contents/Resources
@@ -154,7 +154,7 @@ propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f propsize$(EXEEXT) propsize.app/Contents/MacOS/propsize
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc propsize.app/Contents/Resources/propsize.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc propsize.app/Contents/Resources/propsize.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns propsize.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@propsize_bundle: $(____propsize_BUNDLE_TGT_REF_DEP)

10
samples/regtest/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o regtest$(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: ###
@@ -136,7 +136,7 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
$(__regtest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p regtest.app/Contents
mkdir -p regtest.app/Contents/MacOS
mkdir -p regtest.app/Contents/Resources
@@ -154,7 +154,7 @@ regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc regtest.app/Contents/Resources/regtest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc regtest.app/Contents/Resources/regtest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns regtest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@regtest_bundle: $(____regtest_BUNDLE_TGT_REF_DEP)

12
samples/render/Makefile.in
View File

@@ -46,8 +46,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_RELEASE_NODOT = 25
WX_VERSION = $(WX_RELEASE).2
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
WX_VERSION = $(WX_RELEASE).3
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
LIBDIRNAME = $(top_builddir)lib
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
@@ -107,7 +107,7 @@ COND_SHARED_1___renddll___depname = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o render$(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)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -131,7 +131,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -166,7 +166,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
$(__render___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p render.app/Contents
mkdir -p render.app/Contents/MacOS
mkdir -p render.app/Contents/Resources
@@ -184,7 +184,7 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f render$(EXEEXT) render.app/Contents/MacOS/render
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc render.app/Contents/Resources/render.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc render.app/Contents/Resources/render.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)

10
samples/richedit/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
RICHEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o richedit$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -140,7 +140,7 @@ richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc)
$(__richedit___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p richedit.app/Contents
mkdir -p richedit.app/Contents/MacOS
mkdir -p richedit.app/Contents/Resources
@@ -158,7 +158,7 @@ richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f richedit$(EXEEXT) richedit.app/Contents/MacOS/richedit
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc richedit.app/Contents/Resources/richedit.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc richedit.app/Contents/Resources/richedit.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns richedit.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@richedit_bundle: $(____richedit_BUNDLE_TGT_REF_DEP)

10
samples/rotate/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
ROTATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o rotate$(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: ###
@@ -136,7 +136,7 @@ rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc)
$(__rotate___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p rotate.app/Contents
mkdir -p rotate.app/Contents/MacOS
mkdir -p rotate.app/Contents/Resources
@@ -154,7 +154,7 @@ rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f rotate$(EXEEXT) rotate.app/Contents/MacOS/rotate
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc rotate.app/Contents/Resources/rotate.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc rotate.app/Contents/Resources/rotate.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns rotate.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@rotate_bundle: $(____rotate_BUNDLE_TGT_REF_DEP)

10
samples/sashtest/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -103,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -112,7 +112,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o sashtest$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -141,7 +141,7 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
$(__sashtest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p sashtest.app/Contents
mkdir -p sashtest.app/Contents/MacOS
mkdir -p sashtest.app/Contents/Resources
@@ -159,7 +159,7 @@ sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc sashtest.app/Contents/Resources/sashtest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc sashtest.app/Contents/Resources/sashtest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sashtest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@sashtest_bundle: $(____sashtest_BUNDLE_TGT_REF_DEP)

10
samples/scroll/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o scroll$(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: ###
@@ -136,7 +136,7 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
$(__scroll___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p scroll.app/Contents
mkdir -p scroll.app/Contents/MacOS
mkdir -p scroll.app/Contents/Resources
@@ -154,7 +154,7 @@ scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc scroll.app/Contents/Resources/scroll.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc scroll.app/Contents/Resources/scroll.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scroll.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@scroll_bundle: $(____scroll_BUNDLE_TGT_REF_DEP)

10
samples/scrollsub/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o scrollsub$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
$(__scrollsub___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p scrollsub.app/Contents
mkdir -p scrollsub.app/Contents/MacOS
mkdir -p scrollsub.app/Contents/Resources
@@ -154,7 +154,7 @@ scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/
ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@scrollsub_bundle: $(____scrollsub_BUNDLE_TGT_REF_DEP)

10
samples/shaped/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o shaped$(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: ###
@@ -136,7 +136,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
$(__shaped___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p shaped.app/Contents
mkdir -p shaped.app/Contents/MacOS
mkdir -p shaped.app/Contents/Resources
@@ -154,7 +154,7 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc shaped.app/Contents/Resources/shaped.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc shaped.app/Contents/Resources/shaped.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@shaped_bundle: $(____shaped_BUNDLE_TGT_REF_DEP)

16
samples/sockets/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -90,12 +90,12 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o client$(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_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2)
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o server$(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_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__
@@ -128,7 +128,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -163,7 +163,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
$(__client___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p client.app/Contents
mkdir -p client.app/Contents/MacOS
mkdir -p client.app/Contents/Resources
@@ -181,7 +181,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f client$(EXEEXT) client.app/Contents/MacOS/client
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc client.app/Contents/Resources/client.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc client.app/Contents/Resources/client.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
@@ -193,7 +193,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
$(__server___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p server.app/Contents
mkdir -p server.app/Contents/MacOS
mkdir -p server.app/Contents/Resources
@@ -211,7 +211,7 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f server$(EXEEXT) server.app/Contents/MacOS/server
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc server.app/Contents/Resources/server.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc server.app/Contents/Resources/server.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)

10
samples/sound/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -102,7 +102,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o sound$(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: ###
@@ -140,7 +140,7 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
$(__sound___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p sound.app/Contents
mkdir -p sound.app/Contents/MacOS
mkdir -p sound.app/Contents/Resources
@@ -158,7 +158,7 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
ln -f sound$(EXEEXT) sound.app/Contents/MacOS/sound
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc sound.app/Contents/Resources/sound.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc sound.app/Contents/Resources/sound.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@sound_bundle: $(____sound_BUNDLE_TGT_REF_DEP)

10
samples/splash/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -103,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -112,7 +112,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o splash$(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: ###
@@ -141,7 +141,7 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
$(__splash___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p splash.app/Contents
mkdir -p splash.app/Contents/MacOS
mkdir -p splash.app/Contents/Resources
@@ -159,7 +159,7 @@ splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f splash$(EXEEXT) splash.app/Contents/MacOS/splash
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc splash.app/Contents/Resources/splash.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc splash.app/Contents/Resources/splash.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splash.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@splash_bundle: $(____splash_BUNDLE_TGT_REF_DEP)

10
samples/splitter/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o splitter$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
$(__splitter___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p splitter.app/Contents
mkdir -p splitter.app/Contents/MacOS
mkdir -p splitter.app/Contents/Resources
@@ -154,7 +154,7 @@ splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc splitter.app/Contents/Resources/splitter.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc splitter.app/Contents/Resources/splitter.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splitter.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@splitter_bundle: $(____splitter_BUNDLE_TGT_REF_DEP)

10
samples/statbar/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o statbar$(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: ###
@@ -136,7 +136,7 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
$(__statbar___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p statbar.app/Contents
mkdir -p statbar.app/Contents/MacOS
mkdir -p statbar.app/Contents/Resources
@@ -154,7 +154,7 @@ statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc statbar.app/Contents/Resources/statbar.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc statbar.app/Contents/Resources/statbar.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns statbar.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@statbar_bundle: $(____statbar_BUNDLE_TGT_REF_DEP)

10
samples/stc/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
@@ -101,7 +101,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -111,7 +111,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -i \
$(srcdir)/../../include -o stctest$(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: ###
@@ -140,7 +140,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
$(__stctest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p stctest.app/Contents
mkdir -p stctest.app/Contents/MacOS
mkdir -p stctest.app/Contents/Resources
@@ -158,7 +158,7 @@ stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc stctest.app/Contents/Resources/stctest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc stctest.app/Contents/Resources/stctest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP)

10
samples/svg/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
@@ -99,7 +99,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -109,7 +109,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples -i $(top_srcdir)/include -i \
$(srcdir)/../../include -o svgtest$(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: ###
@@ -138,7 +138,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
$(__svgtest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p svgtest.app/Contents
mkdir -p svgtest.app/Contents/MacOS
mkdir -p svgtest.app/Contents/Resources
@@ -156,7 +156,7 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc svgtest.app/Contents/Resources/svgtest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc svgtest.app/Contents/Resources/svgtest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP)

10
samples/tab/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -95,7 +95,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -104,7 +104,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o tab$(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: ###
@@ -133,7 +133,7 @@ tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc)
$(__tab___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p tab.app/Contents
mkdir -p tab.app/Contents/MacOS
mkdir -p tab.app/Contents/Resources
@@ -151,7 +151,7 @@ tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i
ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc tab.app/Contents/Resources/tab.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc tab.app/Contents/Resources/tab.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns tab.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@tab_bundle: $(____tab_BUNDLE_TGT_REF_DEP)

10
samples/taskbar/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -103,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -112,7 +112,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o taskbar$(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: ###
@@ -141,7 +141,7 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
$(__taskbar___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p taskbar.app/Contents
mkdir -p taskbar.app/Contents/MacOS
mkdir -p taskbar.app/Contents/Resources
@@ -159,7 +159,7 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc taskbar.app/Contents/Resources/taskbar.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc taskbar.app/Contents/Resources/taskbar.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP)

10
samples/text/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -96,7 +96,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -105,7 +105,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o text$(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: ###
@@ -134,7 +134,7 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
$(__text___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p text.app/Contents
mkdir -p text.app/Contents/MacOS
mkdir -p text.app/Contents/Resources
@@ -152,7 +152,7 @@ text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f text$(EXEEXT) text.app/Contents/MacOS/text
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc text.app/Contents/Resources/text.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc text.app/Contents/Resources/text.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns text.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@text_bundle: $(____text_BUNDLE_TGT_REF_DEP)

10
samples/thread/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o thread$(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: ###
@@ -136,7 +136,7 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
$(__thread___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p thread.app/Contents
mkdir -p thread.app/Contents/MacOS
mkdir -p thread.app/Contents/Resources
@@ -154,7 +154,7 @@ thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc thread.app/Contents/Resources/thread.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc thread.app/Contents/Resources/thread.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP)

10
samples/toolbar/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o toolbar$(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: ###
@@ -136,7 +136,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
$(__toolbar___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p toolbar.app/Contents
mkdir -p toolbar.app/Contents/MacOS
mkdir -p toolbar.app/Contents/Resources
@@ -154,7 +154,7 @@ toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc toolbar.app/Contents/Resources/toolbar.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc toolbar.app/Contents/Resources/toolbar.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP)

10
samples/treectrl/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o treectrl$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
$(__treectrl___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p treectrl.app/Contents
mkdir -p treectrl.app/Contents/MacOS
mkdir -p treectrl.app/Contents/Resources
@@ -154,7 +154,7 @@ treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc treectrl.app/Contents/Resources/treectrl.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc treectrl.app/Contents/Resources/treectrl.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@treectrl_bundle: $(____treectrl_BUNDLE_TGT_REF_DEP)

10
samples/typetest/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o typetest$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
$(__typetest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p typetest.app/Contents
mkdir -p typetest.app/Contents/MacOS
mkdir -p typetest.app/Contents/Resources
@@ -154,7 +154,7 @@ typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc typetest.app/Contents/Resources/typetest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc typetest.app/Contents/Resources/typetest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns typetest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@typetest_bundle: $(____typetest_BUNDLE_TGT_REF_DEP)

10
samples/validate/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o validate$(EXEEXT) \
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -136,7 +136,7 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
$(__validate___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p validate.app/Contents
mkdir -p validate.app/Contents/MacOS
mkdir -p validate.app/Contents/Resources
@@ -154,7 +154,7 @@ validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc validate.app/Contents/Resources/validate.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc validate.app/Contents/Resources/validate.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns validate.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@validate_bundle: $(____validate_BUNDLE_TGT_REF_DEP)

10
samples/vscroll/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o vstest$(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: ###
@@ -136,7 +136,7 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
$(__vstest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p vstest.app/Contents
mkdir -p vstest.app/Contents/MacOS
mkdir -p vstest.app/Contents/Resources
@@ -154,7 +154,7 @@ vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc vstest.app/Contents/Resources/vstest.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc vstest.app/Contents/Resources/vstest.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@vstest_bundle: $(____vstest_BUNDLE_TGT_REF_DEP)

10
samples/widgets/Makefile.in
View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -109,7 +109,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -118,7 +118,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o widgets$(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: ###
@@ -147,7 +147,7 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
$(__widgets___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p widgets.app/Contents
mkdir -p widgets.app/Contents/MacOS
mkdir -p widgets.app/Contents/Resources
@@ -165,7 +165,7 @@ widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc widgets.app/Contents/Resources/widgets.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc widgets.app/Contents/Resources/widgets.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widgets.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@widgets_bundle: $(____widgets_BUNDLE_TGT_REF_DEP)

10
samples/wizard/Makefile.in
View File

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -103,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -112,7 +112,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o wizard$(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: ###
@@ -141,7 +141,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
$(__wizard___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p wizard.app/Contents
mkdir -p wizard.app/Contents/MacOS
mkdir -p wizard.app/Contents/Resources
@@ -159,7 +159,7 @@ wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc wizard.app/Contents/Resources/wizard.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc wizard.app/Contents/Resources/wizard.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP)

10
samples/xrc/Makefile.in
View File

@@ -40,7 +40,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -117,7 +117,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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)
@@ -126,7 +126,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o xrcdemo$(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: ###
@@ -155,7 +155,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
$(__xrcdemo___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p xrcdemo.app/Contents
mkdir -p xrcdemo.app/Contents/MacOS
mkdir -p xrcdemo.app/Contents/Resources
@@ -173,7 +173,7 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@xrcdemo_bundle: $(____xrcdemo_BUNDLE_TGT_REF_DEP)