Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

4ac016ae

Commit 4ac016ae authored 9 years ago by Luna

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/STJr/master' into ems_rebuild_2.1.15_build

parents 4741ae71 8e32d978

Branches

No related tags found

Loading

Changes 714

Hide whitespace changes

Inline Side-by-side

Showing

.gitattributes 0 additions, 16 deletions

.gitattributes
.gitignore 5 additions, 0 deletions

.gitignore
.travis.yml 45 additions, 0 deletions

.travis.yml
CMakeLists.txt 7 additions, 10 deletions

CMakeLists.txt
SRB2.cbp 0 additions, 17 deletions

SRB2.cbp
SRB2_Debug.props 28 additions, 0 deletions

SRB2_Debug.props
SRB2_Release.props 30 additions, 0 deletions

SRB2_Release.props
SRB2_common.props 46 additions, 0 deletions

SRB2_common.props
appveyor.yml 39 additions, 28 deletions

appveyor.yml
cmake/Modules/FindGME.cmake 4 additions, 4 deletions

cmake/Modules/FindGME.cmake
cmake/Modules/FindSDL2.cmake 1 addition, 1 deletion

cmake/Modules/FindSDL2.cmake
cmake/Modules/FindSDL2_main.cmake 1 addition, 1 deletion

cmake/Modules/FindSDL2_main.cmake
cmake/Modules/FindSDL2_mixer.cmake 1 addition, 1 deletion

cmake/Modules/FindSDL2_mixer.cmake
cmake/Modules/LibFindMacros.cmake 4 additions, 4 deletions

cmake/Modules/LibFindMacros.cmake
comptime.bat 9 additions, 9 deletions

comptime.bat
comptime.props 13 additions, 0 deletions

comptime.props
comptime.sh 1 addition, 1 deletion

comptime.sh
libs/.gitattributes 8 additions, 0 deletions

libs/.gitattributes
libs/FMOD.props 21 additions, 0 deletions

libs/FMOD.props
libs/SDL2.props 15 additions, 0 deletions

libs/SDL2.props

with 278 additions and 92 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment