Commit graph

114 commits

Author SHA1 Message Date
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
Sally Coolatta
1f082f15e6 Merge SRB2 master 2021-02-27 02:25:14 -05:00
James R
db219a6ff3 Makefile: add a SILENT flag
This makes it print nothing to stdout.

Also fixed some irregularities.
2021-02-18 07:24:20 -08:00
James R
5df0a1c9e6 Generate individual dependency files
This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.

As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
2021-02-18 06:23:18 -08:00
James R
396a4ae635 Makfile: don't print some messages twice 2021-02-18 06:23:12 -08:00
James R
cb1326b0eb Remove Direct Draw from the Makefiles
MINGW/MINGW64 implies SDL.
2020-11-21 15:19:54 -08:00
Sally Coolatta
b5fcd74ef9 Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
James R
e415b4b475 Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
(cherry picked from commit 9495e6354fed1028c6fc502cc9d946cfdd0b7896)
2020-09-13 14:25:07 -07:00
James R
ce894b7837 Is it GCC is it gcc, is it????
(cherry picked from commit 246e71a463)
2020-09-13 14:24:49 -07:00
James R
ec8cab9a3a Update LATEST_GCC_VERSION too
(cherry picked from commit 4931d82393)
2020-09-13 14:22:46 -07:00
James R
6e102db9c5 Add missing GCC version flags to the Makefile
(cherry picked from commit f939cf973b)
2020-09-13 14:22:45 -07:00
James R
ccefaa77e9 It's not always GCC, but it probably is gcc (I hope)
(cherry picked from commit 38ce80317d)
2020-09-13 14:12:36 -07:00
James R
599add9ad4 Forgot a comma
(cherry picked from commit 6cddbf7afb)
2020-09-13 14:12:36 -07:00
James R
c9463d90b6 Makefile: Move the PREFIX stuff up so version detection can take advantage of
(cherry picked from commit 2a059632a1)
2020-09-13 14:12:36 -07:00
James R
8f3e2dd2dd Detect the compiler version and set the correct GCC flag
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.

(cherry picked from commit 9963d38ce2)
2020-09-13 14:12:36 -07:00
James R
f013b73dd5 Merge remote-tracking branch 'origin/master' into next 2020-08-28 19:52:25 -07:00
James R
ce98fc16bd Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS 2020-08-18 16:45:00 -07:00
James R
63ba605f52 Is it GCC is it gcc, is it????
(cherry picked from commit 246e71a463)
2020-08-18 16:37:19 -07:00
James R
6cd395f1ff Even the warning can die, give the programmer some credit
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
(cherry picked from commit 390042ffc5)
2020-08-15 21:34:05 -07:00
James R
246e71a463 Is it GCC is it gcc, is it???? 2020-08-15 21:29:02 -07:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
James R
f9e74e8ba2 Merge branch 'kill-cd-support' into 'next'
Kill CD support

See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
9955ff1357 Merge branch 'kill-dos' into 'next'
Remove support for DOS

See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
Steel Titanium
913c07959e Kill CD support 2020-08-07 17:06:19 -04:00
Steel Titanium
62c85ea4a5 WIP: Remove support for DOS
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
James R
4931d82393 Update LATEST_GCC_VERSION too 2020-07-24 02:33:39 -07:00
James R
f939cf973b Add missing GCC version flags to the Makefile 2020-07-24 02:32:10 -07:00
James R
755a0e9440 It's not always GCC, but it probably is gcc (I hope)
(cherry picked from commit 4e1d54c3322c17276e532ab4d9e875a8c8ebc399)
2020-07-15 14:47:41 -07:00
James R
7c2aa5fd19 Forgot a comma
(cherry picked from commit 193c45aa2f555b56f548f70e7fa0d74a1ce4e412)
2020-07-15 14:47:17 -07:00
James R
87e55c18c4 Makefile: Move the PREFIX stuff up so version detection can take advantage of
(cherry picked from commit 489bb81d0065299ffea09b20cfa06dbbedcf247a)
2020-07-15 14:47:16 -07:00
James R
2610163096 Detect the compiler version and set the correct GCC flag
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.

(cherry picked from commit bf90fbb91f28af30ff79523681e7f73e60121535)
2020-07-15 14:47:16 -07:00
James R
38ce80317d It's not always GCC, but it probably is gcc (I hope) 2020-07-11 12:45:35 -07:00
James R
6cddbf7afb Forgot a comma 2020-06-17 22:58:11 -07:00
James R
2a059632a1 Makefile: Move the PREFIX stuff up so version detection can take advantage of 2020-06-17 22:52:19 -07:00
James R
9963d38ce2 Detect the compiler version and set the correct GCC flag
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.
2020-06-17 22:49:12 -07:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Alam Ed Arias
ca22d7524e Makefile: GCC80 does not exist
(cherry picked from commit eacf89e309d555bda78ed69945a7d995e56a3292)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
2a116ac847 Tested to be compile with Mingw64 9.1.0
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
2020-05-11 18:43:24 -07:00
Alam Ed Arias
a3287a8913 Makefile: support GCC 9.1
(cherry picked from commit d5cc3ce48daf594fc64ecdbaeceb5c537cf5bf72)
2020-05-11 18:43:01 -07:00
James R
390042ffc5 Even the warning can die, give the programmer some credit
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
2020-04-11 22:10:05 -07:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Monster Iestyn
0b3975dff8 Merge branch 'public_next' 2019-09-03 19:07:57 +01:00
Alam Ed Arias
d6a3f3f4d8 Warn on implicit fallthrough 2019-08-29 19:27:52 -04:00
Alam Ed Arias
01020ae65f Merge branch 'public_next' into private 2019-08-08 23:41:19 -04:00
Alam Ed Arias
abe1d9809f Disable address-of-packed-member warning 2019-08-08 22:47:33 -04:00
Alam Ed Arias
5b692acc6c Makefile: GCC80 does not exist 2019-08-08 22:34:09 -04:00
Alam Ed Arias
64159d55cf Revert "Try to compile with AppVeyor's GCC 9.1.0"
This reverts commit 9fc6c3b136.
2019-08-08 22:31:18 -04:00
Alam Ed Arias
9fc6c3b136 Try to compile with AppVeyor's GCC 9.1.0 2019-08-08 22:19:22 -04:00
Alam Ed Arias
5c0912bab1 Tested to be compile with Mingw64 9.1.0 2019-08-08 21:25:46 -04:00