Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SFML/SFML
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Klaim/SFML
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 6, 2013

  1. Fixed: missing prefix for SFML linking option.

    @Klaim
    Klaim committed Jan 6, 2013
    Configuration menu
    Copy the full SHA
    e7f2990 View commit details
    Browse the repository at this point in the history

  2. Set SFML_BUILD_SHARED_LIBS from BUILD_SHARED_LIBS value if set.

    @Klaim
    Klaim committed Jan 6, 2013
    Configuration menu
    Copy the full SHA
    cd5755f View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2013

  1. Merge commit '86897a8347f8e6a1df56bc2a4062982539ab284f'

    @Klaim
    Klaim committed Apr 8, 2013
    Configuration menu
    Copy the full SHA
    d837786 View commit details
    Browse the repository at this point in the history

  2. Now setting BUILD_SHARED_LIBS will force SFML to use it's value. If n… 

    …ot, it will use SFML_BUILD_SHARED_LIBS instead.
    @Klaim
    Klaim committed Apr 8, 2013
    Configuration menu
    Copy the full SHA
    d12bf8e View commit details
    Browse the repository at this point in the history

Commits on May 9, 2013

  1. Merge remote-tracking branch 'origin/master'

    @Klaim
    Klaim committed May 9, 2013
    Configuration menu
    Copy the full SHA
    1600bbb View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2013

  1. Merge branch 'master' of https://github.com/LaurentGomila/SFML

    @Klaim
    Klaim committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    632147e View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2013

  1. Merge branch 'master' of https://github.com/LaurentGomila/SFML

    @Klaim
    Klaim committed Jul 1, 2013
    Configuration menu
    Copy the full SHA
    9b93de3 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2013

  1. Merge branch 'master' of https://github.com/LaurentGomila/SFML

    @Klaim
    Klaim committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    90fe8f5 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2013

  1. Merge remote-tracking branch 'origin/master' 

    Conflicts:
	CMakeLists.txt
    @Klaim
    Klaim committed Aug 30, 2013
    Configuration menu
    Copy the full SHA
    c07cba2 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2013

  1. Merge remote-tracking branch 'origin/master' 

    Conflicts fixed:
	src/SFML/Graphics/CMakeLists.txt
    @Klaim
    Klaim committed Nov 1, 2013
    Configuration menu
    Copy the full SHA
    42c039d View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2014

  1. Merge branch 'master' of https://github.com/LaurentGomila/SFML

    @Klaim
    Klaim committed Mar 1, 2014
    Configuration menu
    Copy the full SHA
    7ba7c59 View commit details
    Browse the repository at this point in the history
Loading