From: Stefan Csomor Date: Mon, 16 Jun 2008 05:13:09 +0000 (+0000) Subject: new path organisation for mac X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e615e25fa2af32577f16a614932d44874fb0602 new path organisation for mac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index fb13bfb2e6..a7c2a8cdde 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -164,7 +164,7 @@ distclean: clean @COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p cube.app/Contents @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p cube.app/Contents/MacOS @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p cube.app/Contents/Resources @@ -173,7 +173,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/EXECUTABLE/cube/" \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >cube.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >cube.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ echo -n "APPL????" >cube.app/Contents/PkgInfo @@ -182,7 +182,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP) diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 634dfea252..bcf898ee82 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -165,7 +165,7 @@ distclean: clean @COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p isosurf.app/Contents @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p isosurf.app/Contents/MacOS @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p isosurf.app/Contents/Resources @@ -174,7 +174,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/EXECUTABLE/isosurf/" \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >isosurf.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >isosurf.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ echo -n "APPL????" >isosurf.app/Contents/PkgInfo @@ -183,7 +183,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf_bundle: $(____isosurf_BUNDLE_TGT_REF_DEP) diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index c464c8d609..4983b43fdd 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -175,7 +175,7 @@ distclean: clean @COND_USE_OPENGL_1@ $(__penguin___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p penguin.app/Contents @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p penguin.app/Contents/MacOS @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p penguin.app/Contents/Resources @@ -184,7 +184,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/EXECUTABLE/penguin/" \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >penguin.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >penguin.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ echo -n "APPL????" >penguin.app/Contents/PkgInfo @@ -193,7 +193,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin_bundle: $(____penguin_BUNDLE_TGT_REF_DEP)