Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

c325306d

Commit c325306d authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into makefile-revision-final

parents 87afa765 c266a270

Branches

Tags

1 merge request!1497Makefile rewrite + source code file list parity with CMake

Changes 220

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 0 deletions

README.md
src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile.d/versions.mk 1 addition, 1 deletion

src/Makefile.d/versions.mk
src/am_map.c 1 addition, 1 deletion

src/am_map.c
src/am_map.h 1 addition, 1 deletion

src/am_map.h
src/apng.c 1 addition, 1 deletion

src/apng.c
src/apng.h 1 addition, 1 deletion

src/apng.h
src/asm_defs.inc 1 addition, 1 deletion

src/asm_defs.inc
src/b_bot.c 1 addition, 1 deletion

src/b_bot.c
src/b_bot.h 1 addition, 1 deletion

src/b_bot.h
src/byteptr.h 1 addition, 1 deletion

src/byteptr.h
src/command.c 1 addition, 1 deletion

src/command.c
src/command.h 1 addition, 1 deletion

src/command.h
src/console.c 7 additions, 1 deletion

src/console.c
src/console.h 1 addition, 1 deletion

src/console.h
src/d_clisrv.c 1 addition, 1 deletion

src/d_clisrv.c
src/d_clisrv.h 1 addition, 1 deletion

src/d_clisrv.h
src/d_event.h 1 addition, 1 deletion

src/d_event.h
src/d_main.c 1 addition, 1 deletion

src/d_main.c
src/d_main.h 1 addition, 1 deletion

src/d_main.h

with 27 additions and 18 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