Commit graph

35 commits

Author SHA1 Message Date
ce433d14d2
cmake: Replace SOURCE_DIR with CMAKE_SOURCE_DIR
CMAKE_SOURCE_DIR already points to the directory for the top-level
CMakelists.txt [1], so SOURCE_DIR is redundant.

[1]: https://cmake.org/cmake/help/latest/variable/CMAKE_SOURCE_DIR.html
2025-01-19 08:19:23 +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
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
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
xavi92
f996217509 customthirdparty.cmake: Optionally install libwinpthread
Some flavours of MinGW are built with the `posix` thread model, which
require to copy libwinpthread-1.dll to the `bin/` directory, as opposed
to those configured with the `win32` thread model.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9612 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d1c08685c33951fb150b94a0343e0d46d001ce4e
Former-commit-id: c146217ce9bef791e0cfb41a8ac2bea4e4a07346
2024-10-28 05:56:09 +00:00
xavi92
ec2222a1a4 cmake: Install MinGW libraries
These libraries must be installed into the bin/ directory in order to
run the speed-dreams-2 executable.

Note that MinGW is distributed with several flavours and therefore might
define different names for libgcc. [1] libstdc++-6.dll has also been
found on different directories depending on the flavour. On the other
hand, libssp might not be available on some distributions, so it remains
optional.

[1]: https://wiki.unvanquished.net/wiki/MinGW


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9602 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 84c850bd58150fc67bdd124c0a353815185f86b0
Former-commit-id: 602c3a1227936c9da5b727c9e10ae6c90526227d
2024-10-27 08:06:42 +00:00
xavi92
221a933702 Define xmlversion as ExternalProject
xmlversion is meant to be a build-time tool, which means it must never
be cross-compiled. Since toolchain settings are shared among all
libraries within a project, the only way in CMake to build an executable
using the host toolchain (instead of the cross-toolchain) is to define
it inside of an ExternalProject.

xmlversion also depends on several in-house libraries that must be also
build with the host toolchain, so those libraries shall be both
cross-compiled and natively compiled.

On the other hand, since a known install prefix is assigned to
xmlversion, _XMLVER_EXE, _XMLVER_DIR and _XMLVER_NAME no longer need to
be calculated.

Note that CMAKE_FIND_ROOT_PATH must not be passed to the ExternalProject
since xmlversion must never be cross-compiled.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9594 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d3332d5a3d388b6a6f0179b72e509606ec0055aa
Former-commit-id: 31997c4074f9e9395cb1ccfd9f7487e02584eaf4
2024-10-27 08:01:23 +00:00
xavi92
4681971d6d Remove svn:keywords property from the repository
These properties are not transmitted with git-svn(1) [1], which might
then cause failed patches when modifying lines close to these
properties.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9554 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6ed21e1fe12d01a370842418c35722c75117a30a
Former-commit-id: 8ecd21b7c0211cd000b10b3f0032980f63c06398
2024-10-02 15:30:18 +00:00
xavi92
0e7a45d2be Remove $Id$
This SVN-specific keyword [1] did not expand as expected on Git
repositories migrated from SVN via git-svn(1) [2]. Because of this,
applying patches with modifications would sometimes fail because, even
if these lines were not modified, they could be part of the context
lines, thus heavily confusing Git.

Since it is already expected to migrate from SVN to Git sometime soon,
this would also make $Id$ redundant.

[1]: https://svnbook.red-bean.com/en/1.7/svn.advanced.props.special.keywords.html
[2]: https://git-scm.com/docs/git-svn


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9550 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 7acf9a9675a0496a85ecd61210b8c29c89f9517a
Former-commit-id: 1878bb38889e4dddc83ef762b6b384f0f0a4ecc5
2024-09-30 05:17:15 +00:00
xavi92
6d7ca06e02 String trailing whitespaces
The following shell script was used:

while read f
do
        sed -Ei 's/[[:space:]]+$//g' "$f"
done <<EOF
$(svn ls -R | grep \
        -e '.\cpp$' \
        -e '\.cmake$' \
        -e '\.txt$' \
        -e '\.cppcheck$' \
        -e '\.frag$' \
        -e '\.h$' \
        -e '\.hpp$' \
        -e '\.vert$' \
        -e '\.xml$' \
        -e '\.java$' \
        -e '\.c$')
EOF

As a side effect, this has also converted some files from CRLF line
endings to LF.

File extensions such as .ac or .osg were intentionally left out because
those usually are very large files generated by tools.



git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9507 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6c1e5ab34415982ec77fc92a77e1b1c149518eca
Former-commit-id: c6cf9480ae7c1d2f9a999eb6c6b976eef8bae3ba
2024-07-30 21:45:07 +00:00
beaglejoe
cacb89eae2 Remove CMake SDL1 code
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7657 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 858db72cefd554825934c81a8d252255cae56b96
Former-commit-id: 17ade6a6b90ab1541bcfad65879926fef79e3518
2021-09-16 21:03:12 +00:00
beaglejoe
e459b96cc0 WIP for Build automation Ticket #1069
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7574 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 334b33415226ffeee7549f6205cf0bcf1bbc52b5
Former-commit-id: 5e5a5669e39daace115af8558b9e5abc8ee39e91
2021-06-16 16:18:54 +00:00
beaglejoe
f7524b3600 Fix installation of version.xml
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7527 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 58e445fc5bc427e68ae04793dbe46ad7228a95c6
Former-commit-id: 442634a5af0fb2a8cf8ef178dfaa87b4949544c7
2021-05-25 17:12:30 +00:00
beaglejoe
a969100a00 Fixed CMake error formatting
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6493 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2acac4e2858560b76ce320c305ac69550fd18f32
Former-commit-id: f23159fa93f94cd85cecbd066230a0d39720201f
2017-01-10 04:59:39 +00:00
beaglejoe
f21289a6b1 Fixed MPA1 car loading
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6313 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 7b1a34c8d21c79d8ffee565de501112ff48237b0
Former-commit-id: 7665809226a2493597691f9f4d7ec889a3fe6939
2015-12-22 03:45:23 +00:00
beaglejoe
1489a8858e Some CMake fixes for SDL2
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6025 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5fb2dcaf512a02c27397d1018a532e7a89b4eb25
Former-commit-id: 4f5ff5c1ae1872c4209c510f6f6823890e9326bf
2015-06-13 18:03:47 +00:00
torcs-ng
fc51dce5a6 - Reverted previous commite (for osggraph)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5921 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: cd675def74ae1fff3f89a0075d139b4d56a81762
Former-commit-id: ae29d6382dce27781613a30f3230ad4bc4948e19
2015-03-22 21:57:08 +00:00
torcs-ng
f9fe505ead - Removed Option for OsgGraph (Now it's always build)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5920 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 05438b300bbff6b1962c55785174be86c3260098
Former-commit-id: a35fbe420632d2e2f8ee5bd3905573269b9ff673
2015-03-22 19:39:00 +00:00
beaglejoe
ddbc76579a Fix for version.xml install on windows
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5795 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6618f4ac9d4787797c1a86852ff2293ef2e03848
Former-commit-id: 5c70238546ab70518032fcb998118a7c2f021689
2014-06-26 07:34:18 +00:00
beaglejoe
e5fe431239 Revert to revision 5660
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5782 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 66a95ba5d6c22d19dfeec06791aede679aba63e2
Former-commit-id: 558486eff31331db882dee3fc615682be7be4bd9
2014-06-21 23:01:18 +00:00
beaglejoe
944bed7633 Fixes for cmake warnings and windows packaging
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5767 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 22223e6574b9f8f70fa490047c292ab8411c7519
Former-commit-id: 8245fec09e0d386c0ec899ab46d475e23c5d9f52
2014-06-13 23:23:05 +00:00
torcs-ng
2a659bb5a1 fix bug with no install ac file in cars when acc is not exist
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5660 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 72c18da8fd138ed2065acdfeff28432c733b4d81
Former-commit-id: 9575ffced49ba8a87c251ee325c7e6458d21e906
2013-08-06 19:38:33 +00:00
pouillot
0fb9de79cf Re #58 Fixed robots data sub-folders not always installed
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5390 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c0ea8835d712d06258f92bdead8565eb1daf6141
Former-commit-id: 728928b70c0dcc7689a11cfb506b174d6ba14443
2013-04-03 18:22:03 +00:00
pouillot
72754a9537 Re #58 Fixed crash on loading credits menu + QtCreator+MinGW build + CMake configuration polishing
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5364 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 03630704ca851d833f367cc29b6e5e1a99051b4e
Former-commit-id: 7847f54e8747e1bca7678ab3f6e0d941266e0e40
2013-03-25 19:40:53 +00:00
pouillot
67f7799da0 Re #58 Last fixes for MSVC 2005 and MinGW+MSYS side (TODO: check MinGW + QtCreator)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5358 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 7e800883ef21db1a3972ea1a33e7b30d28254cbd
Former-commit-id: 8305189dec8c9fcbe51172de41cbed78d7c72e06
2013-03-24 14:12:45 +00:00
pouillot
b29c64b055 Re #58 Fixed MSVC 2005 build and install
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5352 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: fdf3fbb482bdc56d12750715bc238b8a8004b157
Former-commit-id: 488d22c94d3cb9323f65e5f21273a6393c7d2858
2013-03-23 23:03:52 +00:00
pouillot
a2c721ae45 Re #58 Fixed MinGW build and install after r5349
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5351 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 7add551618c82029033563d3d7a3d03f2c8cff20
Former-commit-id: 83c6050ac6ecf089d3ac8fb794151f57bdc2a75f
2013-03-23 21:57:52 +00:00
pouillot
cbe6210099 Re #58 Fixed MinGW build after r5349
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5350 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2160f798aec667291af6809b7f682ca2cd60e60a
Former-commit-id: c72bd469cb7c8cfcf657f0e3df8b609fac891424
2013-03-23 18:33:42 +00:00
pouillot
f288dade73 Re #58 Last steps completed (works under Linux)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5349 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c4340c47cbe3d000186c1305c3505453bd7e0732
Former-commit-id: 600818482cc83f3dfbf26d34d93b52e15a4db5e8
2013-03-23 17:59:22 +00:00
beaglejoe
5ca56d97d5 xmlversion.exe needs portability.dll
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5318 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: b329c1f1f6e1dfbf38666ca6e9d4cf051ba2f34f
Former-commit-id: 1ae33f475dd1efce1a3fe618124519d5d3378f33
2013-03-13 09:15:14 +00:00
pouillot
44f9508084 Re #58 Install data/cars tree with same structure + moved source robots data to new source data/drivers tree (same structure as currently installed one)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5284 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: de63cfe174c10de9bc0e6a5d97b8254af1d570cb
Former-commit-id: f98d582fc26a11bf9f0e9349c7beba2f4db0d5a0
2013-03-10 10:49:04 +00:00
torcs-ng
0076513d1e update forza-osg
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5243 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: ca40c9d62595fb0994872575fb220df5e3082bda
Former-commit-id: 3d1534e2fe5537d5bd60e3d8e556423631e4acb9
2013-03-03 00:38:09 +00:00
torcs-ng
84ea2fc8d5 add forza in development track in OSG version and SRC in Blender file
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5239 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 01b252e73456aceaf2b4b51491ad24c768c95342
Former-commit-id: b5e68c4ffdeaccfa1ed0cdffe1e8813f127dbfcf
2013-03-02 16:08:35 +00:00
pouillot
fd5ace6e31 Re #307 Split the big macros.cmake into several smaller and better readable files
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4943 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 97d27758fb627b375f108915683eecd782b9ac59
Former-commit-id: 80a7b425c51272694d4d9518aed18d732474b938
2012-09-14 18:39:40 +00:00