fixed OSX resources invalid path

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

diff --git a/Makefile.in b/Makefile.in
index 5b120b81e257ecae949ebb642b9de70f0beaeff5..09ac15b5c33f385affc27f992f8a2a4d76088390 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4557,7 +4557,7 @@ monodll-menu5.o: $(srcdir)/src/univ/menu.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r: 
-       $(RESCOMP) -d __UNIX__ -useDF ../src/mac/apprsrc.r ../src/mac/carbrsrc.r ../src/mac/corersrc.r -o lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc
+       $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r ../src/mac/corersrc.r -o lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc
        $(DEREZ) lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc Carbon.r -useDF >lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 
 unzip.o: $(srcdir)/src/common/unzip.c

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index b46f4e772f236b1e65b99c501a14999e7ec987f0..abc22743582940154b2412df5b9c6afbb0450fbf 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -72,7 +72,7 @@
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>
-                $(RESCOMP) -d __UNIX__ -useDF ../src/mac/apprsrc.r ../src/mac/carbrsrc.r ../src/mac/corersrc.r -o $(MACOS_RSRC)
+                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r ../src/mac/corersrc.r -o $(MACOS_RSRC)
                 $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>