Commit graph

34 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
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
xavi92
4e08c6ae72 checks.cmake: Do not assume CMAKE_PREFIX_PATH
If the user configures the project with a CMAKE_PREFIX_PATH, subprojects
such as xmlversion would not be configured correctly because its
CMAKE_ARGS would expand -DCMAKE_PREFIX_PATH to:

${PROJECT_SOURCE_DIR}/3rdParty ${CMAKE_PREFIX_PATH}

And this whitespace-separated list would be refused when configuring
xmlversion.

This has one side effect: the user is now required to always assign
CMAKE_PREFIX_PATH when configuring the project, and therefore not rely
on the 3rdParty directory to be available from the root directory.


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

Former-commit-id: 9a7d683b5eb19de60403aafb2a89dd46b276b6db
Former-commit-id: 33e2c0fdfe057572b5b4f6e00339b1926cf96602
2024-10-27 08:08:24 +00:00
xavi92
21807b8820 cmake: Remove SD_FIND_CUSTOM_3RDPARTY
This macro, along with _FIND_3RDPARTY_DEPENDENCY and
_FIND_3RDPARTY_DEPENDENCIES, was meant to tell find_package() and
friends about non-standard paths to find libraries when building for
Windows.

However, the same effect can be achieved via the standard CMake
variables CMAKE_PREFIX_PATH [1] and CMAKE_FIND_ROOT_PATH [2].

If cross-compiling, CMAKE_FIND_ROOT_PATH must be assigned when
configuring the project. This means the project must now be configured
with:

cmake -B <build-dir> -DCMAKE_FIND_ROOT_PATH=<root-dir>/3rdParty ...

[1]: https://cmake.org/cmake/help/latest/variable/CMAKE_PREFIX_PATH.html
[2]: https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_ROOT_PATH.html


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

Former-commit-id: 9a28c7ff755e57080c1f6075dc9b7585146681b9
Former-commit-id: b406ba92a1955da3523eff392606d04d752bfdd0
2024-10-27 07:57:27 +00:00
iobyte
02274c89c7 fix checks.cmake
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9511 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 55c34f8296c7ae2840187dce3de63487269f865c
Former-commit-id: b6791f3e00792155e8cc32844f88e377f57da33a
2024-07-31 01:14:47 +00:00
iobyte
d7262c6526 fix Windows eventloop crash
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9510 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 50f2810b869040a5343e3b322cbd8f3dbcc09cc1
Former-commit-id: 6e4960da072b9cc99bf3540561bb15fe853f9e70
2024-07-31 01:03:57 +00:00
xavi92
e06a519365 Remove trailing newlines
The following shell script was used:

while read f
do
	sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' -- "$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


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

Former-commit-id: aac7ab5702079417cb16ca2fa291be07033ea549
Former-commit-id: f0286e4119f166d7b78f9d13ff2ea04ffaa95c67
2024-07-30 22:17:48 +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
6b142146cd Find TinyGLTF on Windows
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8865 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 941508cbe6acf08848d3fe00708402fc5e2cde30
Former-commit-id: 5821ec5ab6bf8dea665568198753639fc1287f94
2023-04-04 15:15:42 +00:00
beaglejoe
7309853b9b Separate the real weather from OPTION_WEBSERVER. Real weather is now always available
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8126 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 452790a2a0cb9d22be53af0e4545118e00ae66e1
Former-commit-id: 46bd061d6d49cc22646abe0e8d238accc659bfca
2022-04-26 02:55:50 +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
719b1b0417 Redo musicplayer to use sdl2_mixer
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7639 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 4f23943768a24920be0e82a7624de520e84f19d0
Former-commit-id: d2374905a4fe1ea01ff40062817184283e1da811
2021-08-31 15:49:49 +00:00
beaglejoe
cd57f1d4ea White space only change. Visual Studio 2017 will outline CMake files now.
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6581 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5dc5c2eb10d81a1f066cabde4fd2e04cbac77e97
Former-commit-id: 7440e2159c2f4d7a24a3f228876eaf8f377af3df
2019-01-04 03:42:42 +00:00
torcs-ng
c69b161c68 - Required OpenSceneGraph 3.4.0 minimum for build now
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6548 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: ba2aa670c9548f48c891e3d9b4366094cee17006
Former-commit-id: 4ab8f07b6dad4ed5663518fe9693d313a8dc4960
2018-09-02 11:47:21 +00:00
beaglejoe
cf83e04ad7 Changes for OsgHUD on windows (requires osgText)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6503 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 04e4d91e4657c62699b2c36b450818cf8c15fc2d
Former-commit-id: 8dfbb9d4bf457a9afd674a22c7563a7bb7cd0d4e
2017-01-23 02:11:35 +00:00
madbad
af9039930c Add OPTION_WEBSERVER to cmake
to be able to build with/without WEBSERVER 	services

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

Former-commit-id: c0b1609bda1538082cb2a657166feaa6cc83d31b
Former-commit-id: 0152c643f33dc0b9ce46e90279eb85d471d56e82
2015-11-23 19:44:40 +00:00
madbad
afe4ca8a5c add CURL dependencie to cmake
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6257 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5a60f8be2fb1db6f355ae16e27837de5db36d689
Former-commit-id: 9269da49bd0d59cabca3c02f25803ba7128fa1cd
2015-11-23 19:43:03 +00:00
beaglejoe
487e3310ef Added 'OPTION_USE_MACPORTS' to CMake
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6100 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 46d755a5d5c2ddfee4710fed90f2c197852f9425
Former-commit-id: 21b68fa6c84949d6535579a3ba7615ca48f817f8
2015-08-31 00:04:57 +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
beaglejoe
acf61b5558 CMake changes for Ticket 711 (SDL2 option)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5937 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: cd6252bb58a99a6aba21d68a7d794ffec640aa82
Former-commit-id: 40b19de4d07e2f4a52846fa7404f414035272309
2015-04-01 19:29:12 +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
mungewell
33e3ac9e8b Bug #692 - Initial attempt at replay capability
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5803 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 1f0407f4a4483879b707d900de72ea3970faa1a1
Former-commit-id: 0d2175538d52a91f2216e8aca7928148c482f5d0
2014-07-30 03:19:34 +00:00
beaglejoe
b24d454a21 Remove Menu Music CMake option
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5485 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 29e0a9e657c2bc447328b06c3dd92478c6f7cf41
Former-commit-id: ef7c09760fb0fb9ae6743810c4fcd634bc343eab
2013-05-28 15:50:38 +00:00
torcs-ng
fcc9f3d410 update SDRender (first work with precipitation effect)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5439 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 0973713ff1de20c418725c501ef1ba38d073f15b
Former-commit-id: 215fa9a939abd76d643893799c3f90ab2f0555d0
2013-05-09 22:21:15 +00:00
pouillot
ddabc03da3 Re #771 CMake config updated for MinGW (builds and installs, but runs bad) and MSVC (not tested, should work with AlphaPixel binaries for 2008/2010)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5085 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 36978a651e9f334608d68e1812aca93789b5786f
Former-commit-id: d774ea355704b88cad0e5d044bbd308b5432b787
2013-01-02 15:43:31 +00:00
pouillot
a3472f3e04 Re #755 Applied Joe's menu-music-5040.patch : menu music first step
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5042 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 87495f3c30b0f30c1a875d081960cecd6dabb40d
Former-commit-id: 7cae952707f8401162d76aefd9981452fc7911ea
2012-11-11 15:38:27 +00:00
torcs-ng
39c8a9083f add modules/graphic/osggraph
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4996 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d8e9a9156377b3e161d306a5aa4a9a9527f3fc53
Former-commit-id: b816038b9539ff4b45a54563b0f8fc3826e665a7
2012-10-14 16:12:21 +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
pouillot
361db1099a Re #721 Added support for building with QtCreator + MinGW 4.7 (using the 'MinGW Makefiles' CMake generator)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4928 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d9cb38ad77b18715f68da04d3095e2028e667ae6
Former-commit-id: 0dbec0c92e15ffa411e15e8ab45b1daedc99d4d4
2012-09-09 08:37:40 +00:00
pouillot
dabacd3569 Re #721 : MinGW 4.7 build system is now up and running (except for networkhuman module)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4838 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6ed52a0b152da16fae7ecaacc3656fa4a5d5921b
Former-commit-id: 18343442c5252316e92572df01ebb3a98a89e68e
2012-08-08 17:38:39 +00:00
pouillot
b1217241b9 Re #634 Port from txml to 3rd party Expat 2 for all platforms (with temporary option to disable if needed)
Re #712 Port from bundled SOLID 2 to 3rd party Free Solid for all platforms (with temporary option to disable if needed)

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

Former-commit-id: 1e245a29829973f5e1fe8dc1784fb508201be89e
Former-commit-id: c0d7956316c9ad71fc203674961e2e654ada1847
2012-07-08 13:22:12 +00:00
pouillot
aaba4c5be0 Fixes #135 (remove dependency on ALUT)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2552 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 36a8165bec765f21bba021c14757d2fa50f11922
Former-commit-id: 599813ed1ee58e9a001b9ee1691c84bea5ada7fd
2010-07-10 15:29:28 +00:00
pouillot
407668c306 Promoted sdl-port branch to the new trunk, towards 2.0
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2276 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: cbff36e6bd206b0180816184b31d3a609616f669
Former-commit-id: cc1d132029d92e672f8520d2555f8dcdc5bbb92e
2010-02-28 09:04:35 +00:00