Fixed compiling SDL 1.2 with Xcode 5.1.1 SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Tue, 24 Jun 2014 01:32:20 -0700
branchSDL-1.2
changeset 89183c8124d60e8e
parent 8914 3984998ee330
child 9013 7f4407040fbd
Fixed compiling SDL 1.2 with Xcode 5.1.1
Xcode/SDL/Info-Framework.plist
Xcode/SDL/SDL.xcodeproj/project.pbxproj
include/SDL_config_macosx.h
src/joystick/darwin/SDL_sysjoystick.c
     1.1 --- a/Xcode/SDL/Info-Framework.plist	Mon Jun 23 11:29:53 2014 -0400
     1.2 +++ b/Xcode/SDL/Info-Framework.plist	Tue Jun 24 01:32:20 2014 -0700
     1.3 @@ -19,10 +19,10 @@
     1.4  	<key>CFBundlePackageType</key>
     1.5  	<string>FMWK</string>
     1.6  	<key>CFBundleShortVersionString</key>
     1.7 -	<string>1.2.14</string>
     1.8 +	<string>1.2.15</string>
     1.9  	<key>CFBundleSignature</key>
    1.10  	<string>SDLX</string>
    1.11  	<key>CFBundleVersion</key>
    1.12 -	<string>1.2.14</string>
    1.13 +	<string>1.2.15</string>
    1.14  </dict>
    1.15  </plist>
     2.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Mon Jun 23 11:29:53 2014 -0400
     2.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Tue Jun 24 01:32:20 2014 -0700
     2.3 @@ -1455,7 +1455,7 @@
     2.4  			);
     2.5  			runOnlyForDeploymentPostprocessing = 0;
     2.6  			shellPath = /bin/sh;
     2.7 -			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/SDL.framework build/dmg-tmp/\n\n# strip moved to Xcode native mechanism\n# strip -x build/dmg-tmp/SDL.framework/SDL\n\ncp pkg-support/resources/License.rtf build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/ReadMeDevLite.txt build/dmg-tmp/devel-lite\ncp pkg-support/resources/UniversalBinaryNotes.rtf build/dmg-tmp\n\ncp ../../src/main/macosx/SDLMain.h build/dmg-tmp/devel-lite\ncp ../../src/main/macosx/SDLMain.m 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 \"{}\" \\;\nfind -d build/dmg-tmp -type d -name .svn -exec rm -rf \"{}\" \\;\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 SDL -srcfolder build/dmg-tmp build/SDL.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n\n# compress it???\n#(cd build; gnutar -zcvf SDL.dmg.tar.gz SDL.dmg)";
     2.8 +			shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nmkdir -p build/dmg-tmp/devel-lite\nCpMac -r $TARGET_BUILD_DIR/SDL.framework build/dmg-tmp/\n\n# strip moved to Xcode native mechanism\n# strip -x build/dmg-tmp/SDL.framework/SDL\n\ncp pkg-support/resources/License.rtf build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/ReadMeDevLite.txt build/dmg-tmp/devel-lite\ncp pkg-support/resources/UniversalBinaryNotes.rtf build/dmg-tmp\n\ncp ../../src/main/macosx/SDLMain.h build/dmg-tmp/devel-lite\ncp ../../src/main/macosx/SDLMain.m 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 \"{}\" \\;\nfind -d build/dmg-tmp -type d -name .svn -exec rm -rf \"{}\" \\;\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 SDL -srcfolder build/dmg-tmp build/SDL.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n\n# compress it???\n#(cd build; gnutar -zcvf SDL.dmg.tar.gz SDL.dmg)";
     2.9  		};
    2.10  		BECDF6C20761BA81005FE872 /* ShellScript */ = {
    2.11  			isa = PBXShellScriptBuildPhase;
    2.12 @@ -1742,6 +1742,7 @@
    2.13  				OTHER_CFLAGS_ppc = "";
    2.14  				OTHER_LDFLAGS_ppc = "-prebind -seg1addr 0x30000000";
    2.15  				PRODUCT_NAME = SDL;
    2.16 +				SDKROOT = macosx10.8;
    2.17  				WRAPPER_EXTENSION = framework;
    2.18  			};
    2.19  			name = Release;
    2.20 @@ -1834,6 +1835,7 @@
    2.21  				OTHER_CFLAGS_i386 = "";
    2.22  				OTHER_CFLAGS_ppc = "";
    2.23  				PRODUCT_NAME = SDL;
    2.24 +				SDKROOT = macosx10.8;
    2.25  				WRAPPER_EXTENSION = framework;
    2.26  			};
    2.27  			name = Debug;
     3.1 --- a/include/SDL_config_macosx.h	Mon Jun 23 11:29:53 2014 -0400
     3.2 +++ b/include/SDL_config_macosx.h	Tue Jun 24 01:32:20 2014 -0700
     3.3 @@ -133,6 +133,7 @@
     3.4  #define SDL_VIDEO_DRIVER_X11_XME 1
     3.5  #define SDL_VIDEO_DRIVER_X11_XRANDR 1
     3.6  #define SDL_VIDEO_DRIVER_X11_XV 1
     3.7 +#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1
     3.8  
     3.9  /* Enable OpenGL support */
    3.10  #define SDL_VIDEO_OPENGL	1
     4.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Mon Jun 23 11:29:53 2014 -0400
     4.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Tue Jun 24 01:32:20 2014 -0700
     4.3 @@ -182,7 +182,7 @@
     4.4  			plugInResult = (*ppPlugInInterface)->QueryInterface (ppPlugInInterface,
     4.5  								CFUUIDGetUUIDBytes (kIOHIDDeviceInterfaceID), (void *) &(pDevice->interface));
     4.6  			if (S_OK != plugInResult)
     4.7 -				HIDReportErrorNum ("CouldnŐt query HID class device interface from plugInInterface", plugInResult);
     4.8 +				HIDReportErrorNum ("Couldn't query HID class device interface from plugInInterface", plugInResult);
     4.9  			(*ppPlugInInterface)->Release (ppPlugInInterface);
    4.10  		}
    4.11  		else