From 2218467b3a1f8aaca41aa8d1e1b56a85c4e5753f Mon Sep 17 00:00:00 2001 From: Marco Antognini Date: Thu, 4 Aug 2011 00:49:15 +0200 Subject: [PATCH] Updated Xcode templates --- .../TemplateInfo.plist | 80 +++++++++++++++++-- .../TemplateInfo.plist | 6 +- 2 files changed, 76 insertions(+), 10 deletions(-) diff --git a/xcode/templates/SFML Application Base.xctemplate/TemplateInfo.plist b/xcode/templates/SFML Application Base.xctemplate/TemplateInfo.plist index 0937a42b..c6bfcd29 100644 --- a/xcode/templates/SFML Application Base.xctemplate/TemplateInfo.plist +++ b/xcode/templates/SFML Application Base.xctemplate/TemplateInfo.plist @@ -179,16 +179,16 @@ sf::RenderWindow window(sf::VideoMode(800, 600), "SFML window"); main.cpp:main:image_init // Load a sprite to display -sf::Image image; +sf::Texture texture; main.cpp:main:image_finalize return EXIT_FAILURE; -sf::Sprite sprite(image); +sf::Sprite sprite(texture); main.cpp:main:image_load - if (!image.LoadFromFile(ResourcePath() + "cute_image.jpg")) + if (!texture.LoadFromFile(ResourcePath() + "cute_image.jpg")) main.cpp:main:text_init @@ -227,7 +227,7 @@ text.SetColor(sf::Color::Black); sansation.ttf Group - Supporting Files + Resources Path sansation.ttf @@ -235,7 +235,7 @@ text.SetColor(sf::Color::Black); cute_image.jpg Group - Supporting Files + Resources Path cute_image.jpg @@ -334,7 +334,7 @@ music.Play(); nice_music.ogg Group - Supporting Files + Resources Path nice_music.ogg @@ -370,6 +370,9 @@ music.Play(); main.cpp:main:audio:content + + main.cpp:main:audio_loop + @@ -501,8 +504,9 @@ int main (int argc, const char * argv[]) Path ResourcePath.hpp + TargetIndices + - main.cpp:system:include #include <SFML/System.hpp> @@ -591,6 +595,68 @@ while (window.IsOpened()) Foundation + + BuildPhases + + + Class + ShellScript + + ShellPath + /bin/sh + + ShellScript + # This shell script simply copies required sfml dylibs into the application bundle frameworks folder +# NB : this script assumes that if moduleX is required in release mode then it is also required in debug mode. + +require () # $1 is a SFML module like 'system' or 'audio' +{ + if [ -z $1 ] + then + echo "no parameter! ERROR!" + exit + else + if [ $CONFIGURATION = "Debug" ] + then + rm -f $BUILT_PRODUCTS_DIR/test.app/Contents/Frameworks/libsfml-$1.2.dylib + ditto /usr/local/lib/libsfml-$1-d.2.dylib $BUILT_PRODUCTS_DIR/test.app/Contents/Frameworks/libsfml-$1-d.2.dylib + else + rm -f $BUILT_PRODUCTS_DIR/test.app/Contents/Frameworks/libsfml-$1-d.2.dylib + ditto /usr/local/lib/libsfml-$1.2.dylib $BUILT_PRODUCTS_DIR/test.app/Contents/Frameworks/libsfml-$1.2.dylib + fi + fi +} + +if [ -n "$SYSTEM_RELEASE" ] +then + require "system" +fi + +if [ -n "$AUDIO_RELEASE" ] +then + require "audio" +fi + +if [ -n "$NETWORK_RELEASE" ] +then + require "network" +fi + +if [ -n "$WINDOW_RELEASE" ] +then + require "window" +fi + +if [ -n "$GRAPHICS_RELEASE" ] +then + require "graphics" +fi + + + RunOnlyForDeploymentPostprocessing + NO + + diff --git a/xcode/templates/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist b/xcode/templates/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist index 6c1ac446..428e6d18 100644 --- a/xcode/templates/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist +++ b/xcode/templates/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist @@ -179,16 +179,16 @@ sf::RenderWindow window(sf::VideoMode(800, 600), "SFML window"); main.cpp:main:image_init // Load a sprite to display -sf::Image image; +sf::Texture texture; main.cpp:main:image_finalize return EXIT_FAILURE; -sf::Sprite sprite(image); +sf::Sprite sprite(texture); main.cpp:main:image_load - if (!image.LoadFromFile("cute_image.jpg")) + if (!texture.LoadFromFile("cute_image.jpg")) main.cpp:main:text_init