From: Stefan Csomor <csomor@advancedconcepts.ch> Date: Mon, 16 Jun 2008 05:12:03 +0000 (+0000) Subject: new path organisation for mac X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d47939d60c41639b4ffe69326a9144e2351a4e8c?ds=sidebyside new path organisation for mac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 8d8ad0f784..8e8cd07181 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -166,7 +166,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) $(__about___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p about.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p about.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p about.app/Contents/Resources @@ -175,7 +175,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/about/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >about.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >about.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >about.app/Contents/PkgInfo @@ -184,7 +184,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f about$(EXEEXT) about.app/Contents/MacOS/about @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@about_bundle: $(____about_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index a47b837a2c..92c9ce5d3c 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -166,7 +166,7 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc) $(__htmlhelp___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p htmlhelp.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p htmlhelp.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p htmlhelp.app/Contents/Resources @@ -175,7 +175,7 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/htmlhelp/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo @@ -184,7 +184,7 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@htmlhelp_bundle: $(____htmlhelp_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index da5c6eaaa6..3fdad62730 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -166,7 +166,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(__helpview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p helpview.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p helpview.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p helpview.app/Contents/Resources @@ -175,7 +175,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/helpview/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >helpview.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >helpview.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >helpview.app/Contents/PkgInfo @@ -184,7 +184,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index 6535fda27b..f8f8ea45ba 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -162,7 +162,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) $(__htmlctrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p htmlctrl.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p htmlctrl.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p htmlctrl.app/Contents/Resources @@ -171,7 +171,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/htmlctrl/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >htmlctrl.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlctrl.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >htmlctrl.app/Contents/PkgInfo @@ -180,7 +180,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlctrl.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlctrl.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@htmlctrl_bundle: $(____htmlctrl_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 3038ebd9a7..534d2d837b 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -170,7 +170,7 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc) $(__htmlprinting___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@htmlprinting.app/Contents/PkgInfo: htmlprinting$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@htmlprinting.app/Contents/PkgInfo: htmlprinting$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p htmlprinting.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p htmlprinting.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p htmlprinting.app/Contents/Resources @@ -179,7 +179,7 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/htmlprinting/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >htmlprinting.app/Contents/PkgInfo @@ -188,7 +188,7 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f htmlprinting$(EXEEXT) htmlprinting.app/Contents/MacOS/htmlprinting @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlprinting.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlprinting.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@htmlprinting_bundle: $(____htmlprinting_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index bdb1e654da..2aff096a9e 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -169,7 +169,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(__test___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p test.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p test.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p test.app/Contents/Resources @@ -178,7 +178,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/test/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >test.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >test.app/Contents/PkgInfo @@ -187,7 +187,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f test$(EXEEXT) test.app/Contents/MacOS/test @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 554599841e..f2c8277aa6 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -166,7 +166,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) $(__virtual___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p virtual.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p virtual.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p virtual.app/Contents/Resources @@ -175,7 +175,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/virtual/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >virtual.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >virtual.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >virtual.app/Contents/PkgInfo @@ -184,7 +184,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@virtual_bundle: $(____virtual_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 53cd21e9c9..9aaf28b9bb 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -166,7 +166,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) $(__widget___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p widget.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p widget.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p widget.app/Contents/Resources @@ -175,7 +175,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/widget/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >widget.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >widget.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >widget.app/Contents/PkgInfo @@ -184,7 +184,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@widget_bundle: $(____widget_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 5f4e05c235..dd1fed064c 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -165,7 +165,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) $(__zip___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p zip.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p zip.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p zip.app/Contents/Resources @@ -174,7 +174,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/zip/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >zip.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >zip.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >zip.app/Contents/PkgInfo @@ -183,7 +183,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP)