Merge pull request #75 from SFML/feature/2.3_prep

Bumped version number to 2.3 and updated readme.txt
This commit is contained in:
Zachariah Brown committed 2015-05-21 12:45:47 -04:00
commit 2e272c187f
3 files changed
+10 -9

No files matched your search

+2 -2
View File
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8.3)
# define a macro that helps defining an option # define a macro that helps defining an option
macro(csfml_set_option var default type docstring) macro(csfml_set_option var default type docstring)
@@ -21,7 +21,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)
# setup version numbers # setup version numbers
set(VERSION_MAJOR 2) set(VERSION_MAJOR 2)
set(VERSION_MINOR 2) set(VERSION_MINOR 3)
set(VERSION_PATCH 0) set(VERSION_PATCH 0)
# add the CSFML header path # add the CSFML header path
+1 -1
View File
@@ -30,7 +30,7 @@
// Define the CSFML version // Define the CSFML version
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#define CSFML_VERSION_MAJOR 2 #define CSFML_VERSION_MAJOR 2
#define CSFML_VERSION_MINOR 2 #define CSFML_VERSION_MINOR 3
#define CSFML_VERSION_PATCH 0 #define CSFML_VERSION_PATCH 0
+7 -6
View File
@@ -1,20 +1,21 @@
CSFML - Simple and Fast Multimedia Library for C CSFML - Simple and Fast Multimedia Library for C
================================================ ================================================
SFML is a simple, fast, cross-platform and object-oriented multimedia API. It provides access to windowing, graphics, SFML is a simple, fast, cross-platform and object-oriented multimedia API. It provides access to windowing,
audio and network. graphics, audio and network.
It is originally written in C++, and this project is its official binding for the C language. It is originally written in C++, and this project is its official binding for the C language.
Authors Authors
------- -------
Laurent Gomila - main developer (laurent@sfml-dev.org) Laurent Gomila - main developer (laurent@sfml-dev.org)
Zachariah Brown - active maintainer (crazyzprogrammer@hotmail.com)
Download Download
-------- --------
You can get the latest official release on SFML website (http://www.sfml-dev.org/download/csfml). You can get the latest official release on SFML website (http://www.sfml-dev.org/download/csfml).
You can also get the current development version from the git repository (https://github.com/LaurentGomila/CSFML). You can also get the current development version from the git repository (https://github.com/SFML/CSFML).
Learn Learn
----- -----
@@ -22,8 +23,8 @@ Learn
There is no tutorial for CSFML, but since it's a binding you can use the C++ resources: There is no tutorial for CSFML, but since it's a binding you can use the C++ resources:
* The official tutorials (http://www.sfml-dev.org/tutorials/) * The official tutorials (http://www.sfml-dev.org/tutorials/)
* The online API documentation (http://www.sfml-dev.org/documentation/) * The online API documentation (http://www.sfml-dev.org/documentation/)
* The community wiki (https://github.com/LaurentGomila/SFML/wiki/) * The community wiki (https://github.com/SFML/SFML/wiki/)
* The community forum (http://en.sfml-dev.org/forums/) (or http://fr.sfml-dev.org/forums/ for french people) * The community forum (http://en.sfml-dev.org/forums/) (or http://fr.sfml-dev.org/forums/ for French people)
Of course, you can also find the CSFM API documentation in the SDK. Of course, you can also find the CSFM API documentation in the SDK.
@@ -37,5 +38,5 @@ Contribute
SFML and CSFML are open-source projects, and they need your help to go on growing and improving. SFML and CSFML are open-source projects, and they need your help to go on growing and improving.
Don't hesitate to post suggestions or bug reports on the forum (http://en.sfml-dev.org/forums/), Don't hesitate to post suggestions or bug reports on the forum (http://en.sfml-dev.org/forums/),
submit patches by e-mail, or post new bugs/features requests on the task tracker (https://github.com/LaurentGomila/CSFML/issues/). or post new bugs/features requests on the task tracker (https://github.com/SFML/CSFML/issues/).
You can even fork the project on GitHub, maintain your own version and send us pull requests periodically to merge your work. You can even fork the project on GitHub, maintain your own version and send us pull requests periodically to merge your work.