Commit Graph

273 Commits

Author SHA1 Message Date
Jonathan De Wachter
60894d1c1a [Android] Rewrote CMake scripts to compile SFML with our new toolchain 2014-04-20 12:56:40 +02:00
Jonathan De Wachter
f9e80e1a3b [Android] Updated the Android CMake toolchain to support NDK r9
It brings support for 64-bits toolchains.
2014-04-20 12:53:40 +02:00
Jonathan De Wachter
b167c7a8d5 [Android] Replaced our homemade Android CMake toolchain with the one used for the OpenCV project
http://code.google.com/p/android-cmake/
2014-04-20 12:53:38 +02:00
Laurent Gomila
c35b48bcea [iOS] Removed support for examples, it was too much trouble and not as robust as true iOS App Xcode projects 2014-04-20 12:53:22 +02:00
Laurent Gomila
3872b27569 Reworked the sfml-main module, added Main.hpp, moved the main() internal entry point for iOS from sfml-window to sfml-main 2014-04-20 12:53:17 +02:00
Laurent Gomila
b9fd685a60 [iOS] Made the build independent of the iOS framework version 2014-04-20 12:53:15 +02:00
Laurent Gomila
4bd1a66915 Removed a copy of the sfml_add_example CMake macro, which was duplicated by accident in the big Android commit 2014-04-20 12:53:12 +02:00
Laurent Gomila
239921b456 [iOS] Improved support for examples, removed the need for a toolchain file 2014-04-20 12:53:04 +02:00
Laurent Gomila
4e8e1629d1 Adapted the examples for iOS (WIP) 2014-04-20 12:52:10 +02:00
Jonathan De Wachter
63bbe2c91e Added the Android port 2014-04-20 12:52:04 +02:00
Laurent Gomila
e20ff86330 [iOS] Adjusted the code and build files to use Automatic Reference Counting 2014-04-20 12:48:04 +02:00
Laurent
e5ee38fc26 Added the iOS port 2014-04-20 12:48:00 +02:00
Marco Antognini
19012c66ea Updated Xcode templates and cmake script
What's new in the templates:
 - Removed support for 32 bits and gcc
 - Removed useless code
 - Removed custom warnings settings – let Xcode decide with its default values
 - Set default target version to CMAKE_OSX_DEPLOYMENT_TARGET

What's new in cmake script:
 - Added cmake options for archs and deployment target
 - Added minimum requirements checking
2014-04-15 20:19:12 +02:00
Marco Antognini
0d47056132 Updated Objective-C implementation to use ARC; removed i386 support 2014-04-15 20:19:09 +02:00
Marco Antognini
ac28902b57 Removed support for OS X 10.6 and below 2014-04-15 20:18:20 +02:00
Jonathan David Page
d7c9df7600 Adjust CMake module to provide correct deps on OSX
Module will now give the OpenGL framework as a dependency instead of the
nonexistent libGL.
2014-03-10 22:25:17 -04:00
Jan Haller
185c09a95c Added CMake find module for udev library 2014-03-09 13:10:42 +01:00
Laurent Gomila
4cddde79fe Updated FindSFML.cmake to provide a list of 3rd-party dependencies when SFML is linked statically 2013-11-04 22:38:25 +01:00
Laurent Gomila
dbf01a775b Removed the hack that copied external libs into SFML static libs, users now have to link them explicitly 2013-10-16 20:47:14 +02:00
Lukas Dürrenberger
004c12cfd2 Changed VS version to MSVC version and added support for VS 2013 and TDM compilers. 2013-10-15 16:15:41 +02:00
Laurent Gomila
3670eec5dd Fixed MSVC version detection code in CMake files 2013-10-15 07:55:01 +02:00
Laurent Gomila
9b0ed300b5 Made compiler and OS variable names much clearer in CMake files 2013-10-09 08:01:10 +02:00
David Demelier
cc3dc29ef4 Added joystick implementation for FreeBSD (#477) 2013-10-08 22:52:13 +02:00
Laurent Gomila
c697623689 Replaced the custom sfml_parse_arguments CMake macro with the standard equivalent cmake_parse_arguments 2013-08-08 18:01:42 +02:00
Laurent Gomila
86897a8347 Changed the install rules so that examples' source code is included in the final distribution 2013-04-06 10:20:58 +02:00
Laurent Gomila
ef78b6d0f3 Organized projects into folders, for IDEs that support it (e.g. Visual Studio) 2013-02-25 19:17:46 +01:00
Laurent Gomila
a40ef79a18 Added source file groups in CMake files (for better organization of sources when opening SFML projects in IDEs) 2013-02-21 20:25:11 +01:00
Laurent Gomila
274d316891 Merge pull request #218 from BMBurstein/master
fix for static builds with mingw-w64 compilers
2013-02-17 08:28:12 -08:00
Laurent Gomila
dd48427bb8 Improved the success message in FindSFML.cmake 2012-12-23 09:25:16 +01:00
Laurent Gomila
aa1007a619 Minor corrections in the documentation of FindSFML.cmake (components order) 2012-07-07 17:22:40 +02:00
Baruch
f784fe4c07 fix for static builds with mingw-w64 compilers - part 2 2012-05-01 23:01:56 +03:00
Baruch
165f2b1888 fix for static builds with mingw-w64 compilers - part 1 2012-05-01 23:00:24 +03:00
Marco Antognini
9e18f64d6b Added support of Mac OS X framework in FindSFML.cmake (Close #106) 2012-04-19 21:03:20 +02:00
Laurent Gomila
459bc291f5 Added the SFML_ prefix on all the CMake variables specific to SFML 2012-04-18 19:07:47 +02:00
Laurent Gomila
3cec4b29d6 FindSFML.cmake now uses the SFML_ROOT variable instead of SFMLDIR (the name is less confusing) 2012-04-18 18:42:49 +02:00
Laurent Gomila
be7bcae823 Improved the documentation of FindSFML.cmake 2012-04-08 18:47:02 +02:00
Laurent Gomila
b2f3787db1 Fixed incompatibility with CMake 2.8.7 2012-03-30 20:53:16 +02:00
Laurent Gomila
a1522d475c Examples now compile without linker errors when building statically on Linux 2012-02-15 22:41:42 +01:00
Laurent Gomila
e3d75f6d6a Fixed "-s" suffix missing for static libs in MinSizeRel configuration 2012-02-08 19:31:55 +01:00
Laurent Gomila
906a62df0f Each module now has its own export macro, which solves the "unresolved symbol" error with sf::Time::Zero 2012-01-21 10:34:17 +01:00
Laurent Gomila
91705fe25c The architecture (32/64 bits) is now detected only on Windows 2012-01-03 18:02:18 +01:00
Laurent Gomila
bb6ed5dd29 Added detection of Visual C++ 2011 in CMake files 2011-12-30 20:33:37 +01:00
Laurent Gomila
c67148eaf2 Fatal errors in CMake files (such as unsupported system) now abort the configuration step 2011-12-29 16:20:21 +01:00
Laurent Gomila
effe6d4cec Improved FindSFML.cmake: the SFMLDIR variable now has the priority over standard paths when searching SFML headers and libs (implements issue #142) 2011-12-29 16:16:09 +01:00
Laurent Gomila
aa633f6f12 Added support for CLang 2011-12-28 22:20:15 +01:00
Laurent Gomila
4107505a05 Made CMake files compatible with VC++ 2011, and other minor improvements 2011-12-28 21:39:23 +01:00
Laurent Gomila
eed112d9ea SFML shared libraries now use ELF visibility on Unixes with gcc >= 4 2011-10-16 19:30:37 +02:00
Laurent Gomila
512a7c63cb FindSFML.cmake now defines the SFML_STATIC macro when requesting static libraries 2011-10-09 11:20:45 +02:00
Laurent Gomila
a647c68a7f Fixed CMake files failing on FreeBSD 2011-09-14 17:58:51 +02:00
Marco Antognini
d6c1fda5bd fixed creation of SFML.framework 2011-09-09 15:24:09 +02:00
Marco Antognini
c942e576c1 fixed creation of frameworks and a minor error in xcode 4 template script 2011-09-08 12:06:09 +02:00
Marco Antognini
e09db44906 Cmake now is able to build SFML libraries as frameworks (closes #12)
Cmake can now automatically install the Xcode templates
2011-08-20 12:22:39 +02:00
Marco Antognini
6b98053101 Improved OSX/Cmake and dylibs' execution path 2011-08-08 23:41:30 +02:00
Marco Antognini
de70f691e1 Improved cmake for OS X 10.5 2011-07-03 18:45:51 +02:00
Laurent Gomila
75e07d63d3 Fixed error in FindSFML.cmake when parsing SFML 1.x Config.hpp for version number 2011-06-11 12:04:52 +02:00
Laurent Gomila
6383f0c800 Minor change in shared library naming on Linux 2011-05-16 08:00:30 +02:00
Laurent Gomila
effc31327b Changed the FORCE_STATIC_VCRT to STATIC_STD_LIBS, made it available for MinGW/gcc and set it to TRUE by default 2011-05-16 00:00:00 +02:00
Laurent Gomila
3490d57344 Minor modifications in FindGLEW and FindSndFile 2011-05-14 22:17:47 +02:00
Laurent Gomila
17971ca198 Fixed FindSFML.cmake 2011-04-18 18:19:57 +02:00
Laurent Gomila
6e04a02b07 Improved FindSFML.cmake to handle configurations in a better way (fixes issue #27) 2011-04-14 22:08:19 +02:00
Laurent Gomila
4e3feba25b Added external dependencies and modified build files to enable 64 bits builds on Windows (VC++ only for now) 2011-03-26 23:57:10 +01:00
LaurentGom
7c61189f27 Fixed library name of the "main" component in FindSFML.cmake
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1787 4e206d99-4929-0410-ac5d-dfc041789085
2011-02-04 22:03:19 +00:00
LaurentGom
166de04854 Added macros to define the SFML version in Config.hpp
Improved FindSFML.cmake to check the version

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1724 4e206d99-4929-0410-ac5d-dfc041789085
2010-11-28 22:03:05 +00:00
LaurentGom
7559f0669f Fixed errors (missing double-quotes) in VS 2010 project files generated by CMake, for static build
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1688 4e206d99-4929-0410-ac5d-dfc041789085
2010-11-20 22:30:14 +00:00
LaurentGom
e895d6516b Fixed double quotes in VS 2010 projects generated by CMake for static builds
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1625 4e206d99-4929-0410-ac5d-dfc041789085
2010-11-07 19:51:33 +00:00
LaurentGom
4f09703b55 Fixed install path for libraries in CMake makefiles
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1621 4e206d99-4929-0410-ac5d-dfc041789085
2010-11-07 16:50:00 +00:00
LaurentGom
6e682af51a Finished to adjust the libraries names in SFML, CSFML and SFML.Net
Removed support for old projects/makefiles (only CMake makefiles can be used now)

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1612 4e206d99-4929-0410-ac5d-dfc041789085
2010-11-04 22:49:49 +00:00
LaurentGom
7c20d648fc Changed the naming rules for SFML 2 libraries: the major version number no longer appears in them, except for Windows DLLs (not in import libraries)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1609 4e206d99-4929-0410-ac5d-dfc041789085
2010-11-04 21:21:32 +00:00
laurentgom
01edb04ad5 Added the version and soversion of SFML libraries in CMake files
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1601 4e206d99-4929-0410-ac5d-dfc041789085
2010-11-03 17:39:17 +00:00
LaurentGom
dd63420b52 Modified FindSFML.cmake for a better handling of debug libraries
Fixed Macros.cmake (the last modification introduced a bug when generating nmake makefiles)

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1573 4e206d99-4929-0410-ac5d-dfc041789085
2010-10-05 21:19:30 +00:00
laurentgom
dac1ade7c4 Improved the CMake files so that paths with spaces are no longer a problem with Visual Studio projects
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1572 4e206d99-4929-0410-ac5d-dfc041789085
2010-10-05 14:31:37 +00:00
LaurentGom
076456aa91 Added a FindSFML.cmake file for CMake
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1571 4e206d99-4929-0410-ac5d-dfc041789085
2010-10-04 21:16:12 +00:00
LaurentGom
a991fe8e4d Added support for the CMake build system
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1550 4e206d99-4929-0410-ac5d-dfc041789085
2010-08-19 15:59:24 +00:00