added Mac resource with icon

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 5107bcb3c8a3e0d7c23d4649ffd33857d28974b8..c71d955e3c438740316804863a2f13a2478f5503 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -91,14 +91,13 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_MONOLITHIC1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
 @COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff
 @COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_PLATFORM_MAC1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p)
+@COND_PLATFORM_MAC1@__minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r
 @COND_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc
 @COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
 @COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg
 @COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff
 @COND_USE_GUI0@PORTNAME = base
 @COND_USE_GUI1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o minimal$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex
 @COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex
 @COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d

diff --git a/samples/minimal/minimal.bkl b/samples/minimal/minimal.bkl
index fb8d42b56f11febd7a153b2ad42294469dff10f3..fce8a1160cd9792bcf78d1cff297608278ebfc6a 100644 (file)
--- a/samples/minimal/minimal.bkl
+++ b/samples/minimal/minimal.bkl
@@ -1,4 +1,6 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
@@ -7,6 +9,7 @@
         <sources>minimal.cpp</sources>
         <wx-lib>core</wx-lib>
         <win32-res>minimal.rc</win32-res>
+        <mac-res>mondrian.r</mac-res>
     </exe>
 
 </makefile>