Remove more trailing spaces
This commit is contained in:
parent
5bf065a709
commit
735aed62b0
@ -1,8 +1,8 @@
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// SFML - Simple and Fast Multimedia Library
|
// SFML - Simple and Fast Multimedia Library
|
||||||
// Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
// Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
||||||
// Laurent Gomila (laurent.gom@gmail.com),
|
// Laurent Gomila (laurent.gom@gmail.com),
|
||||||
//
|
//
|
||||||
// This software is provided 'as-is', without any express or implied warranty.
|
// This software is provided 'as-is', without any express or implied warranty.
|
||||||
// In no event will the authors be held liable for any damages arising from the use of this software.
|
// In no event will the authors be held liable for any damages arising from the use of this software.
|
||||||
@ -37,7 +37,7 @@
|
|||||||
/// \return The path to the resource folder associate
|
/// \return The path to the resource folder associate
|
||||||
/// with the main bundle or an empty string is there is no bundle.
|
/// with the main bundle or an empty string is there is no bundle.
|
||||||
///
|
///
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
std::string resourcePath(void);
|
std::string resourcePath(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// SFML - Simple and Fast Multimedia Library
|
// SFML - Simple and Fast Multimedia Library
|
||||||
// Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
// Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
||||||
// Laurent Gomila (laurent.gom@gmail.com),
|
// Laurent Gomila (laurent.gom@gmail.com),
|
||||||
//
|
//
|
||||||
// This software is provided 'as-is', without any express or implied warranty.
|
// This software is provided 'as-is', without any express or implied warranty.
|
||||||
// In no event will the authors be held liable for any damages arising from the use of this software.
|
// In no event will the authors be held liable for any damages arising from the use of this software.
|
||||||
@ -33,10 +33,10 @@
|
|||||||
std::string resourcePath(void)
|
std::string resourcePath(void)
|
||||||
{
|
{
|
||||||
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
|
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
|
||||||
|
|
||||||
std::string rpath;
|
std::string rpath;
|
||||||
NSBundle* bundle = [NSBundle mainBundle];
|
NSBundle* bundle = [NSBundle mainBundle];
|
||||||
|
|
||||||
if (bundle == nil) {
|
if (bundle == nil) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
NSLog(@"bundle is nil... thus no resources path can be found.");
|
NSLog(@"bundle is nil... thus no resources path can be found.");
|
||||||
@ -45,8 +45,8 @@ std::string resourcePath(void)
|
|||||||
NSString* path = [bundle resourcePath];
|
NSString* path = [bundle resourcePath];
|
||||||
rpath = [path UTF8String] + std::string("/");
|
rpath = [path UTF8String] + std::string("/");
|
||||||
}
|
}
|
||||||
|
|
||||||
[pool drain];
|
[pool drain];
|
||||||
|
|
||||||
return rpath;
|
return rpath;
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ subject to the following restrictions:
|
|||||||
<string>___PACKAGENAME___-Info.plist:Content</string>
|
<string>___PACKAGENAME___-Info.plist:Content</string>
|
||||||
</array>
|
</array>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
DEFINITIONS
|
DEFINITIONS
|
||||||
-->
|
-->
|
||||||
<key>Definitions</key>
|
<key>Definitions</key>
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
SFML - Simple and Fast Multimedia Library
|
SFML - Simple and Fast Multimedia Library
|
||||||
Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
||||||
Laurent Gomila (laurent.gom@gmail.com),
|
Laurent Gomila (laurent.gom@gmail.com),
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied warranty.
|
This software is provided 'as-is', without any express or implied warranty.
|
||||||
In no event will the authors be held liable for any damages arising from the use of this software.
|
In no event will the authors be held liable for any damages arising from the use of this software.
|
||||||
|
|
||||||
@ -17,10 +17,10 @@ subject to the following restrictions:
|
|||||||
you must not claim that you wrote the original software.
|
you must not claim that you wrote the original software.
|
||||||
If you use this software in a product, an acknowledgment
|
If you use this software in a product, an acknowledgment
|
||||||
in the product documentation would be appreciated but is not required.
|
in the product documentation would be appreciated but is not required.
|
||||||
|
|
||||||
2. Altered source versions must be plainly marked as such,
|
2. Altered source versions must be plainly marked as such,
|
||||||
and must not be misrepresented as being the original software.
|
and must not be misrepresented as being the original software.
|
||||||
|
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@ -75,7 +75,7 @@ subject to the following restrictions:
|
|||||||
<key>Path</key>
|
<key>Path</key>
|
||||||
<string>main.cpp</string>
|
<string>main.cpp</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- RESOURCES -->
|
<!-- RESOURCES -->
|
||||||
<key>cute_image.jpg</key>
|
<key>cute_image.jpg</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -109,7 +109,7 @@ subject to the following restrictions:
|
|||||||
<string>Resources</string>
|
<string>Resources</string>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
TARGET
|
TARGET
|
||||||
-->
|
-->
|
||||||
|
@ -60,7 +60,7 @@ subject to the following restrictions:
|
|||||||
|
|
||||||
<key>Default</key>
|
<key>Default</key>
|
||||||
<string>C++98 with Clang and libstdc++</string>
|
<string>C++98 with Clang and libstdc++</string>
|
||||||
|
|
||||||
<key>NotPersisted</key>
|
<key>NotPersisted</key>
|
||||||
<true />
|
<true />
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</array>
|
</array>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- Use Clang and libstdc++ -->
|
<!-- Use Clang and libstdc++ -->
|
||||||
<key>C++98 with Clang and libstdc++</key>
|
<key>C++98 with Clang and libstdc++</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -104,16 +104,16 @@ subject to the following restrictions:
|
|||||||
<dict>
|
<dict>
|
||||||
<key>GCC_VERSION</key>
|
<key>GCC_VERSION</key>
|
||||||
<string>com.apple.compilers.llvm.clang.1_0</string>
|
<string>com.apple.compilers.llvm.clang.1_0</string>
|
||||||
|
|
||||||
<key>CLANG_CXX_LANGUAGE_STANDARD</key>
|
<key>CLANG_CXX_LANGUAGE_STANDARD</key>
|
||||||
<string>c++98</string>
|
<string>c++98</string>
|
||||||
|
|
||||||
<key>CLANG_CXX_LIBRARY</key>
|
<key>CLANG_CXX_LIBRARY</key>
|
||||||
<string>libstdc++</string>
|
<string>libstdc++</string>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- Use Clang and libc++ -->
|
<!-- Use Clang and libc++ -->
|
||||||
<key>C++11 with Clang and libc++</key>
|
<key>C++11 with Clang and libc++</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -123,10 +123,10 @@ subject to the following restrictions:
|
|||||||
<dict>
|
<dict>
|
||||||
<key>GCC_VERSION</key>
|
<key>GCC_VERSION</key>
|
||||||
<string>com.apple.compilers.llvm.clang.1_0</string>
|
<string>com.apple.compilers.llvm.clang.1_0</string>
|
||||||
|
|
||||||
<key>CLANG_CXX_LANGUAGE_STANDARD</key>
|
<key>CLANG_CXX_LANGUAGE_STANDARD</key>
|
||||||
<string>c++0x</string>
|
<string>c++0x</string>
|
||||||
|
|
||||||
<key>CLANG_CXX_LIBRARY</key>
|
<key>CLANG_CXX_LIBRARY</key>
|
||||||
<string>libc++</string>
|
<string>libc++</string>
|
||||||
</dict>
|
</dict>
|
||||||
@ -147,7 +147,7 @@ subject to the following restrictions:
|
|||||||
|
|
||||||
<key>Default</key>
|
<key>Default</key>
|
||||||
<string>Universal</string>
|
<string>Universal</string>
|
||||||
|
|
||||||
<key>NotPersisted</key>
|
<key>NotPersisted</key>
|
||||||
<true />
|
<true />
|
||||||
|
|
||||||
@ -168,7 +168,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- Support 64 bits -->
|
<!-- Support 64 bits -->
|
||||||
<key>64 bits</key>
|
<key>64 bits</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -208,7 +208,7 @@ subject to the following restrictions:
|
|||||||
<!-- PLATFORM -->
|
<!-- PLATFORM -->
|
||||||
<key>SUPPORTED_PLATFORMS</key>
|
<key>SUPPORTED_PLATFORMS</key>
|
||||||
<string>macosx</string>
|
<string>macosx</string>
|
||||||
|
|
||||||
<!-- WARNINGS -->
|
<!-- WARNINGS -->
|
||||||
<!-- TODO add more warnings -->
|
<!-- TODO add more warnings -->
|
||||||
<key>GCC_WARN_ABOUT_RETURN_TYPE</key>
|
<key>GCC_WARN_ABOUT_RETURN_TYPE</key>
|
||||||
@ -242,8 +242,8 @@ subject to the following restrictions:
|
|||||||
|
|
||||||
<key>GCC_PREPROCESSOR_DEFINITIONS</key>
|
<key>GCC_PREPROCESSOR_DEFINITIONS</key>
|
||||||
<string>DEBUG=1 $(inherited)</string>
|
<string>DEBUG=1 $(inherited)</string>
|
||||||
|
|
||||||
<!-- ALWAYS compile for all arch. -->
|
<!-- ALWAYS compile for all arch. -->
|
||||||
<key>ONLY_ACTIVE_ARCH</key>
|
<key>ONLY_ACTIVE_ARCH</key>
|
||||||
<string>NO</string>
|
<string>NO</string>
|
||||||
</dict>
|
</dict>
|
||||||
@ -261,7 +261,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
TARGET
|
TARGET
|
||||||
-->
|
-->
|
||||||
<key>Targets</key>
|
<key>Targets</key>
|
||||||
<array>
|
<array>
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
SFML - Simple and Fast Multimedia Library
|
SFML - Simple and Fast Multimedia Library
|
||||||
Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com),
|
||||||
Laurent Gomila (laurent.gom@gmail.com),
|
Laurent Gomila (laurent.gom@gmail.com),
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied warranty.
|
This software is provided 'as-is', without any express or implied warranty.
|
||||||
In no event will the authors be held liable for any damages arising from the use of this software.
|
In no event will the authors be held liable for any damages arising from the use of this software.
|
||||||
|
|
||||||
@ -17,10 +17,10 @@ subject to the following restrictions:
|
|||||||
you must not claim that you wrote the original software.
|
you must not claim that you wrote the original software.
|
||||||
If you use this software in a product, an acknowledgment
|
If you use this software in a product, an acknowledgment
|
||||||
in the product documentation would be appreciated but is not required.
|
in the product documentation would be appreciated but is not required.
|
||||||
|
|
||||||
2. Altered source versions must be plainly marked as such,
|
2. Altered source versions must be plainly marked as such,
|
||||||
and must not be misrepresented as being the original software.
|
and must not be misrepresented as being the original software.
|
||||||
|
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ subject to the following restrictions:
|
|||||||
|
|
||||||
<key>Kind</key>
|
<key>Kind</key>
|
||||||
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-->
|
-->
|
||||||
@ -84,7 +84,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- Use dylibs -->
|
<!-- Use dylibs -->
|
||||||
<key>Dylibs</key>
|
<key>Dylibs</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -100,7 +100,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- Use dylibs (debug) -->
|
<!-- Use dylibs (debug) -->
|
||||||
<key>Dylibs (debug)</key>
|
<key>Dylibs (debug)</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -130,7 +130,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- WINDOW MODULE -->
|
<!-- WINDOW MODULE -->
|
||||||
<dict>
|
<dict>
|
||||||
<key>Identifier</key>
|
<key>Identifier</key>
|
||||||
@ -162,7 +162,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- WINDOW MODULE : NO -->
|
<!-- WINDOW MODULE : NO -->
|
||||||
<key>false</key>
|
<key>false</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -215,7 +215,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- GRAPHICS MODULE : NO -->
|
<!-- GRAPHICS MODULE : NO -->
|
||||||
<key>false</key>
|
<key>false</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -262,7 +262,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- AUDIO MODULE : NO -->
|
<!-- AUDIO MODULE : NO -->
|
||||||
<key>false</key>
|
<key>false</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -309,7 +309,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
||||||
<!-- NETWORK MODULE : NO -->
|
<!-- NETWORK MODULE : NO -->
|
||||||
<key>false</key>
|
<key>false</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -325,7 +325,7 @@ subject to the following restrictions:
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</array>
|
</array>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
SETTINGS
|
SETTINGS
|
||||||
-->
|
-->
|
||||||
@ -348,11 +348,11 @@ subject to the following restrictions:
|
|||||||
|
|
||||||
<key>SFML_LINK_SUFFIX</key>
|
<key>SFML_LINK_SUFFIX</key>
|
||||||
<string>$(SFML_LINK_$(SFML_BINARY_TYPE)_SUFFIX)</string>
|
<string>$(SFML_LINK_$(SFML_BINARY_TYPE)_SUFFIX)</string>
|
||||||
|
|
||||||
<!-- SFML SYSTEM : always used -->
|
<!-- SFML SYSTEM : always used -->
|
||||||
<key>SFML_SYSTEM</key>
|
<key>SFML_SYSTEM</key>
|
||||||
<string>$(SFML_LINK_PREFIX)sfml-system$(SFML_LINK_SUFFIX)</string>
|
<string>$(SFML_LINK_PREFIX)sfml-system$(SFML_LINK_SUFFIX)</string>
|
||||||
|
|
||||||
<!-- LINKER FLAGS -->
|
<!-- LINKER FLAGS -->
|
||||||
<key>OTHER_LDFLAGS</key>
|
<key>OTHER_LDFLAGS</key>
|
||||||
<string>$(inherited) $(SFML_SYSTEM) $(SFML_WINDOW) $(SFML_GRAPHICS) $(SFML_AUDIO) $(SFML_NETWORK)</string>
|
<string>$(inherited) $(SFML_SYSTEM) $(SFML_WINDOW) $(SFML_GRAPHICS) $(SFML_AUDIO) $(SFML_NETWORK)</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user