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

Removed rules for copying the Mac resource file since they are no

Browse Source 
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:
Robin Dunn
2005-04-14 22:11:55 +00:00
parent 97ee90eec5
commit d391f6679d
125 changed files with 259 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/samples/ogl/ogledit/Makefile.in
View File

@@ -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@
HOST_SUFFIX = @HOST_SUFFIX@
@@ -126,8 +125,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 ogledit$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
$(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -156,7 +154,7 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
$(__ogledit___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p ogledit.app/Contents
mkdir -p ogledit.app/Contents/MacOS
mkdir -p ogledit.app/Contents/Resources
@@ -174,7 +172,6 @@ ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@ogledit_bundle: $(____ogledit_BUNDLE_TGT_REF_DEP)

7
contrib/samples/ogl/studio/Makefile.in
View File

@@ -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_HTML = @EXTRALIBS_HTML@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
@@ -141,8 +140,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 studio$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
$(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -171,7 +169,7 @@ studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
$(__studio___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p studio.app/Contents
mkdir -p studio.app/Contents/MacOS
mkdir -p studio.app/Contents/Resources
@@ -189,7 +187,6 @@ studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc studio.app/Contents/Resources/studio.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns studio.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@studio_bundle: $(____studio_BUNDLE_TGT_REF_DEP)