Commit graph

14481 commits

Author SHA1 Message Date
Alam Ed Arias
6d820223f7 Merge branch 'cmake_w_clang' into 'master'
Switch Clang build to use cmake

See merge request STJr/SRB2!2312
2024-02-13 18:23:40 +00:00
Alam Ed Arias
e76e3f244e Switch Clang build to use cmake 2024-02-13 18:23:40 +00:00
Logan Aerl Arias
fc36b8d7f5 Merge branch 'cherry-pick-65da8e52' into 'master'
Merge branch 'batocera' into 'master'

See merge request STJr/SRB2!2311
2024-02-13 00:34:59 +00:00
Logan Aerl Arias
832c46b2ad Merge branch 'batocera' into 'next'
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2278

(cherry picked from commit 65da8e5291)

dcd68add Update .gitlab-ci.yml file
4d0b3722 Update .gitlab-ci.yml file
d1de54dc Update .gitlab-ci.yml file
083176f1 Update .gitlab-ci.yml file
abbb3a44 Update .gitlab-ci.yml file
ebe3262d Update .gitlab-ci.yml file
2024-02-13 00:26:24 +00:00
Logan Aerl Arias
7c33cc3783 Update cpm-libgme.cmake
remove link to ZLIB

(cherry picked from commit c16791bc11)
2024-02-11 22:01:06 +00:00
Alam Ed Arias
fbc8a3524c Update .gitlab-ci.yml file
Do not care for single-bit-bitfield-constant-conversion warnings
2024-02-11 16:45:47 -05:00
Logan Aerl Arias
5e175a3438 add Visual Studio 2022 support (via CMAKE) 2024-02-10 14:34:03 -05:00
Logan Aerl Arias
58e6ce5c2d Update .gitignore
ignore out folder for VS2022 builds using CMake
2024-02-10 14:33:38 -05:00
Alam Ed Arias
a1308d8aa5 Update .gitlab-ci.yml file
Drop Debian musl jobs
2024-01-07 19:21:30 +00:00
Alam Ed Arias
caaeaef6cc fixup Valgrind warning:
Conditional jump or move depends on uninitialised value(s)
strncpy (vg_replace_strmem.c:599)
MIT_SetCurBackground (m_menu.c:2650)
M_IterateMenuTree (m_menu.c:2581)
M_SetMenuCurBackground (m_menu.c:2790)
F_InitMenuPresValues (f_finale.c:2276)
D_StartTitle (d_main.c:998)
G_Responder (g_game.c:2117)
D_ProcessEvents (d_main.c:282)
Local_Maketic (d_clisrv.c:5297)
NetUpdate (d_clisrv.c:5701)
TryRunTics (d_clisrv.c:5371)
D_SRB2Loop (d_main.c:820)
2024-01-07 13:09:47 -05:00
Alam Ed Arias
5b6c24281d Fixup DEBUGMODE builds
doomdef.h: check if the build system already define our DEBUG code
version.mk: do not fail on our inline functions in DEBUGMODE
features.mk: we do not need the VALGRIND libraies, just the headers
mserv.c: start registered with false in Update_parameters()
2024-01-07 13:07:28 -05:00
Logan Aerl Arias
8fefb8a87b CircleCI: move to LINUX64 build 2024-01-05 22:17:00 +00:00
Alam Ed Arias
c05f6e8053 Update config.yml 2024-01-05 16:49:52 +00:00
Alam Ed Arias
f613bd1279 Update config.yml 2024-01-05 16:47:48 +00:00
Logan Aerl Arias
1d88da8f05 CirecleCI build bot doesn't have libminiupnpc-dev 2024-01-05 16:24:47 +00:00
Logan Aerl Arias
e2164309a2 added libminiupnpc-dev to CircleCI build, try number two 2024-01-05 15:46:05 +00:00
Logan Aerl Arias
3f7dbcd15b Update config.yml
added libminiupnpc-dev to CircleCI build
2024-01-05 15:42:28 +00:00
Logan Aerl Arias
920f375f4a Update features.mk
fix miniupnpc typo in features.mk
2024-01-01 20:40:11 -05:00
Logan Aerl Arias
ee1186863e Merge branch 'MiniUPnPc_2.2.5_update' into 'master'
made UPnP port mapping enabled by default

See merge request STJr/SRB2!2251
2023-12-31 23:38:31 +00:00
Logan Aerl Arias
b6ef6e23b4 Merge branch 'master' into MiniUPnPc_2.2.5_update 2023-12-31 12:14:19 -05:00
Logan Aerl Arias
8d179825d9 switch to using sanitized subject for compnote 2023-12-31 15:56:37 +00:00
Logan-A
9dea09a7cc Update features.mk
change HAVE_MINIUPNPC to NOUPNP
2023-12-31 00:13:13 -05:00
Logan Aerl Arias
40d43dfa13 Update .gitlab-ci.yml file
disable uPnP in Debian stable musl
2023-12-31 05:06:38 +00:00
Logan-A
acc78d0ee5 Update i_tcp.c
made UPnP port mapping enabled by default
lowered UPnP Discover delay from 2000 ms to 500 ms
only look for first InternetGatewayDevice found
remove UPnP port mapping on shutdown
2023-12-30 23:41:34 -05:00
Alam Ed Arias
9c3ac6c86f Fix compiling on Linux/GNU systems with miniupnpc 2023-12-30 18:46:20 -05:00
Logan Aerl Arias
144cbd5385 Update .gitlab-ci.yml file
add libminiupnpc-dev to the build
2023-12-30 23:32:54 +00:00
Logan-A
322dfac85f update SRB2 to use miniUPnPc API version 17
update miniUPnPc function calls to API version 17
update include statements for miniUPnPcc
use PKGCONFIG to find lib and inc forminiUPnPc
2023-12-30 18:00:21 -05:00
Logan-A
95803eca16 Update win32.mk
remove miniupnc block
2023-12-30 13:29:22 -05:00
Logan-A
cdacb95846 update MiniUPnPc from 1.6 to 2.2.5 2023-12-30 12:15:07 -05:00
Alam Ed Arias
5d7ee3974f Build: error on array bounds 2023-12-26 17:49:34 -05:00
Logan-A
8374a1628c added NOEXECINFO to cMake
added NOEXECINFO to cMake
2023-12-25 19:52:32 -05:00
Alam Ed Arias
90edfa562d GitLib-CI: let use this build job to keep us from breaking non-glibc systems 2023-12-25 17:37:29 -05:00
Alam Ed Arias
78af4afc06 GitLab-CI: builders may reuse jobs, force remake links 2023-12-25 17:27:50 -05:00
Alam Ed Arias
e1f2cbd8ad GitLab-CI: fixup artifact exposes 2023-12-25 17:21:34 -05:00
Logan Aerl Arias
d678237a5c Update .gitlab-ci.yml file
add NOEXECINFO=1 to make
2023-12-25 21:59:28 +00:00
Alam Ed Arias
90f2170451 GitLab CI: work with busybox's tee 2023-12-25 16:51:59 -05:00
Hanicef
13cfc5ef59 Make execinfo.h optional (fixes musl libc build) 2023-12-25 16:38:11 -05:00
Alam Ed Arias
dbce1493ee GitLab CI: Alpine 3 build job with GCC 2023-12-25 16:37:06 -05:00
Alam Ed Arias
dc79b25cb9 Merge branch 'srb2ci' into 'master'
GitLabCI: use new builder image, srb2ci

See merge request STJr/SRB2!2237
2023-12-15 01:46:08 +00:00
Alam Ed Arias
bc96645f0b GitLabCI: use new builder image, srb2ci 2023-12-14 20:15:50 -05:00
Logan Aerl Arias
3cb384b10e Merge branch 'masterserverdualstack' into 'master'
Master Server API v1 URL change

See merge request STJr/SRB2!2226
2023-12-13 06:20:22 +00:00
Logan-A
5867b7355e add compnote support to comptime
add compnote support to comptime
2023-12-05 23:01:44 -05:00
Logan-A
eca16a811e comptime.sh is a bash shell, so it should have eol=lf 2023-12-05 21:03:01 -05:00
sphere
55fd958ee0 Merge branch 'i_setsongtrack-should-be-int32' into 'master'
I_SetSongTrack(int) should be I_SetSongTrack(INT32)

See merge request STJr/SRB2!2213
2023-11-29 11:19:53 +00:00
bitten2up
30e48fd555 I_SetSongTrack(int) should be I_SetSongTrack(INT32) 2023-11-29 11:19:53 +00:00
LoganAir
b5c8db00f8 Update mserv.c
https://mb.srb2.org is now behind CloudFlare, and the Master Server API v1 can not be accessed for some users due to this change. so I setup a new dual stack DNS record for accessing to the API
2023-11-26 17:44:03 -05:00
Monster Iestyn
0309535be9 Merge branch 'fix-sprite-clip-warning' into 'master'
Fix a "maybe-uninitialized" compiler warning

See merge request STJr/SRB2!2145
2023-11-26 20:42:49 +00:00
Alam Ed Arias
f644877bd3 Update .gitlab-ci.yml file
Fixup ARM64 build
2023-11-10 15:42:37 +00:00
Alam Ed Arias
7643ffadbc Update .gitlab-ci.yml file
Limit builds to just "Windows x86" and "Debian stable:amd64", all other builds can be started manually
2023-11-01 15:13:40 +00:00
Alam Ed Arias
bea48012c4 Merge branch 'musl' into 'master'
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2186
2023-10-29 05:16:34 +00:00