1.1 --- a/Xcode/SDL_net.xcodeproj/project.pbxproj Sat Jan 28 11:12:19 2012 -0500
1.2 +++ b/Xcode/SDL_net.xcodeproj/project.pbxproj Sat Jan 28 13:24:55 2012 -0500
1.3 @@ -18,7 +18,7 @@
1.4 BE48FF6A07AFA9A800BB41DA /* SDLnetselect.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E06A2820119C8317F000001 /* SDLnetselect.c */; };
1.5 BE48FF6B07AFA9A800BB41DA /* SDLnetTCP.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E06A2840119C8317F000001 /* SDLnetTCP.c */; };
1.6 BE48FF6C07AFA9A800BB41DA /* SDLnetUDP.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E06A2850119C8317F000001 /* SDLnetUDP.c */; };
1.7 - BE48FF8307AFAA6F00BB41DA /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE48FF8207AFAA6F00BB41DA /* SDL.framework */; };
1.8 + BE48FF8307AFAA6F00BB41DA /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE48FF8207AFAA6F00BB41DA /* SDL2.framework */; };
1.9 /* End PBXBuildFile section */
1.10
1.11 /* Begin PBXContainerItemProxy section */
1.12 @@ -46,7 +46,7 @@
1.13 BE48FF6407AFA9A800BB41DA /* SDL_net.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL_net.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1.14 BE48FF6F07AFA9A900BB41DA /* libSDL_net.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL_net.a; sourceTree = BUILT_PRODUCTS_DIR; };
1.15 BE48FF7307AFA9A900BB41DA /* Create DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Create DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
1.16 - BE48FF8207AFAA6F00BB41DA /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = "<absolute>"; };
1.17 + BE48FF8207AFAA6F00BB41DA /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
1.18 F59C710300D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
1.19 F59C710400D5CB5801000001 /* Welcome.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Welcome.txt; sourceTree = "<group>"; };
1.20 F59C710600D5CB5801000001 /* SDL_net.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SDL_net.info; sourceTree = "<group>"; };
1.21 @@ -57,7 +57,7 @@
1.22 isa = PBXFrameworksBuildPhase;
1.23 buildActionMask = 2147483647;
1.24 files = (
1.25 - BE48FF8307AFAA6F00BB41DA /* SDL.framework in Frameworks */,
1.26 + BE48FF8307AFAA6F00BB41DA /* SDL2.framework in Frameworks */,
1.27 );
1.28 runOnlyForDeploymentPostprocessing = 0;
1.29 };
1.30 @@ -137,7 +137,7 @@
1.31 BE48FF8107AFAA4A00BB41DA /* Linked Frameworks */ = {
1.32 isa = PBXGroup;
1.33 children = (
1.34 - BE48FF8207AFAA6F00BB41DA /* SDL.framework */,
1.35 + BE48FF8207AFAA6F00BB41DA /* SDL2.framework */,
1.36 );
1.37 name = "Linked Frameworks";
1.38 sourceTree = "<group>";
1.39 @@ -192,6 +192,7 @@
1.40 BE48FF5B07AFA9A800BB41DA /* Sources */,
1.41 BE48FF6007AFA9A800BB41DA /* Frameworks */,
1.42 BE48FF6107AFA9A800BB41DA /* Rez */,
1.43 + AAF0666114D4748600475C7D /* Convert SDL includes to SDL Framework includes */,
1.44 );
1.45 buildRules = (
1.46 );
1.47 @@ -295,6 +296,20 @@
1.48 /* End PBXRezBuildPhase section */
1.49
1.50 /* Begin PBXShellScriptBuildPhase section */
1.51 + AAF0666114D4748600475C7D /* Convert SDL includes to SDL Framework includes */ = {
1.52 + isa = PBXShellScriptBuildPhase;
1.53 + buildActionMask = 2147483647;
1.54 + files = (
1.55 + );
1.56 + inputPaths = (
1.57 + );
1.58 + name = "Convert SDL includes to SDL Framework includes";
1.59 + outputPaths = (
1.60 + );
1.61 + runOnlyForDeploymentPostprocessing = 0;
1.62 + shellPath = /bin/sh;
1.63 + shellScript = "cd $SYMROOT/$CONFIGURATION/$PUBLIC_HEADERS_FOLDER_PATH\nHEADER=SDL_net.h\nsed 's,#include \"\\(.*\\)\",#include <SDL2/\\1>,' <$HEADER >$HEADER.new\nmv $HEADER.new $HEADER";
1.64 + };
1.65 BE48FF7207AFA9A900BB41DA /* ShellScript */ = {
1.66 isa = PBXShellScriptBuildPhase;
1.67 buildActionMask = 2147483647;
1.68 @@ -302,7 +317,7 @@
1.69 );
1.70 runOnlyForDeploymentPostprocessing = 0;
1.71 shellPath = /bin/sh;
1.72 - shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\n/Developer/Tools/CpMac -r $TARGET_BUILD_DIR/SDL_net.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL_net -srcfolder build/dmg-tmp build/SDL_net.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n\n# compress it???\n#(cd build; gnutar -zcvf SDL_net.dmg.tar.gz SDL_net.dmg)";
1.73 + shellScript = "# clean up the framework, remove headers, extra files\nPRODUCT_NAME=SDL2_net\nmkdir -p build/dmg-tmp\n/Developer/Tools/CpMac -r $TARGET_BUILD_DIR/$PRODUCT_NAME.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname $PRODUCT_NAME -srcfolder build/dmg-tmp build/$PRODUCT_NAME.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
1.74 };
1.75 /* End PBXShellScriptBuildPhase section */
1.76
1.77 @@ -446,8 +461,9 @@
1.78 /Library/Frameworks/SDL.framework/Headers,
1.79 );
1.80 MACOSX_DEPLOYMENT_TARGET = 10.5;
1.81 - PRODUCT_NAME = SDL_net;
1.82 + PRODUCT_NAME = SDL2_net;
1.83 SDKROOT = macosx;
1.84 + USER_HEADER_SEARCH_PATHS = "$(HOME)/Library/Frameworks/SDL2.framework/Headers /Library/Frameworks/SDL2.framework/Headers";
1.85 };
1.86 name = Debug;
1.87 };
1.88 @@ -467,10 +483,11 @@
1.89 /Library/Frameworks/SDL.framework/Headers,
1.90 );
1.91 MACOSX_DEPLOYMENT_TARGET = 10.5;
1.92 - PRODUCT_NAME = SDL_net;
1.93 + PRODUCT_NAME = SDL2_net;
1.94 SDKROOT = macosx;
1.95 SEPARATE_STRIP = YES;
1.96 STRIP_STYLE = "non-global";
1.97 + USER_HEADER_SEARCH_PATHS = "$(HOME)/Library/Frameworks/SDL2.framework/Headers /Library/Frameworks/SDL2.framework/Headers";
1.98 };
1.99 name = Release;
1.100 };