From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 12 Jun 2008 20:14:32 +0000 (+0000)
Subject: mac paths updated
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/17e75d3fa72a08e2af5d11a7c287fd990c8d648f

mac paths updated

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

diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 12ec1314d2..0741b9144c 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -167,7 +167,7 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
 	$(__mediaplayer___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@	mkdir -p mediaplayer.app/Contents
 @COND_PLATFORM_MACOSX_1@	mkdir -p mediaplayer.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@	mkdir -p mediaplayer.app/Contents/Resources
@@ -176,7 +176,7 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___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/mediaplayer/" \
 @COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >mediaplayer.app/Contents/PkgInfo
@@ -185,7 +185,7 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
 @COND_PLATFORM_MACOSX_1@	ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP)
 
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 0c2dcae74b..11b181882b 100644
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -179,7 +179,7 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
 	$(__splash___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@	mkdir -p splash.app/Contents
 @COND_PLATFORM_MACOSX_1@	mkdir -p splash.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@	mkdir -p splash.app/Contents/Resources
@@ -188,7 +188,7 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___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/splash/" \
 @COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >splash.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >splash.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >splash.app/Contents/PkgInfo
@@ -197,7 +197,7 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
 @COND_PLATFORM_MACOSX_1@	ln -f splash$(EXEEXT) splash.app/Contents/MacOS/splash
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splash.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns splash.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@splash_bundle: $(____splash_BUNDLE_TGT_REF_DEP)