Skip to content

Commit

Permalink
Merge pull request #75 from SFML/feature/2.3_prep
Browse files Browse the repository at this point in the history
Bumped version number to 2.3 and updated readme.txt
  • Loading branch information
zsbzsb committed May 21, 2015
2 parents 910bcc8 + 33bf91a commit 2e272c1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
@@ -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
macro(csfml_set_option var default type docstring)
Expand All @@ -21,7 +21,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)

# setup version numbers
set(VERSION_MAJOR 2)
set(VERSION_MINOR 2)
set(VERSION_MINOR 3)
set(VERSION_PATCH 0)

# add the CSFML header path
Expand Down
2 changes: 1 addition & 1 deletion include/SFML/Config.h
Expand Up @@ -30,7 +30,7 @@
// Define the CSFML version
////////////////////////////////////////////////////////////
#define CSFML_VERSION_MAJOR 2
#define CSFML_VERSION_MINOR 2
#define CSFML_VERSION_MINOR 3
#define CSFML_VERSION_PATCH 0


Expand Down
13 changes: 7 additions & 6 deletions readme.txt
@@ -1,29 +1,30 @@
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,
audio and network.
SFML is a simple, fast, cross-platform and object-oriented multimedia API. It provides access to windowing,
graphics, audio and network.
It is originally written in C++, and this project is its official binding for the C language.

Authors
-------

Laurent Gomila - main developer (laurent@sfml-dev.org)
Zachariah Brown - active maintainer (crazyzprogrammer@hotmail.com)

Download
--------

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
-----

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 online API documentation (http://www.sfml-dev.org/documentation/)
* The community wiki (https://github.com/LaurentGomila/SFML/wiki/)
* The community forum (http://en.sfml-dev.org/forums/) (or http://fr.sfml-dev.org/forums/ for french people)
* 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)

Of course, you can also find the CSFM API documentation in the SDK.

Expand All @@ -37,5 +38,5 @@ Contribute

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/),
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.

0 comments on commit 2e272c1

Please sign in to comment.