Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fixed compiling SDL 1.2 with Xcode 5.1.1
- Loading branch information
|
|
@@ -19,10 +19,10 @@ |
|
|
<key>CFBundlePackageType</key> |
|
|
<string>FMWK</string> |
|
|
<key>CFBundleShortVersionString</key> |
|
|
<string>1.2.14</string> |
|
|
<string>1.2.15</string> |
|
|
<key>CFBundleSignature</key> |
|
|
<string>SDLX</string> |
|
|
<key>CFBundleVersion</key> |
|
|
<string>1.2.14</string> |
|
|
<string>1.2.15</string> |
|
|
</dict> |
|
|
</plist> |
|
|
@@ -1455,7 +1455,7 @@ |
|
|
); |
|
|
runOnlyForDeploymentPostprocessing = 0; |
|
|
shellPath = /bin/sh; |
|
|
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)"; |
|
|
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)"; |
|
|
}; |
|
|
BECDF6C20761BA81005FE872 /* ShellScript */ = { |
|
|
isa = PBXShellScriptBuildPhase; |
|
|
@@ -1742,6 +1742,7 @@ |
|
|
OTHER_CFLAGS_ppc = ""; |
|
|
OTHER_LDFLAGS_ppc = "-prebind -seg1addr 0x30000000"; |
|
|
PRODUCT_NAME = SDL; |
|
|
SDKROOT = macosx10.8; |
|
|
WRAPPER_EXTENSION = framework; |
|
|
}; |
|
|
name = Release; |
|
|
@@ -1834,6 +1835,7 @@ |
|
|
OTHER_CFLAGS_i386 = ""; |
|
|
OTHER_CFLAGS_ppc = ""; |
|
|
PRODUCT_NAME = SDL; |
|
|
SDKROOT = macosx10.8; |
|
|
WRAPPER_EXTENSION = framework; |
|
|
}; |
|
|
name = Debug; |
|
|
|
|
|
@@ -133,6 +133,7 @@ |
|
|
#define SDL_VIDEO_DRIVER_X11_XME 1 |
|
|
#define SDL_VIDEO_DRIVER_X11_XRANDR 1 |
|
|
#define SDL_VIDEO_DRIVER_X11_XV 1 |
|
|
#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1 |
|
|
|
|
|
/* Enable OpenGL support */ |
|
|
#define SDL_VIDEO_OPENGL 1 |
|
|
|
|
|
@@ -182,7 +182,7 @@ static IOReturn HIDCreateOpenDeviceInterface (io_object_t hidDevice, recDevice * |
|
|
plugInResult = (*ppPlugInInterface)->QueryInterface (ppPlugInInterface, |
|
|
CFUUIDGetUUIDBytes (kIOHIDDeviceInterfaceID), (void *) &(pDevice->interface)); |
|
|
if (S_OK != plugInResult) |
|
|
HIDReportErrorNum ("CouldnÕt query HID class device interface from plugInInterface", plugInResult); |
|
|
HIDReportErrorNum ("Couldn't query HID class device interface from plugInInterface", plugInResult); |
|
|
(*ppPlugInInterface)->Release (ppPlugInInterface); |
|
|
} |
|
|
else |
|
|
|
