Commit Graph

527 Commits

Author SHA1 Message Date
Jeod
66a0608b7d
Update 02-runtime-issue.yml 2024-04-22 13:10:25 -04:00
Jeod
952709d621
Merge pull request #3 from JeodC/newissuetemplates
Add new issue templates
2024-04-22 13:09:01 -04:00
JeodC
26391834c3 Add new issue templates 2024-04-22 13:07:31 -04:00
Azamat H. Hackimov
c791e177b1
Merge pull request #147 from scivision/doc
Readme: tell location of new Descent3 exe
2024-04-22 10:45:43 +03:00
scivision
62cd52de54
readme: note location of newly build Descent3 binary 2024-04-22 00:20:17 -04:00
GravisZro
9a80863c7f Ensure STDCALL/STDCALLPTR is only invoked on x86
Prevent the code from trying to use stdcall for anything except (32-bit) x86 builds
because it's the only platform it's applicable for.
2024-04-21 22:24:50 -04:00
Azamat H. Hackimov
e8809973b8 Replace vector with array
Arrays has fixed length, that prevents of possibility accidentally expand them.
2024-04-22 03:27:17 +03:00
Azamat H. Hackimov
6352ab21b9 Fix possible heap buffer overflow
Strict size of name of entry with 36 bytes.
Thanks to MaddTheSane for pointing out.
2024-04-22 02:37:42 +03:00
Edu Garcia
ebc78a6463
Merge pull request #139 from winterheart/linux-clang
CI: Add Linux / clang to build matrix
2024-04-21 21:24:34 +01:00
Kevin Bentley
1fd8876f60
Merge pull request #135 from DanielGibson/use-libacm
Use upstream libacm 1.3 for ACM audio decoding
2024-04-21 13:46:27 -06:00
Azamat H. Hackimov
9e9b713507
Merge pull request #109 from Lgt2x/clang-warnings
Fix some clang warnings
2024-04-21 22:08:07 +03:00
bperris
ceaa4a3c2f
Merge branch 'DescentDevelopers:main' into objunlink-sanity-check 2024-04-21 15:03:06 -04:00
Bryan Perris
6af62c8b02 sanity check: don't attempt to unlink an object that is already unlinked
Fixes load file crash issue, same for demo loading
2024-04-21 15:01:49 -04:00
Daniel Gibson
55181313c9 Fix loop in InternalAudioDecoder::Read() 2024-04-21 20:26:02 +02:00
Louis Gombert
c486919477 Fix -Wtautological-pointer-compare 2024-04-21 20:24:31 +02:00
Louis Gombert
491db4254a Fix -Wdangling-else 2024-04-21 20:24:31 +02:00
Louis Gombert
43af644827 Fix -Wparentheses 2024-04-21 20:24:31 +02:00
Louis Gombert
a807c99283 Fix -Wparentheses-equality 2024-04-21 20:24:31 +02:00
Louis Gombert
04e8aeb247 Fix -Wswitch 2024-04-21 20:24:31 +02:00
Louis Gombert
466a142ba3 Fix -Wcomment 2024-04-21 20:24:31 +02:00
Louis Gombert
f1ec3d76c6
Merge pull request #122 from winterheart/hogutils
Own implementation of HogUtils - HogMaker
2024-04-21 18:08:39 +00:00
Azamat H. Hackimov
6a6f6570be CI: Add Linux / clang to build matrix 2024-04-21 20:17:04 +03:00
Jeod
7463cb7d97
Merge pull request #123 from danra/ci_multi_config
[CI] Use same job for both Debug and Release builds
2024-04-21 12:38:31 -04:00
Daniel Gibson
f8aba67c56 Remove libacm/util.c
not needed, only using functionality of decode.c
2024-04-21 18:35:56 +02:00
Daniel Gibson
89bb0a54a8 Implement an IAudioDecoder that uses libacm
removed libacm.cpp, it's now in adecode.cpp, I think that's less
confusing now that the actual upstream libacm code is also in libacm/

This fixes the crash reported in #83
2024-04-21 18:35:56 +02:00
Daniel Gibson
a55f1a33aa Make libacm.h C++-aware
see also https://github.com/markokr/libacm/pull/1
2024-04-21 18:35:56 +02:00
Daniel Gibson
94ce70bb89 AudioDecoder: Get rid of custom malloc/free functions
were never set anyway, and (the real) libacm doesn't support custom
allocators.
2024-04-21 18:25:52 +02:00
Daniel Gibson
f6f3c334de Import source of libacm 1.3, integrate it into CMake build
only the sourcefiles needed here,
from https://github.com/markokr/libacm
2024-04-21 18:25:45 +02:00
Daniel Gibson
f61f34971d Add FORCE_COLORED_OUTPUT option (for GCC and Clang) to CMakeLists.txt
To enforce colorful compiler warnings when building with Ninja
(and GCC/Clang) on Linux and similar platforms.

Taken from dhewm3 (where I implemented it).
2024-04-21 18:21:42 +02:00
Dan Raviv
eb1ad62b8b Verbose build in CI
Useful for debugging CI and build issues
2024-04-21 09:21:41 -07:00
Dan Raviv
462ae4de3f [CI] Use same job for both Debug and Release builds
Making use of CMake's multi-config generators which we're using.
Simpler and more efficient, halves number of jobs.
2024-04-21 09:21:15 -07:00
Azamat H. Hackimov
1765d07790 Remove now unused hogUtils-i686 2024-04-21 19:15:23 +03:00
Azamat H. Hackimov
f19510ef2f Generate HOG files as dependencies for Descent3
Generated d3-linux.hog now places next to Descent3 executable, ready to play. Scripts also generated in ${CMAKE_BINARY_DIR} and don't pollutes source dir.
2024-04-21 19:15:23 +03:00
Azamat H. Hackimov
fb0dabc367 Implementing HogMaker replacement of HogUtils
Currently, this tool can make only create HOG from list of files taken from text file (one line per file).
2024-04-21 19:15:23 +03:00
Thomas Roß
fabcdcd84d [Windows] Temporary workaround to keep the window resolution as it was before the changes to fix the preprocessor defines for the Release build. 2024-04-21 17:40:22 +02:00
Thomas Roß
018c43b995
Merge branch 'DescentDevelopers:main' into fix-release-build 2024-04-21 17:09:19 +02:00
Thomas Roß
9d2496f28b [Build] Only set preprocessor define _DEBUG in Debug builds.
Linux and Mac had this set on all build configurations.
2024-04-21 15:14:31 +02:00
Jeod
84938fc52f
Merge pull request #133 from Jayman2000/remove-unnecessary-build-dependency
Remove unnecessary build dependency
2024-04-21 09:03:34 -04:00
Jason Yundt
423dfdb249 Remove unnecessary build dependency
2d4d82d (Accurately find the linux artifacts (#80), 2024-04-19) made it
so that make no longer gets used as a part of the build process, but it
didn’t remove make from the list of build dependencies.
2024-04-21 08:59:56 -04:00
Thomas Roß
299a46740e [Build] Fixed Linux/Mac Release build compilation due to inconsistant #ifdef use that worked only on Windows. 2024-04-21 14:28:51 +02:00
Thomas Roß
d3d83d3e44 [Build] Fixed 'uninitialized local variable' in Release build after last commit. 2024-04-21 14:13:14 +02:00
Thomas Roß
480b6ad0ed [Build] Added missing RELEASE preprocessor define in Release build. 2024-04-21 14:11:45 +02:00
Louis Gombert
07d988e194
Merge pull request #127 from th1000s/cmakefixes
CMake consistent white space formatting
2024-04-21 10:12:48 +00:00
Thomas Otto
00389c50ea Some more CMake white space formatting
- tabs to spaces
 - use Unix line endings everywhere
 - newline at end of file
 - remove trailing white space
 - no space between keywords and opening parenthesis
 - use 2 spaces to indent
2024-04-21 11:46:32 +02:00
Louis Gombert
8e531a5496
Merge pull request #124 from danra/brew_cmake
Add cmake to Brewfile, simplify instructions
2024-04-21 08:00:25 +00:00
Dan Raviv
f142a65a15 Add cmake to Brewfile, simplify instructions 2024-04-20 20:28:38 -07:00
Jeod
8e947628ca
Merge pull request #106 from DescentDevelopers/issue-templates
Add issue templates, adjust gitignore for windows
2024-04-20 20:05:41 -04:00
Jeod
05599feb33
Merge pull request #119 from DescentDevelopers/JeodC-patch-1 2024-04-20 18:04:04 -04:00
Jeod
fea041475e
Add missing prerequisite 2024-04-20 18:03:55 -04:00
Jeod
c8f5fcdc9a
Merge pull request #118 from DescentDevelopers/JeodC-patch-1 2024-04-20 18:02:19 -04:00