diff --git a/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist index 36f80bd9d8..05460bd4ff 100644 --- a/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist +++ b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist @@ -16,5 +16,9 @@ ???? CFBundleVersion 1.0 + CFBundleSupportedPlatforms + + MacOSX + diff --git a/extlibs/libs-osx/Frameworks/OpenAL.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/OpenAL.framework/Versions/A/Resources/Info.plist index 9d630276a1..76677298c0 100644 --- a/extlibs/libs-osx/Frameworks/OpenAL.framework/Versions/A/Resources/Info.plist +++ b/extlibs/libs-osx/Frameworks/OpenAL.framework/Versions/A/Resources/Info.plist @@ -16,5 +16,9 @@ ???? CFBundleVersion 1.0 + CFBundleSupportedPlatforms + + MacOSX + diff --git a/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/Resources/Info.plist index f7f42180b5..115dfa0b3d 100644 --- a/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/Resources/Info.plist +++ b/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/Resources/Info.plist @@ -16,5 +16,9 @@ ???? CFBundleVersion 1.0 + CFBundleSupportedPlatforms + + MacOSX + diff --git a/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/Resources/Info.plist index ed6050c2ee..28b6c52ec1 100644 --- a/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/Resources/Info.plist +++ b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/Resources/Info.plist @@ -16,5 +16,9 @@ ???? CFBundleVersion 1.0 + CFBundleSupportedPlatforms + + MacOSX + diff --git a/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/Resources/Info.plist index 7f0d07127c..5154a4f62b 100644 --- a/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/Resources/Info.plist +++ b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/Resources/Info.plist @@ -16,5 +16,9 @@ ???? CFBundleVersion 1.0 + CFBundleSupportedPlatforms + + MacOSX + diff --git a/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/Resources/Info.plist index 71765e182e..8f8dfc5ec1 100644 --- a/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/Resources/Info.plist +++ b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/Resources/Info.plist @@ -16,5 +16,9 @@ ???? CFBundleVersion 1.0 + CFBundleSupportedPlatforms + + MacOSX + diff --git a/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/Resources/Info.plist index 50b71edcac..bc5c40291f 100644 --- a/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/Resources/Info.plist +++ b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/Resources/Info.plist @@ -16,5 +16,9 @@ ???? CFBundleVersion 1.0 + CFBundleSupportedPlatforms + + MacOSX + diff --git a/src/SFML/Window/OSX/HIDInputManager.mm b/src/SFML/Window/OSX/HIDInputManager.mm index 37ef79e127..b12754e76f 100644 --- a/src/SFML/Window/OSX/HIDInputManager.mm +++ b/src/SFML/Window/OSX/HIDInputManager.mm @@ -763,14 +763,16 @@ case 0x2c: return sf::Keyboard::Slash; case 0x2a: return sf::Keyboard::BackSlash; -#warning sf::Keyboard::Tilde might be in conflict with some other key. +//#warning sf::Keyboard::Tilde might be in conflict with some other key.//?DELETE? // 0x0a is for "Non-US Backslash" according to HID Calibrator, // a sample provided by Apple. - case 0x0a: return sf::Keyboard::Tilde; + //case 0x0a: return sf::Keyboard::Tilde; + case 0x32: return sf::Keyboard::Tilde; case 0x51: /* keypad */ return sf::Keyboard::Equal; case 0x18: /* keyboard */ return sf::Keyboard::Equal; - case 0x32: return sf::Keyboard::Dash; + //case 0x32: return sf::Keyboard::Dash; + ase 0x1b: return sf::Keyboard::Dash; case 0x31: return sf::Keyboard::Space; case 0x4c: /* keypad */ return sf::Keyboard::Return; case 0x24: /* keyboard */ return sf::Keyboard::Return; @@ -855,7 +857,7 @@ case NSPauseFunctionKey: return sf::Keyboard::Pause; -#warning keycode 0x1b is not bound to any key. +//#warning keycode 0x1b is not bound to any key.//?DELETE? // This key is ' on CH-FR, ) on FR and - on US layouts. // An unknown key.