Removed rules for copying the Mac resource file since they are no
longer needed for wxMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
@@ -37,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
|
||||
EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
@@ -128,8 +127,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 -i \
|
||||
$(srcdir)/../../../include -o extended$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
|
||||
$(srcdir)/../../../include -o extended$(EXEEXT) Carbon.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
|
||||
### Targets: ###
|
||||
@@ -158,7 +156,7 @@ extended$(EXEEXT): $(EXTENDED_OBJECTS) $(__extended___win32rc)
|
||||
$(__extended___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p extended.app/Contents
|
||||
mkdir -p extended.app/Contents/MacOS
|
||||
mkdir -p extended.app/Contents/Resources
|
||||
@@ -176,7 +174,6 @@ extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
|
||||
ln -f extended$(EXEEXT) extended.app/Contents/MacOS/extended
|
||||
|
||||
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc extended.app/Contents/Resources/extended.rsrc
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns extended.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@extended_bundle: $(____extended_BUNDLE_TGT_REF_DEP)
|
||||
|
Reference in New Issue
Block a user