Commit graph

5352 commits

Author SHA1 Message Date
e9bd5b2ff8
Rename build.yml to build-deb.yml
This workflow will be dedicated to Debian packaging only.
2025-01-13 00:07:06 +01:00
8af4015db8
Revamp Debian and NSIS packaging
The existing scripts for Debian and NSIS packaging were too complex and
dealt unnecessarily with lower level details that should be already
handled by CMake and CPack.

- Packaging-related scripts have been moved to the new cpack/ directory.
There, CPack variables common to all generators are defined in
cpack/common.cmake, and then generator-specific variables are defined
independently (e.g.: cpack/debian.cmake and cpack/nsis.cmake).

- Packaging is now optionally done at a second stage, by running
`cpack -G <generator>` on the build directory. This removes the
requirement to branch based on the system name, and instead all CPack
variables are assigned unconditionally.

- Since now only one version of the game is packaged, there is no need
to maintain the complex scripts in packaging/ and packaging/windows that
used to deal with all variants (e.g.: "wip-cars-and-tracks",
"hq-cars-and-tracks", etc.).

- The use of CPACK_NSIS_EXTRA_INSTALL_COMMANDS,
CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS and CPACK_NSIS_CREATE_ICONS_EXTRA
should not be required, let alone modifying the HKLM registry manually,
since CPack already provides everything required to set up the
installer, the uninstaller and shortcuts.

- $INSTDIR is not required, since NSIS would already prepend the
target installation directory.

- PROJECT_VERSION_METADATA is not a standard CMake variable.
CMAKE_PROJECT_VERSION_TWEAK is instead meant for this purpose. [1]

- OPTION_PACKAGING and OPTION_ALL_IN_ONE_PACKAGING were removed since
packaging will always be available, yet optional. Packagers must then
run CPack on a second stage, as described above.

- Outdated comments were removed to avoid confusion.

TODO:

- Add shortcut to track editor on NSIS.

- dmg packaging was not revamped because of lacking compatible
hardware, but still it has been moved to cpack/dmg.cmake.

- Windows portable packaging (OPTION_PORTABLE_PACKAGING) has been left
out since it required 7z and relied on several hacks to work.
Furthermore, portable versions of the game were already not released on
the latest release, either. [2]

[1]: https://cmake.org/cmake/help/latest/variable/CMAKE_PROJECT_VERSION_TWEAK.html
[2]: https://sourceforge.net/projects/speed-dreams/files/2.3.0/
2025-01-13 00:07:01 +01:00
8ae4321be6
Introduce i686-w64-mingw32.cmake
This is the i686 counterpart to x86_64-w64-mingw32.cmake, which will be
used to generate 32-bit builds for Windows.
2025-01-12 22:46:40 +01:00
5e9613238c
CMakeLists.txt: Add HOMEPAGE_URL to project
This is later used by CPack for its CPACK_PACKAGE_HOMEPAGE_URL. [1]
This requires CMake >= 3.12, which was released circa 2018. [2]

[1]: https://cmake.org/cmake/help/latest/module/CPack.html#variable:CPACK_PACKAGE_HOMEPAGE_URL
[2]: https://cmake.org/files/v3.12/
2025-01-12 22:46:40 +01:00
76b83654e0
Set executable icon
On Windows, the executable icon is important since it is also inherited
by CPACK_NSIS_INSTALLED_ICON_NAME [1] and CPACK_PACKAGE_EXECUTABLES. [2]

[1]: https://cmake.org/cmake/help/latest/cpack_gen/nsis.html#variable:CPACK_NSIS_INSTALLED_ICON_NAME
[2]: https://cmake.org/cmake/help/latest/module/CPack.html#variable:CPACK_PACKAGE_EXECUTABLES
2025-01-12 22:46:34 +01:00
Xavier Del Campo Romero
1ead0ca79f Merge pull request 'Fix download manager on windows' (#14) from fix-win32-dm into main
Reviewed-on: #14
2025-01-10 08:33:19 +01:00
eab16bcdd9
win32/rmdir_r.cpp: Try with RemoveDirectory
All checks were successful
/ build (pull_request) Successful in 12m53s
SHFileOperation has been shown to fail when removing empty directories,
even if the documentation does not document such behaviour. [1]
Therefore, RemoveDirectoryA is used since it is meant for empty
directories. [2]

[1]: https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shfileoperationa
[2]: https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-removedirectorya
2025-01-09 22:02:09 +01:00
fd2327eec9
win32/rmdir_r.cpp: Check directory exists beforehand
rmdir_r's POSIX counterpart returns 0 on non-existing directories.
However, when SHFileOperation is called on a non-existing directory,
usually with DE_INVALIDFILES (0x7C) as its return code, although it is
considered unreliable. [1] Therefore, its existence must be checked
first.

[1]: https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shfileoperationa
2025-01-09 22:02:09 +01:00
9ddee14af1
unzip.cpp: Apply minor stylistic fix 2025-01-09 21:55:20 +01:00
1a4dc5f50f
unzip.cpp: Fix wrong open mode
By default, std::ofstream objects are opened under the std::ios::out
mode, equivalent to "r" mode in fopen(3), which has non-portable
behaviour. [1]

In order to avoid non-portable behaviour, std::ios::binary must be used
instead, equivalent to "rb" mode in fopen(3).

[1]: https://en.cppreference.com/w/cpp/io/basic_ofstream/basic_ofstream
2025-01-09 21:54:19 +01:00
Xavier Del Campo Romero
53a758688e Merge pull request 'Reduce minimum required OpenGL version from 3.3.0 to 2.1.0, and other fixes' (#3) from gl-renderer into main
Reviewed-on: #3
2025-01-08 00:48:20 +01:00
8f230211bb
OsgCar.cpp: Do not create SDCarShader on "none" shaders
All checks were successful
/ build (pull_request) Successful in 13m24s
Even if "none" shaders were selected, the game would still parse
car.frag and execute the shaders, which is not the expected behaviour.
2025-01-07 00:28:47 +01:00
c677c8d9e2
guiscreen.cpp: Reduce minimum required OpenGL version
3.3.0 was required only because one shader, namely car.frag, was
arbitrarily requiring GLSL 3.3.0. However, it was already compatible
with GLSL 1.1.0, [1] so the minimum required OpenGL version can be
safely lowered to 2.1. [2]

[1]: https://www.khronos.org/registry/OpenGL/specs/gl/GLSLangSpec.1.10.pdf
[2]: https://en.wikipedia.org/wiki/OpenGL#Version_history
2025-01-07 00:28:46 +01:00
21211a7aa5
guiscreen.cpp: Ensure successful SDL_GL_CreateContext
SDL_GL_CreateContext can fail due to several reasons, such as
GLXBadFBConfig on unsupported OpenGL versions.
2025-01-07 00:28:46 +01:00
Xavier Del Campo Romero
96d0dafac7 Merge pull request 'CMakeLists.txt: Reduce version to 2.3.0' (#13) from xavi/speed-dreams-code:reduce-version into main
Reviewed-on: #13
2025-01-07 00:20:31 +01:00
7700b68d87
CMakeLists.txt: Reduce version to 2.3.0
Some checks failed
/ build (pull_request) Has been cancelled
Until version 2.4.0 is not released, it is better to keep it as 2.3.0
since `git describe --tags --dirty` would return `v2.3.0-...` until the
`v2.4.0` tag is created.

Accordingly, speed-dreams-data also reduced its version to 2.3.0. [1]

[1]: 5c58ce805d
2025-01-07 00:18:47 +01:00
Xavier Del Campo Romero
c1cdee61e7 Merge pull request 'Add build.yml Forgejo workflow' (#9) from build-workflow into main
Reviewed-on: #9
2025-01-04 13:27:17 +01:00
17f37e85ad
Add build.yml Forgejo workflow
All checks were successful
/ build (pull_request) Successful in 12m52s
2025-01-04 13:00:28 +01:00
Xavier Del Campo Romero
7d2727c579 Merge pull request 'Introduce SD_ASSUME_DATADIR' (#10) from assume-datadir into main
Reviewed-on: #10
2025-01-04 13:00:03 +01:00
198f96295a
CMakeLists.txt: Introduce SD_ASSUME_DATADIR
This repository depends on the speed-dreams-data package in order to
generate a working package. However, in the context of CI/CD, it is
desirable to build this package without depending on the
speed-dreams-data, and instead assume it would be found on a standard
location.

Therefore, this would allow the generation of artifacts that install to
standard locations, such as Debian packages.
2025-01-04 11:55:19 +01:00
95f0bb57e6
CMakeLists.txt: Move call to project() to the top
Otherwise, references to standard CMake variables such as
CMAKE_INSTALL_PREFIX [1] would return an empty string.

Note: for some reason, CMake only documents this behaviour for other
variables such as PROJECT_SOURCE_DIR or PROJECT_BINARY_DIR, but not
CMAKE_INSTALL_PREFIX. [2] However, it was reproducible.

[1]: https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html
[2]: https://cmake.org/cmake/help/latest/command/project.html
2025-01-04 11:51:37 +01:00
Xavier Del Campo Romero
6791a9358f Merge pull request 'advancedgraphicconfig.cpp: Fix wrong direction' (#8) from fix-wrong-dir into main
Reviewed-on: #8
2025-01-03 12:37:40 +01:00
d56b0c54dc
advancedgraphicconfig.cpp: Fix wrong direction
This was causing the right arrow to act like the left arrow, so shaders
would jump from "none" to "ultra" instead of from "none" to "little".
2025-01-03 12:32:57 +01:00
Xavier Del Campo Romero
316a1bc18b Merge pull request 'Fix several issues with file setup' (#2) from issue-1 into main
Reviewed-on: #2
2025-01-03 00:18:30 +01:00
Xavier Del Campo Romero
f6bce9f4fb Merge pull request 'mainmenu.cpp: Move downloads button to correct order' (#5) from issue-4 into main
Reviewed-on: #5
2025-01-02 23:09:30 +01:00
98806b1e6e
mainmenu.cpp: Move downloads button to correct order
Otherwise, pressing the "arrow down" key would jump with the following
order:

Options -> Downloads -> Credits -> Quit

Instead of the expected order:

Options -> Credits -> Downloads -> Quit
2025-01-02 23:00:34 +01:00
7e72f12a48
filesetup.cpp: Ensure destination dir before copy
When GfFileSetup is called on a fresh installation, none of the
destination directories might exist.

On the other hand, robustness has been slightly improved by adding calls
to good() and is_open().
2025-01-01 21:54:29 +01:00
1f81d42305
unitmain.cpp: Remove confusing error message
Now that the game ships without any driver by default, it is very likely
that simplix.xml does not exist on fresh installations. In fact, the
game already did not consider this as an error, so this was a leftover.
2025-01-01 21:05:12 +01:00
a0c31c8a1c
download-manager/README.md: Update driver info 2024-12-31 10:42:07 +01:00
bd2880e37b
Look up SD_DATADIR_ABS if SD_DATADIR not found
Commit 744677c3a6f3e6c1c463fe55b7b5408355ffe89b from speed-dreams-data
replaced the definition for SD_DATADIR from an absolute path to a
relative path. This was done in order to allow a relative path to be
looked up first by GfApplication::parseOptions() (as required by Windows
and macOS builds), and then look SD_DATADIR_ABS if not found (as
required by in-tree builds).
2024-12-31 08:34:49 +01:00
ef04856f25
cmake: Replace SVN versioning with git-describe(1)
Now that the project has been migrated from SVN to Git,
the complex logic to determine the project version is now no longer
needed, since Git can achieve the same effect with git-describe(1). [1]

TODO: CPack-related code should be also updated accordingly.

[1]: https://git-scm.com/docs/git-describe
2024-12-31 06:50:42 +01:00
58a4692905
CMakeLists.txt: Remove obsolete < 3.0.2 checks
CMake 3.0.2 was released over ten years ago. [1] It is therefore assumed
that more modern CMake versions are already widely available.

[1]: https://cmake.org/files/v3.0/
2024-12-31 06:25:57 +01:00
9a21275afc
Reload GfRaceManagers on downloadsmenu exit
This is required since _vecAcceptedCarCategoryIds must be reloaded so
that car categories are refreshed when entering the driver selection
menu.
2024-12-31 06:14:07 +01:00
a0c2dcc761
Reload tracks on downloadsmenu exit 2024-12-31 06:14:07 +01:00
bc95fd8f25
unitmain.cpp: Do not error on failed getCategory
The game would already ignore drivers with a non-existing car.
2024-12-31 06:14:07 +01:00
6fb613cc89
cmake: Do not install anything as DATA
Since the migration from SVN to Git, the data/ directory was put into a
separate repository, so that the engine repository should never install
anything there.
2024-12-31 06:14:07 +01:00
e93d3a9900
cmake: Leave SD_DATADIR empty if undefined
Otherwise, if the speed-dreams-data package is not found, SD_DATADIR
would expand to "/", which is a valid directory that the game would
attempt to look up.
2024-12-31 06:14:06 +01:00
d831bacfba
tgf/tgf.cpp: Return empty tgtPath on empty srcPath
Otherwise, even if srcPath is empty, a trailing '/' would be appended to
tgtPath, and therefore it would not be possible to get an empty data
directory if SD_DATADIR is undefined or empty.
2024-12-31 06:14:06 +01:00
522022fe1f
Remove xmlversion
This command line tool was meant to generate a XML file (typically,
version.xml) containing the version numbers for a list of files defined
by the SD_INSTALL_FILES CMake macro. Then, the game would read this XML
file and copy files around if an update was needed.

Unfortunately, this introduced a circular dependency between the engine
and data repositories, as the engine repository would rely on the data
directory to know the file list, and the data repository would rely on
the xmlversion executable to be available, and therefore the engine
repository.

Ultimately, none of this was needed: it is much simpler to define a
static, line-separated list of files in the data repository, and then
let the game figure out the versioning by itself. This renders
xmlversion entirely redundant, and therefore breaks the circular
dependency. As a bonus, some overly complex CMake stuff could be
removed.
2024-12-31 06:14:06 +01:00
91b7a3bb41
tgf/params.cpp: Return -1 on error
Otherwise, it would be impossible to distinguish an error from version
number '0', which is also valid.
2024-12-31 06:14:06 +01:00
63489e627e
install.cmake: Remove obsolete macros
Car/track installation is handled by the speed-dreams-data package.
2024-12-31 06:14:06 +01:00
cf18241a16
cmake: Get SD_DATADIR from speed-dreams-data package
So far, the game assets were located in the same repository as the game
engine. Since data and engine are split into different repositories, now
this project requires users to assign the CMAKE_PREFIX_PATH variable [1]
to indicate the location, only in the case of non-standard locations.

[1]: https://cmake.org/cmake/help/latest/variable/CMAKE_PREFIX_PATH.html
2024-12-31 06:14:06 +01:00
f593eee939
Rename COPYING.txt to LICENSE 2024-12-31 06:14:05 +01:00
f9b820229f
Replace README.txt with README.md 2024-12-31 06:14:05 +01:00
7bd0fe9fa9
CMakeLists.txt: Do not depend on data/ 2024-12-31 05:23:42 +01:00
4d53ae9ce6
Add .gitignore 2024-12-31 05:23:42 +01:00
fec5fc09d3 drivers/CMakeLists.txt: Remove urbanski
Even if urbanski is a good example of a minimalistic implementation that
can be used for learning, it is far from a competitive driver and is
highly prone to crash in race, which would affect user experience
negatively.

Therefore, it is better to leave the source code available for reference
purposes, but do not include it into the build so that urbanski-drivers
cannot be selected.


Former-commit-id: 277281ef785291f0e7deb262e2c2c3b8f9cffc3b
Former-commit-id: efde653b918a8a4df65ac23b15025e4aeefc9275
2024-12-25 08:06:45 +01:00
65861b65dd Remove bt, K1999, hymie and kilo2008
These drivers are considered obsolete and were not even built any more.


Former-commit-id: 951cff0a690a7fe9320ed767863495266bac5159
Former-commit-id: 923e07a5ee892d5dab22593934c98958fdd63ed7
2024-12-25 08:06:44 +01:00
91d844529b simplix: Remove static buffers, use .json
Having statically allocated buffers in this context was not only
unnecessary, but also dangerous because these strings would be shared
among all TDriver instances, even if they really should not, since every
TDriver instance belongs to a different driver, and therefore different
parameters.

Also, since racing lines are now dumped into JSON files, it makes sense
to reflect this into the file extension, too, so that text editors can
easily recognise the syntax.


Former-commit-id: 3421b724bfc040f288fe61ffc0fc78fe5a25cd4f
Former-commit-id: 0844542eecaa950c1f96a860e2fcd21d6807059a
2024-12-25 08:06:44 +01:00
79765ddb87 unitclothoid.cpp: Rewrite points load/save
Since oPathPoints is defined as a std::vector, dumping TPathPt instances
as Plain Old Data is not valid any more. In fact, C++ compilers would
already warn that offsetof(3) could not be safely used with TPathPt
members since it never was Plain Old Data, but this warning was
suppressed only because raw pointer manipulation had been used instead
of offsetof(3).

On the other hand, dumping binary data is inherently non-portable and
not human-readable, so this commit suggests to dump such data in JSON
format, as cJSON is already used by the project and XML is bad, among
many other things, to store arbitrarily large arrays.


Former-commit-id: 4a447adb452dd9ae85ca4cce9993cbe9ad0487f6
Former-commit-id: b462a614ed53f1938eadb4680a10ef57576b29d9
2024-12-25 08:06:44 +01:00