quick fix for mac resource problems

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

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index 735f3f64a1808ddd063a099ce5221ab1bdbfcf3b..ce049f7410fcfb12b0ba22eac384ed456bf833e0 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -13,7 +13,7 @@
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">
-                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r $(WXTOPDIR)samples/sample.r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r $(SRCDIR)/$(WXTOPDIR)samples/sample.r
             </if>
         </set>
     </if>

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 0d3f775a7f62bb358ef499cdd125b038ecc42b64..8a61108e609c2d202a48cc7367acecf7cdd3b432 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -39,16 +39,13 @@ MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS)
 MINIMAL_OBJECTS =  \
-       minimal_minimal.o \
-       $(__minimal___win32rc)
+       $(__minimal___win32rc) \
+       minimal_minimal.o
 
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
-@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \
-@COND_TOOLKIT_MAC@     $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-@COND_TOOLKIT_MAC@     ../../samples/sample.r
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -104,6 +101,14 @@ MINIMAL_OBJECTS =  \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
+       $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
+       $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
+       $(__DLLFLAG_p_1) -i ../../samples -o minimal$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       $(srcdir)/../../samples/sample.r
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -115,16 +120,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-COND_PLATFORM_MAC_1___minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
-       $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
-       $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i ../../samples -o minimal$(EXEEXT) $(MACOSX_RESOURCES) \
-       mondrian.r
-@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(COND_PLATFORM_MAC_1___minimal___mac_rezcmd)
+@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C minimal$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_minimal_rc.o
+@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o
 
 ### Targets: ###
 
@@ -151,7 +150,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
 minimal_minimal.o: $(srcdir)/minimal.cpp
        $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $<
 
-minimal_minimal_rc.o: $(srcdir)/minimal.rc
+minimal_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples
 
 uninstall: 

diff --git a/samples/minimal/minimal.bkl b/samples/minimal/minimal.bkl
index f06a7386bb07dd2ca5cc189f87d2f2eca422f31a..a8a8a8e41d36672259aa10028d55e972bfb301f2 100644 (file)
--- a/samples/minimal/minimal.bkl
+++ b/samples/minimal/minimal.bkl
@@ -9,8 +9,6 @@
         <sources>minimal.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>minimal.rc</win32-res>
-        <mac-res>mondrian.r</mac-res>
     </exe>
 
 </makefile>