Updated main.c for API changes
authorSam Lantinga <slouken@libsdl.org>
Fri, 28 Jan 2011 10:37:36 -0800
changeset 5125b6c7a6b07ebf
parent 5124 d79ff339d1f2
child 5126 ad4141d88412
Updated main.c for API changes

Kees Bakker to sdl

The main.c for the template is still targeting SDL1.2. Here
is the patch to make it work for SDL1.3 (I'm hoping
the mailing lists accepts attachments.)

In this patch I have also changed the shell script that
assembles the Template. Since there is now only one lib
target (same name for "device" and "simulator" version)
I copy the simulator library to the destination with
the name libSDLSimulator.a. This is not a satisfactory
solution, because both libraries are included in the project
while only one is needed (depending on the selected
environment). However, I'm not fluent with Xcode to
say what a better solution would be.

Kind regards,
Kees Bakker
Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
Xcode-iPhoneOS/Template/SDL Application/main.c
     1.1 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Fri Jan 28 10:21:58 2011 -0800
     1.2 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Fri Jan 28 10:37:36 2011 -0800
     1.3 @@ -1352,7 +1352,7 @@
     1.4  			);
     1.5  			runOnlyForDeploymentPostprocessing = 0;
     1.6  			shellPath = /bin/sh;
     1.7 -			shellScript = "# clean up the framework, remove headers, extra files\n\ntemp=$BUILD_DIR/$BUILD_STYLE-template\ndest=\"/Developer/Platforms/iPhoneOS.platform/Developer/Library/XCode/Project Templates/SDL\"\ntemplate_dir_name=\"SDL Application\"\n\nrsync_flags=\"--exclude *.svn --links -r\"\n\n# mkdir -p $dest\nmkdir -p $temp\nmkdir -p \"$temp/$template_dir_name/lib/\"\nmkdir -p \"$temp/$template_dir_name/include\"\n\n#copy template\nrsync $rsync_flags \"../template/$template_dir_name\" $temp/\n\n#copy iPhone OS library\nrsync $rsync_flags -r $BUILD_DIR/$BUILD_STYLE-iphoneos/libSDLiPhoneOS.a \"$temp/$template_dir_name/lib/\"\n\n#copy iPhone Simulator Lib\nrsync $rsync_flags -r $BUILD_DIR/$BUILD_STYLE-iphonesimulator/libSDLSimulator.a \"$temp/$template_dir_name/lib/\"\n\n#copy headers\nrsync $rsync_flags ../../include/ \"$temp/$template_dir_name/include\"\n\n#install (nah, don't install)\n# cp -fr \"$temp/$template_dir_name\" \"$dest\"";
     1.8 +			shellScript = "# clean up the framework, remove headers, extra files\n\ntemp=$BUILD_DIR/$BUILD_STYLE-template\ndest=\"/Developer/Platforms/iPhoneOS.platform/Developer/Library/XCode/Project Templates/SDL\"\ntemplate_dir_name=\"SDL Application\"\n\nrsync_flags=\"--exclude *.svn --links -r\"\n\n# mkdir -p $dest\nmkdir -p $temp\nmkdir -p \"$temp/$template_dir_name/lib/\"\nmkdir -p \"$temp/$template_dir_name/include\"\n\n#copy template\nrsync $rsync_flags \"../template/$template_dir_name\" $temp/\n\n#copy iPhone OS library\nrsync $rsync_flags -r $BUILD_DIR/$BUILD_STYLE-iphoneos/libSDLiPhoneOS.a \"$temp/$template_dir_name/lib/\"\n\n#copy iPhone Simulator Lib. Can't use the same name.\nrsync $rsync_flags -r $BUILD_DIR/$BUILD_STYLE-iphonesimulator/libSDLiPhoneOS.a \"$temp/$template_dir_name/lib/libSDLSimulator.a\"\n\n#copy headers\nrsync $rsync_flags ../../include/. \"$temp/$template_dir_name/include\"\n\n#install (nah, don't install)\n# cp -fr \"$temp/$template_dir_name\" \"$dest\"";
     1.9  		};
    1.10  /* End PBXShellScriptBuildPhase section */
    1.11  
     2.1 --- a/Xcode-iPhoneOS/Template/SDL Application/main.c	Fri Jan 28 10:21:58 2011 -0800
     2.2 +++ b/Xcode-iPhoneOS/Template/SDL Application/main.c	Fri Jan 28 10:37:36 2011 -0800
     2.3 @@ -32,9 +32,10 @@
     2.4      r = randomInt(50, 255);
     2.5      g = randomInt(50, 255);
     2.6      b = randomInt(50, 255);
     2.7 +    SDL_SetRenderDrawColor(r, g, b, 255);
     2.8  
     2.9      /*  Fill the rectangle in the color */
    2.10 -    SDL_RenderFill(r, g, b, 255, &rect);
    2.11 +    SDL_RenderFillRect(&rect);
    2.12  
    2.13      /* update screen */
    2.14      SDL_RenderPresent();
    2.15 @@ -69,7 +70,7 @@
    2.16      }
    2.17  
    2.18      /* Fill screen with black */
    2.19 -    SDL_RenderFill(0, 0, 0, 0, NULL);
    2.20 +    SDL_RenderClear();
    2.21  
    2.22      /* Enter render loop, waiting for user to quit */
    2.23      done = 0;