Merge remote-tracking branch 'origin/next' into netcode-rerefactor (df0c8e05) · Commits · Mari0shi / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

df0c8e05

Commit df0c8e05 authored 1 year ago by LJ Sonic

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into netcode-rerefactor

parents b2441114 1ddc04ab

Branches netcode-rerefactor

No related tags found

No related merge requests found

Changes 73

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 1 addition, 1 deletion

.circleci/config.yml
CMakeLists.txt 39 additions, 15 deletions

CMakeLists.txt
CMakePresets.json 29 additions, 0 deletions

CMakePresets.json
README.md 0 additions, 1 deletion

README.md
SRB2.cbp 0 additions, 18 deletions

SRB2.cbp
SRB2_common.props 0 additions, 3 deletions

SRB2_common.props
Srb2.dev 1 addition, 51 deletions

Srb2.dev
alias-bootstrap.sh 29 additions, 0 deletions

alias-bootstrap.sh
appveyor.yml 0 additions, 8 deletions

appveyor.yml
cmake/Comptime.cmake 32 additions, 0 deletions

cmake/Comptime.cmake
cmake/Modules/CMakeASM_YASMInformation.cmake 0 additions, 46 deletions

cmake/Modules/CMakeASM_YASMInformation.cmake
cmake/Modules/CMakeDetermineASM_YASMCompiler.cmake 0 additions, 27 deletions

cmake/Modules/CMakeDetermineASM_YASMCompiler.cmake
cmake/Modules/CMakeTestASM_YASMCompiler.cmake 0 additions, 23 deletions

cmake/Modules/CMakeTestASM_YASMCompiler.cmake
cmake/Modules/GitUtilities.cmake 39 additions, 23 deletions

cmake/Modules/GitUtilities.cmake
src/Android.mk 1 addition, 1 deletion

src/Android.mk
src/CMakeLists.txt 139 additions, 43 deletions

src/CMakeLists.txt
src/Makefile 2 additions, 23 deletions

src/Makefile
src/Makefile.d/features.mk 0 additions, 7 deletions

src/Makefile.d/features.mk
src/Makefile.d/nix.mk 0 additions, 5 deletions

src/Makefile.d/nix.mk
src/Makefile.d/platform.mk 0 additions, 1 deletion

src/Makefile.d/platform.mk

with 312 additions and 296 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