Updated Mac OS X and iOS projects
authorSam Lantinga <slouken@libsdl.org>
Thu, 21 Jun 2012 10:41:25 -0400
changeset 6338079ecfd1cde7
parent 6337 3c91a153f398
child 6339 3f5867d48dcc
Updated Mac OS X and iOS projects
Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
Xcode/SDL/SDL.xcodeproj/project.pbxproj
include/SDL_config_macosx.h
     1.1 --- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Thu Jun 21 11:16:14 2012 -0300
     1.2 +++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Thu Jun 21 10:41:25 2012 -0400
     1.3 @@ -116,6 +116,8 @@
     1.4  		56ED04E3118A8EFD00A56AA6 /* SDL_syspower.m in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */; };
     1.5  		93CB792313FC5E5200BD3E05 /* SDL_uikitviewcontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */; };
     1.6  		93CB792613FC5F5300BD3E05 /* SDL_uikitviewcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */; };
     1.7 +		AA628ADB159369E3005138DD /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AD9159369E3005138DD /* SDL_rotate.c */; };
     1.8 +		AA628ADC159369E3005138DD /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628ADA159369E3005138DD /* SDL_rotate.h */; };
     1.9  		AA9781C91576A7FA00472542 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6526630DE8FCCB002AD96B /* libSDL2.a */; };
    1.10  		FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */; };
    1.11  		FD3F495C0DEA5B2100C5B771 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CC0DD52EB400FB1D6B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
    1.12 @@ -365,6 +367,8 @@
    1.13  		56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_syspower.m; path = ../../src/power/uikit/SDL_syspower.m; sourceTree = SOURCE_ROOT; };
    1.14  		93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitviewcontroller.h; sourceTree = "<group>"; };
    1.15  		93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitviewcontroller.m; sourceTree = "<group>"; };
    1.16 +		AA628AD9159369E3005138DD /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = "<group>"; };
    1.17 +		AA628ADA159369E3005138DD /* SDL_rotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rotate.h; sourceTree = "<group>"; };
    1.18  		FD0BBFEF0E3933DD00D833B1 /* SDL_uikitview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitview.h; sourceTree = "<group>"; };
    1.19  		FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitkeyboard.h; sourceTree = "<group>"; };
    1.20  		FD3F4A700DEA620800C5B771 /* SDL_getenv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_getenv.c; sourceTree = "<group>"; };
    1.21 @@ -687,8 +691,10 @@
    1.22  				04F7807212FB751400FC43C0 /* SDL_drawline.h */,
    1.23  				04F7807312FB751400FC43C0 /* SDL_drawpoint.c */,
    1.24  				04F7807412FB751400FC43C0 /* SDL_drawpoint.h */,
    1.25 +				0442EC4F12FE1C1E004C9285 /* SDL_render_sw.c */,
    1.26  				0442EC4E12FE1C1E004C9285 /* SDL_render_sw_c.h */,
    1.27 -				0442EC4F12FE1C1E004C9285 /* SDL_render_sw.c */,
    1.28 +				AA628AD9159369E3005138DD /* SDL_rotate.c */,
    1.29 +				AA628ADA159369E3005138DD /* SDL_rotate.h */,
    1.30  			);
    1.31  			path = software;
    1.32  			sourceTree = "<group>";
    1.33 @@ -1226,6 +1232,7 @@
    1.34  				22C905CD13A22646003FE4E4 /* SDL_hints_c.h in Headers */,
    1.35  				56EA86FC13E9EC2B002E47EB /* SDL_coreaudio.h in Headers */,
    1.36  				93CB792313FC5E5200BD3E05 /* SDL_uikitviewcontroller.h in Headers */,
    1.37 +				AA628ADC159369E3005138DD /* SDL_rotate.h in Headers */,
    1.38  			);
    1.39  			runOnlyForDeploymentPostprocessing = 0;
    1.40  		};
    1.41 @@ -1441,6 +1448,7 @@
    1.42  				04BAC09D1300C1290055DE28 /* SDL_log.c in Sources */,
    1.43  				56EA86FB13E9EC2B002E47EB /* SDL_coreaudio.c in Sources */,
    1.44  				93CB792613FC5F5300BD3E05 /* SDL_uikitviewcontroller.m in Sources */,
    1.45 +				AA628ADB159369E3005138DD /* SDL_rotate.c in Sources */,
    1.46  			);
    1.47  			runOnlyForDeploymentPostprocessing = 0;
    1.48  		};
     2.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Thu Jun 21 11:16:14 2012 -0300
     2.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Thu Jun 21 10:41:25 2012 -0400
     2.3 @@ -497,6 +497,14 @@
     2.4  		8CB0A77811F6A87F00CBA2DE /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77611F6A87F00CBA2DE /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
     2.5  		8CB0A77911F6A87F00CBA2DE /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77711F6A87F00CBA2DE /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
     2.6  		AA41F88014B8F1F500993C4F /* SDL_dropevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */; };
     2.7 +		AA628ACA159367B7005138DD /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AC8159367B7005138DD /* SDL_rotate.c */; };
     2.8 +		AA628ACB159367B7005138DD /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AC8159367B7005138DD /* SDL_rotate.c */; };
     2.9 +		AA628ACC159367B7005138DD /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AC9159367B7005138DD /* SDL_rotate.h */; };
    2.10 +		AA628ACD159367B7005138DD /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AC9159367B7005138DD /* SDL_rotate.h */; };
    2.11 +		AA628AD1159367F2005138DD /* SDL_x11xinput2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628ACF159367F2005138DD /* SDL_x11xinput2.c */; };
    2.12 +		AA628AD2159367F2005138DD /* SDL_x11xinput2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628ACF159367F2005138DD /* SDL_x11xinput2.c */; };
    2.13 +		AA628AD3159367F2005138DD /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
    2.14 +		AA628AD4159367F2005138DD /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
    2.15  		BECDF6760761BA81005FE872 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */; };
    2.16  		BECDF6770761BA81005FE872 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC705C4450500E5DC7F /* SDL_name.h */; };
    2.17  /* End PBXBuildFile section */
    2.18 @@ -830,6 +838,10 @@
    2.19  		566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dropevents.c; sourceTree = "<group>"; };
    2.20  		8CB0A77611F6A87F00CBA2DE /* SDL_gesture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_gesture.h; path = ../../include/SDL_gesture.h; sourceTree = SOURCE_ROOT; };
    2.21  		8CB0A77711F6A87F00CBA2DE /* SDL_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_touch.h; path = ../../include/SDL_touch.h; sourceTree = SOURCE_ROOT; };
    2.22 +		AA628AC8159367B7005138DD /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = "<group>"; };
    2.23 +		AA628AC9159367B7005138DD /* SDL_rotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rotate.h; sourceTree = "<group>"; };
    2.24 +		AA628ACF159367F2005138DD /* SDL_x11xinput2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_x11xinput2.c; sourceTree = "<group>"; };
    2.25 +		AA628AD0159367F2005138DD /* SDL_x11xinput2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11xinput2.h; sourceTree = "<group>"; };
    2.26  		B29A290D04E5B28700A80002 /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = ../../include/SDL_loadso.h; sourceTree = "<group>"; };
    2.27  		B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_cpuinfo.h; path = ../../include/SDL_cpuinfo.h; sourceTree = SOURCE_ROOT; };
    2.28  		B2CF8DC705C4450500E5DC7F /* SDL_name.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_name.h; path = ../../include/SDL_name.h; sourceTree = SOURCE_ROOT; };
    2.29 @@ -1110,8 +1122,10 @@
    2.30  				04F7804512FB74A200FC43C0 /* SDL_drawline.h */,
    2.31  				04F7804612FB74A200FC43C0 /* SDL_drawpoint.c */,
    2.32  				04F7804712FB74A200FC43C0 /* SDL_drawpoint.h */,
    2.33 +				0442EC1B12FE1BCB004C9285 /* SDL_render_sw.c */,
    2.34  				0442EC1A12FE1BCB004C9285 /* SDL_render_sw_c.h */,
    2.35 -				0442EC1B12FE1BCB004C9285 /* SDL_render_sw.c */,
    2.36 +				AA628AC8159367B7005138DD /* SDL_rotate.c */,
    2.37 +				AA628AC9159367B7005138DD /* SDL_rotate.h */,
    2.38  			);
    2.39  			path = software;
    2.40  			sourceTree = "<group>";
    2.41 @@ -1475,6 +1489,8 @@
    2.42  				04BDFFD412E6671800899322 /* SDL_x11video.h */,
    2.43  				04BDFFD512E6671800899322 /* SDL_x11window.c */,
    2.44  				04BDFFD612E6671800899322 /* SDL_x11window.h */,
    2.45 +				AA628ACF159367F2005138DD /* SDL_x11xinput2.c */,
    2.46 +				AA628AD0159367F2005138DD /* SDL_x11xinput2.h */,
    2.47  			);
    2.48  			path = x11;
    2.49  			sourceTree = "<group>";
    2.50 @@ -1722,6 +1738,8 @@
    2.51  				0435673F1303160F00BA5428 /* SDL_shaders_gl.h in Headers */,
    2.52  				0417A4F5130C984E00578583 /* SDL_keycode.h in Headers */,
    2.53  				566CDE8F148F0AC200C5A9BB /* SDL_dropevents_c.h in Headers */,
    2.54 +				AA628ACC159367B7005138DD /* SDL_rotate.h in Headers */,
    2.55 +				AA628AD3159367F2005138DD /* SDL_x11xinput2.h in Headers */,
    2.56  			);
    2.57  			runOnlyForDeploymentPostprocessing = 0;
    2.58  		};
    2.59 @@ -1833,6 +1851,8 @@
    2.60  				04BAC0B41300C1CB0055DE28 /* SDL_log.h in Headers */,
    2.61  				043567411303160F00BA5428 /* SDL_shaders_gl.h in Headers */,
    2.62  				0417A4F4130C984E00578583 /* SDL_keycode.h in Headers */,
    2.63 +				AA628ACD159367B7005138DD /* SDL_rotate.h in Headers */,
    2.64 +				AA628AD4159367F2005138DD /* SDL_x11xinput2.h in Headers */,
    2.65  			);
    2.66  			runOnlyForDeploymentPostprocessing = 0;
    2.67  		};
    2.68 @@ -2020,7 +2040,7 @@
    2.69  			);
    2.70  			runOnlyForDeploymentPostprocessing = 0;
    2.71  			shellPath = /bin/sh;
    2.72 -			shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nmkdir -p build/dmg-tmp/devel-lite\n/Developer/Tools/CpMac -r $TARGET_BUILD_DIR/SDL2.framework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/ReadMeDevLite.txt build/dmg-tmp/devel-lite\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL2 -srcfolder build/dmg-tmp build/SDL2.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
    2.73 +			shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nmkdir -p build/dmg-tmp/devel-lite\n`xcode-select -print-path`/Tools/CpMac -r $TARGET_BUILD_DIR/SDL2.framework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/ReadMeDevLite.txt build/dmg-tmp/devel-lite\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL2 -srcfolder build/dmg-tmp build/SDL2.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
    2.74  		};
    2.75  		BECDF6C20761BA81005FE872 /* ShellScript */ = {
    2.76  			isa = PBXShellScriptBuildPhase;
    2.77 @@ -2160,6 +2180,8 @@
    2.78  				04BAC0C81300C2160055DE28 /* SDL_log.c in Sources */,
    2.79  				0435673E1303160F00BA5428 /* SDL_shaders_gl.c in Sources */,
    2.80  				566CDE90148F0AC200C5A9BB /* SDL_dropevents.c in Sources */,
    2.81 +				AA628ACA159367B7005138DD /* SDL_rotate.c in Sources */,
    2.82 +				AA628AD1159367F2005138DD /* SDL_x11xinput2.c in Sources */,
    2.83  			);
    2.84  			runOnlyForDeploymentPostprocessing = 0;
    2.85  		};
    2.86 @@ -2271,6 +2293,8 @@
    2.87  				0442EC6012FE1C75004C9285 /* SDL_hints.c in Sources */,
    2.88  				04BAC0C91300C2160055DE28 /* SDL_log.c in Sources */,
    2.89  				043567401303160F00BA5428 /* SDL_shaders_gl.c in Sources */,
    2.90 +				AA628ACB159367B7005138DD /* SDL_rotate.c in Sources */,
    2.91 +				AA628AD2159367F2005138DD /* SDL_x11xinput2.c in Sources */,
    2.92  			);
    2.93  			runOnlyForDeploymentPostprocessing = 0;
    2.94  		};
    2.95 @@ -2364,7 +2388,6 @@
    2.96  		00CFA625106A567900758660 /* Release */ = {
    2.97  			isa = XCBuildConfiguration;
    2.98  			buildSettings = {
    2.99 -				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.100  				PRODUCT_NAME = "Standard DMG";
   2.101  			};
   2.102  			name = Release;
   2.103 @@ -2372,7 +2395,6 @@
   2.104  		00CFA626106A567900758660 /* Release */ = {
   2.105  			isa = XCBuildConfiguration;
   2.106  			buildSettings = {
   2.107 -				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.108  				PRODUCT_NAME = "Developer Extras Package";
   2.109  			};
   2.110  			name = Release;
   2.111 @@ -2426,7 +2448,6 @@
   2.112  		00CFA62B106A568900758660 /* Debug */ = {
   2.113  			isa = XCBuildConfiguration;
   2.114  			buildSettings = {
   2.115 -				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.116  				PRODUCT_NAME = "Standard DMG";
   2.117  			};
   2.118  			name = Debug;
   2.119 @@ -2434,7 +2455,6 @@
   2.120  		00CFA62C106A568900758660 /* Debug */ = {
   2.121  			isa = XCBuildConfiguration;
   2.122  			buildSettings = {
   2.123 -				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.124  				PRODUCT_NAME = "Developer Extras Package";
   2.125  			};
   2.126  			name = Debug;
     3.1 --- a/include/SDL_config_macosx.h	Thu Jun 21 11:16:14 2012 -0300
     3.2 +++ b/include/SDL_config_macosx.h	Thu Jun 21 10:41:25 2012 -0400
     3.3 @@ -140,7 +140,6 @@
     3.4  #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
     3.5  #define SDL_VIDEO_DRIVER_X11_XINERAMA 1
     3.6  #define SDL_VIDEO_DRIVER_X11_XINPUT2 1
     3.7 -#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1
     3.8  #define SDL_VIDEO_DRIVER_X11_XRANDR 1
     3.9  #define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
    3.10  #define SDL_VIDEO_DRIVER_X11_XSHAPE 1