Changed version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,8 +36,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.5
|
||||
WX_VERSION = $(WX_RELEASE).5
|
||||
WX_RELEASE = 2.6
|
||||
WX_VERSION = $(WX_RELEASE).0
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
@@ -123,7 +123,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
|
||||
$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
|
||||
$(srcdir)/../../../samples -i $(top_srcdir)/include -o htmlctrl$(EXEEXT) \
|
||||
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
|
||||
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
|
||||
### Targets: ###
|
||||
@@ -152,7 +152,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).5.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).0.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
|
||||
@@ -170,7 +170,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).5.rsrc htmlctrl.app/Contents/Resources/htmlctrl.rsrc
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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)
|
||||
|
Reference in New Issue
Block a user