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:
@@ -39,8 +39,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
|
||||
PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
@@ -135,7 +135,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 penguin$(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: ###
|
||||
@@ -164,7 +164,7 @@ distclean: clean
|
||||
@COND_USE_OPENGL_1@ $(__penguin___os2_emxbindcmd)
|
||||
@COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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
|
||||
@@ -182,7 +182,7 @@ penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbo
|
||||
ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
|
||||
|
||||
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc penguin.app/Contents/Resources/penguin.rsrc
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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)
|
||||
|
Reference in New Issue
Block a user