Update the wx-config man page.
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:
@@ -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)
|
||||
|
Reference in New Issue
Block a user