lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update Xcode templates

Browse source 
Fixes for:
 - C++14 settings
 - Strongly typed enum
This commit is contained in:
Marco Antognini 2017-04-05 23:30:01 +02:00 committed by binary1248
parent 41348bc180
commit f591f0bf5c
3 changed files with 15 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp vendored
View file

@ -64,12 +64,12 @@ int main(int, char const**)
while (window.pollEvent(event))
{
// Close window: exit
if (event.type == sf::Event::Closed) {
if (event.type == sf::Event::Type::Closed) {
window.close();
}
// Escape pressed: exit
if (event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Escape) {
if (event.type == sf::Event::Type::KeyPressed && event.key.code == sf::Keyboard::Key::Escape) {
window.close();
}
}

4
tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp vendored
View file

@ -62,12 +62,12 @@ int main(int argc, char const** argv)
while (window.pollEvent(event))
{
// Close window: exit
if (event.type == sf::Event::Closed) {
if (event.type == sf::Event::Type::Closed) {
window.close();
}
// Escape pressed: exit
if (event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Escape) {
if (event.type == sf::Event::Type::KeyPressed && event.key.code == sf::Keyboard::Key::Escape) {
window.close();
}
}

80
tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in vendored
View file

@ -25,7 +25,7 @@ subject to the following restrictions:
-->
<!--
This template defines :
This template defines:
- the compiler & std lib
- the supported arch (only 64 bit)
- some other target's settings (e.g. warnings flags)
@ -44,74 +44,6 @@ subject to the following restrictions:
<key>Kind</key>
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
<!--
OPTIONS
-->
<key>Options</key>
<array>
<dict>
<key>Identifier</key>
<string>compilerSettingsType</string>
<key>Name</key>
<string>[ADVANCED] C++ Compiler and Standard Library</string>
<key>Description</key>
<string>If you don't know what is it about, use the default value. Note that you'll need a version of SFML compiled with Clang and libc++ to use C++11!</string>
<key>Default</key>
<string>C++11 with Clang and libc++</string>
<key>NotPersisted</key>
<true />
<key>Type</key>
<string>popup</string>
<key>Units</key>
<dict>
<!-- Use Clang and libstdc++ -->
<key>C++98 with Clang and libstdc++</key>
<dict>
<key>Project</key>
<dict>
<key>SharedSettings</key>
<dict>
<key>GCC_VERSION</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>CLANG_CXX_LANGUAGE_STANDARD</key>
<string>c++98</string>
<key>CLANG_CXX_LIBRARY</key>
<string>libstdc++</string>
</dict>
</dict>
</dict>
<!-- Use Clang and libc++ -->
<key>C++11 with Clang and libc++</key>
<dict>
<key>Project</key>
<dict>
<key>SharedSettings</key>
<dict>
<key>GCC_VERSION</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>CLANG_CXX_LANGUAGE_STANDARD</key>
<string>c++0x</string>
<key>CLANG_CXX_LIBRARY</key>
<string>libc++</string>
</dict>
</dict>
</dict>
</dict>
</dict>
</array>
<!--
SETTINGS
-->
@ -140,6 +72,16 @@ subject to the following restrictions:
<key>LIBRARY_SEARCH_PATHS</key>
<string> /usr/local/lib/ $(inherited) </string>
<!-- Use Clang and libc++ -->
<key>GCC_VERSION</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>CLANG_CXX_LANGUAGE_STANDARD</key>
<string>gnu++14</string>
<key>CLANG_CXX_LIBRARY</key>
<string>libc++</string>
</dict>
<key>Configurations</key>