Commit Graph

465 Commits

Author SHA1 Message Date
Jacob Coby
7d79d0afc9 Back out pilot.cpp 2024-04-29 17:24:08 -04:00
Jacob Coby
17bc3656c7 Back out dedicated_server.cpp 2024-04-29 17:18:42 -04:00
Jacob Coby
7dcfe312ea Back out Descent3/multi_external.h 2024-04-29 17:12:44 -04:00
Jacob Coby
5775abf198 Back out lib/directplay.h 2024-04-29 17:04:48 -04:00
Jacob Coby
2deaeab228 Back out dd_sndlib 2024-04-29 16:56:13 -04:00
Jacob Coby
bd806e34b9 Back out ddio_win 2024-04-29 16:50:19 -04:00
Jacob Coby
497ac00a61 Back out networking.h 2024-04-29 16:43:35 -04:00
Jacob Coby
551c877206 Back out networking/networking.cpp 2024-04-29 16:37:49 -04:00
Jacob Coby
27d1ce7856 Back out directplay.cpp 2024-04-29 16:32:35 -04:00
Jacob Coby
b374d59634 Back out more ulong typedefs 2024-04-29 16:27:33 -04:00
Oskar Strengbohm
ee12e3a5dd misc: pstring: Improve CleanupStr. 2024-04-29 22:11:57 +02:00
Oskar Strengbohm
21afcaafa0 Remove asm files. 2024-04-29 21:44:32 +02:00
Azamat H. Hackimov
b0cef3ff0e
Merge pull request #197 from Nakhr11n/pstring
Refactor and remove unnecessary in misc/pstring.cpp and dependents.
2024-04-29 22:23:48 +03:00
Jacob Coby
fbb2fcb769 Revert pstypes.h 2024-04-29 14:56:58 -04:00
Jacob Coby
2210afe02b Revert win long -> int changes 2024-04-29 14:46:14 -04:00
Louis Gombert
c9d59b9073
Merge pull request #219 from MaddTheSane/virtualDestructor
Add virtual default destructors on a few abstract classes.
2024-04-29 18:36:42 +00:00
Jacob Coby
a6a6869a7e 64 Bit-Safe Updates
Imported Icculus' 64-bit changes.

Changes `[un]signed long` data types to `[un]signed int`.
2024-04-29 14:10:09 -04:00
C.W. Betts
61e9a42a73 Add virtual default destructors on a few abstract classes. 2024-04-29 15:28:30 +00:00
Oskar Strengbohm
4582b44eb3 misc: pstring: Refactor dependents. 2024-04-29 10:01:33 +02:00
Oskar Strengbohm
f9fdfc22e8 misc: pstring: Remove unneccesary or unused functions. 2024-04-29 09:55:45 +02:00
Jeod
aa7407a8d5
Merge pull request #218 from icculus/ryan-compiler-warnings 2024-04-29 03:27:14 -04:00
Ryan C. Gordon
6c8977caf0
Heavy patching for compiler warnings.
The vast majority of this is fixing up `char *` that should be `const char *`
but a handful of other fixes, like potential buffer overflows that GCC
noticed, etc, were applied as well.

This removes `-Wno-write-strings` from CMakeLists.txt, as it is no longer
necessary, as there is no longer a flood of compiler warning spam when
building.

This does not fix all compiler warnings; there are still a handful, and they
are legitimate, but they can be dealt with in a future commit.
2024-04-29 00:18:56 -04:00
bperris
9d2aa8d809
Merge pull request #227 from th1000s/mp
Windows/CMake: add /MP for multi process MSBuild
2024-04-28 19:39:53 -04:00
Thomas Otto
19fb21434c Windows/CMake: add /MP for multi process MSBuild
"The /MP option can reduce the total time to compile the source
files on the command line. The /MP option causes the compiler
to create one or more copies of itself, each in a separate process."

<https://learn.microsoft.com/en-us/cpp/build/reference/mp-build-with-multiple-processes?view=msvc-170>
2024-04-29 01:11:57 +02:00
Jeod
20046a5b8b
Merge pull request #225 from winterheart/win32-linker-fix
Enable WIN32 property only for Descent3
2024-04-28 18:47:49 -04:00
Azamat H. Hackimov
c18be49ae6 Enable WIN32 property only for Descent3
Disable global linker option that forces /SUBSYSTEM:WINDOWS for all executables (tools and unittest included).
2024-04-29 01:43:06 +03:00
Louis Gombert
9b5f8cbee2
Merge pull request #199 from th1000s/cmdline
Unify Windows/Unix command line
2024-04-28 22:14:03 +00:00
Louis Gombert
6d91c381f8
Merge pull request #179 from winterheart/checksum-unittests
Checksum unittests and Osiris types unification
2024-04-28 21:54:34 +00:00
Louis Gombert
38f75ee9a8
Merge pull request #171 from winterheart/ci-unittests
Enable unittests on CI
2024-04-28 21:09:56 +00:00
Jeod
e42a38e2d8
Merge pull request #224 from winterheart/git-hash
Introducing git revision in source code
2024-04-28 15:51:03 -04:00
Azamat H. Hackimov
79c7749242 Adding version to HogMaker 2024-04-28 22:05:26 +03:00
Azamat H. Hackimov
1926a77f19 Introducing git revision in source code
Git revision is generating on build time (not on configure time). In case of uncommited changes this revision will be marked as "dirty". If cmake cannot retrieve revision from git history (i.e. from packaged source code), cmake will attempt to read "git-hash.txt" from `PROJECT_SOURCE_DIR` (it will be generated on build time; after implementing packaging workflow it can be reworked).
Reworked main screen and console output to display proper version.
Version project now is 1.5.0 as previous PATCH value (500) was intended to be D3_RELEASE_BUILD_NO, autogenerated on compile time. As we switched to GIT_HASH, D3_RELEASE_BUILD_NO now useless.
2024-04-28 22:05:26 +03:00
Jeod
cfe06aeaaf
Merge pull request #223 from jcoby/fix-mouse-grab
Grab mouse after SDL_SetVideoMode
2024-04-28 13:37:48 -04:00
Jacob Coby
988653e01e Grab mouse after SDL_SetVideoMode
Fixes mouse cursor not being grabbed on macOS. Also sets the
`ddio_mouseGrabbed` flag correctly so it can be detected later on.

Fixes #201
2024-04-28 10:14:26 -04:00
Jeod
f001d82b80
Merge pull request #222 from DescentDevelopers/JeodC-patch-1
Update README.md
2024-04-28 09:41:30 -04:00
Jeod
b26193f603
Update README.md 2024-04-28 09:41:15 -04:00
Jeod
7cd46b7b52
Merge pull request #221 from DanielGibson/update-libacm
Update libacm
2024-04-28 09:12:36 -04:00
Daniel Gibson
dc96e4e3b6 Remove comment about decoding ACMs as stereo in libacm/adecode.cpp
with the recent changes in libacm, it's not true or relevant anymore
2024-04-28 15:01:02 +02:00
Daniel Gibson
90f00b9e4c Update libacm to latest upstream code
which includes a fix for the problem with playback of mono ACM files
2024-04-28 14:59:32 +02:00
Jeod
dbe2cdea64
Merge pull request #220 from winterheart/main-cmake
Update CMakeLists.txt
2024-04-28 07:34:18 -04:00
Azamat H. Hackimov
bdcb6cdbf4 Fix typo in CMakeLists.txt
Change CMAKE_SYTEM_NAME with CMAKE_SYSTEM_NAME, replace add_definitions with add_compile_definitions.
2024-04-28 14:28:15 +03:00
Jeod
0ce6b341e5
Merge pull request #188 from tophyr/kill-unused-srcs
Kill unused srcs
2024-04-28 07:23:48 -04:00
scivision
1f9c8cbf54 cmake: use regex to simplify
ref compiler ids:
https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html
2024-04-28 14:07:47 +03:00
scivision
4d109a1382 cmake: use CMAKE_SYSTEM_NAME where prudent 2024-04-28 14:04:51 +03:00
scivision
31855c850b cmake: use find_* name-value for readability 2024-04-28 14:04:51 +03:00
scivision
1188b65c43 cmake: modernize, using safer/clearer options
CMAKE_BUILD_TYPE must be set CACHE before project() to take effect

general best practice rather than modifying CMake internal variables
is to use add_compile_options with genex
2024-04-28 14:04:48 +03:00
Jeod
fe55108012
Merge pull request #211 from JeodC/main
Make it look prettier in reader mode
2024-04-27 19:40:05 -04:00
JeodC
edb988d404 Make it look prettier in reader mode
ffs
2024-04-27 19:39:36 -04:00
Jeod
5d016e5eab
Merge pull request #210 from JeodC/main
Make PR template look prettier in editor mode
2024-04-27 19:37:57 -04:00
JeodC
14a1af5e68 Make it look prettier in editor mode 2024-04-27 19:37:17 -04:00