diff options
| author | Paolo Bosetti <[email protected]> | 2012-08-16 10:12:40 +0200 |
|---|---|---|
| committer | Paolo Bosetti <[email protected]> | 2012-08-16 10:18:41 +0200 |
| commit | efa46146a58be501daf3a38a15ffa9e3ddc87508 (patch) | |
| tree | ce57dbd7dba008363513f881599783c1342cdd51 /xcode | |
| parent | 441079557d8e78f33314aea14b31cc22932d0ff4 (diff) | |
| parent | 23e88dba6e9cfaded527f477341e7a7fe50e6795 (diff) | |
| download | mruby-efa46146a58be501daf3a38a15ffa9e3ddc87508.tar.gz mruby-efa46146a58be501daf3a38a15ffa9e3ddc87508.zip | |
Merge branch 'master' into XCode
Also, fixed issue in Xcode project build settings
Diffstat (limited to 'xcode')
| -rw-r--r-- | xcode/mruby.xcodeproj/project.pbxproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xcode/mruby.xcodeproj/project.pbxproj b/xcode/mruby.xcodeproj/project.pbxproj index 2a98c54f8..2ea99b6ca 100644 --- a/xcode/mruby.xcodeproj/project.pbxproj +++ b/xcode/mruby.xcodeproj/project.pbxproj @@ -833,7 +833,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ../test\ncat ./assert.rb ./t/*.rb > mrbtest.rbtmp\n../Xcode/build/mrbc -Bmrbtest_irep -omrbtest.ctmp mrbtest.rbtmp\ncat init_mrbtest.c mrbtest.ctmp > mrbtest.c"; + shellScript = "cd ../test\ncat ./assert.rb ./t/*.rb > mrbtest.rbtmp\n../xcode/bin/mrbc -Bmrbtest_irep -omrbtest.ctmp mrbtest.rbtmp\ncat init_mrbtest.c mrbtest.ctmp > mrbtest.c"; }; 88760AE015759C3600113BFB /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -846,7 +846,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ../mrblib\ncat ./*.rb > mrblib.rbtmp\n../Xcode/build/mrbc -Bmrblib_irep -omrblib.ctmp mrblib.rbtmp\ncat init_mrblib.c mrblib.ctmp > mrblib.c"; + shellScript = "cd ../mrblib\ncat ./*.rb > mrblib.rbtmp\n../xcode/bin/mrbc -Bmrblib_irep -omrblib.ctmp mrblib.rbtmp\ncat init_mrblib.c mrblib.ctmp > mrblib.c"; }; 88760AE915759F5E00113BFB /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -872,7 +872,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ../mrblib\ncat ./*.rb > mrblib.rbtmp\n../Xcode/build/mrbc -Bmrblib_irep -omrblib.ctmp mrblib.rbtmp\ncat init_mrblib.c mrblib.ctmp > mrblib.c"; + shellScript = "cd ../mrblib\ncat ./*.rb > mrblib.rbtmp\n../xcode/bin/mrbc -Bmrblib_irep -omrblib.ctmp mrblib.rbtmp\ncat init_mrblib.c mrblib.ctmp > mrblib.c"; }; /* End PBXShellScriptBuildPhase section */ |