Merge pull request #1591 from fape/marmalade_paths

issue #1557: [Marmalade]The S3E data dir ONLY used by the emulator/simulator.
2012-11-17 05:40:10 -08:00 · 2012-11-17 05:40:10 -08:00 · 8de6d310bf
parent db2175e41c 30b026421e
commit 8de6d310bf
4 changed files with 4 additions and 4 deletions
--- a/samples/HelloCpp/proj.marmalade/HelloCPP.mkb
+++ b/samples/HelloCpp/proj.marmalade/HelloCPP.mkb
@ -16,7 +16,7 @@ subprojects

 assets
 {
-	(data)
+	(../Resources)
 	fonts
 	ipad
 	ipadhd
--- a/samples/HelloLua/proj.marmalade/HelloLua.mkb
+++ b/samples/HelloLua/proj.marmalade/HelloLua.mkb
@ -19,7 +19,7 @@ subprojects

 assets
 {
-	(data)
+	(../Resources)
 	background.mp3
 	background.ogg
 	effect1.wav
--- a/samples/SimpleGame/proj.marmalade/SimpleGame.mkb
+++ b/samples/SimpleGame/proj.marmalade/SimpleGame.mkb
@ -17,7 +17,7 @@ subprojects

 assets
 {
-	(data)
+	(../Resources)
 	sd
 	hd
 	fonts
--- a/samples/TestCpp/proj.marmalade/TestCPP.mkb
+++ b/samples/TestCpp/proj.marmalade/TestCPP.mkb
@ -19,7 +19,7 @@ subprojects

 assets
 {
-	(data)
+	(../Resources)
 }

 files