Merge branch 'master' into ogl-wireframe
Showing
- .circleci/config.yml 36 additions, 21 deletions.circleci/config.yml
- .gitattributes 3 additions, 1 deletion.gitattributes
- .gitignore 3 additions, 0 deletions.gitignore
- .gitlab-ci.yml 434 additions, 0 deletions.gitlab-ci.yml
- CMakeLists.txt 158 additions, 106 deletionsCMakeLists.txt
- CMakePresets.json 29 additions, 0 deletionsCMakePresets.json
- README.md 0 additions, 1 deletionREADME.md
- SRB2.cbp 0 additions, 18 deletionsSRB2.cbp
- SRB2_common.props 0 additions, 3 deletionsSRB2_common.props
- Srb2.dev 1 addition, 51 deletionsSrb2.dev
- alias-bootstrap.sh 29 additions, 0 deletionsalias-bootstrap.sh
- appveyor.yml 1 addition, 9 deletionsappveyor.yml
- assets/CMakeLists.txt 33 additions, 54 deletionsassets/CMakeLists.txt
- assets/README.txt 24 additions, 25 deletionsassets/README.txt
- cmake/CPM.cmake 21 additions, 0 deletionscmake/CPM.cmake
- cmake/Comptime.cmake 32 additions, 0 deletionscmake/Comptime.cmake
- cmake/Modules/CMakeASM_YASMInformation.cmake 0 additions, 46 deletionscmake/Modules/CMakeASM_YASMInformation.cmake
- cmake/Modules/CMakeDetermineASM_YASMCompiler.cmake 0 additions, 27 deletionscmake/Modules/CMakeDetermineASM_YASMCompiler.cmake
- cmake/Modules/CMakeTestASM_YASMCompiler.cmake 0 additions, 23 deletionscmake/Modules/CMakeTestASM_YASMCompiler.cmake
- cmake/Modules/FindGME.cmake 11 additions, 1 deletioncmake/Modules/FindGME.cmake
Loading
Please register or sign in to comment