mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,412 Commits 7 Branches 39 Tags 352 MiB
Commit Graph

79 Commits

Author SHA1 Message Date
Tulio Leao bace4d62f8 Specify SYSTEM includes on CMAKE builds 2020-10-09 01:28:34 -03:00
Michał Janiszewski 8daca5b69e Add better controls over MinGW jobs to CMake 2020-09-27 20:29:49 +02:00
Michał Janiszewski 17e86a61c9
WinNT5.1 networking fixes (#12759) 2020-09-24 10:28:24 +02:00
Simon Jarrett f3aba68e46 Update project build files 2020-09-16 20:18:54 +01:00
lightray22 082dfc4bb0
Fix build on OpenBSD (#11870) 
Co-authored-by: ibara <ibara@users.noreply.github.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-06-12 16:45:22 +02:00
Michael Steenbeek cdcfcbfbe8
Remove no longer relevant CMake hack 2020-06-09 18:03:17 +02:00
Aaron van Geffen 6edf9b03e0 Add duktapeConfig.cmake to ease configuration. 
Used for reference:
https://github.com/microsoft/vcpkg/blob/master/ports/duktape/duktapeConfig.cmake.in
 2020-05-12 15:13:14 +02:00
Ted John 62d15e44db Fix mingw build 2020-04-26 14:35:07 +01:00
Ted John e6341f0a42 Get scripting compiling on clang 2020-04-26 14:35:03 +01:00
Ted John 639faa2085 Fix GCC issues 2020-04-26 14:35:03 +01:00
Ted John a1ebcdea5c Add duktape library 2020-04-26 14:34:58 +01:00
pkubaj c8f9324e41
Fix build on FreeBSD (#11145) 
FreeBSD doesn't use libstdc++, but libc++. stdc++fs doesn't exist in libc++.
 2020-03-29 23:36:50 +02:00
Michał Janiszewski 920150b06d
Fix #11140: exclude thirdparty headers from headers-check target (#11142) 2020-03-29 22:43:37 +02:00
Michał Janiszewski 92e5958ab6
Improve WinNT 5.1/MinGW support (#10869) 2020-03-05 19:35:23 +01:00
Michał Janiszewski 1b7639238a
Fix #9559: benchspritesort is broken after #8481 (#9590) 
* Fix #9559: benchspritesort is broken after #8481

This takes multithreading into account as well

* Apply review fixes

* Fix detection of newer Google Benchmark (>= 1.5.0)

* Review fix
 2020-02-12 22:18:00 +01:00
Ted John be9cb19df5 Replace cURL with WinHttp implementation on Windows 
This reduces the number of third party dependencies for Windows builds. WinHttp is quite a nice straight forward API so doesn't involve too much extra code.
 2020-02-08 17:47:03 +00:00
Ted John d402580201 Update cmake config 2020-02-05 21:28:59 +00:00
Ted John a02448e1fa Link stdc++fs for Clang as well as GCC (#10626) 2020-01-28 13:31:03 +00:00
Tom Lankhorst 6f0ea7b3c2 Link stdc++fs with GCC (#10522) 2020-01-09 19:57:28 +01:00
Conrad Kostecki fef1906d0d CMakeLists.txt: make discord-rpc and google benchmark optional (#10208) 
For a package maintainer, it should be possible to disable the support
for discord-rpc and google benchmark, as it currently always includes them,
when the library if found.
 2019-11-09 21:20:16 +01:00
Michał Janiszewski bf18bb8161
Fixup MSVC CMake targets (#10100) 2019-10-15 23:14:00 +02:00
Tom Lankhorst c951118eb0
Corrected order of finding and linking 2019-03-02 09:48:04 +01:00
Tom Lankhorst 68eec6bb5d
Include OpenSSL when not DISABLE_NETWORK/DISABLE_HTTP 2019-03-02 09:24:54 +01:00
Tom Lankhorst 44d4783309
Split linking cURL and SSL 2019-03-02 09:23:13 +01:00
Tom Lankhorst 49d36926b4
Move find_package benchmark to appropriate place 2019-03-02 09:21:19 +01:00
Tom Lankhorst 73c8a0a4a8
Require curl include when not DISABLE_HTTP 2019-03-02 09:20:25 +01:00
Tom Lankhorst e7d875dd04
Always link threads, fix linking cURL 
Threads are currently used throughout the codebase so they need to be
required. CURL is required when using HTTP, not when using Networking.
 2019-03-02 09:00:49 +01:00
Michał Janiszewski ad888fbf9d
Require at least 1.4 version of benchmark (#8681) 2019-02-06 21:30:33 +01:00
Michał Janiszewski 4192ffe57e
Improve cmake for MSVC (#8581) 
* Improve cmake for MSVC

* Fix mingw builds
 2019-02-05 16:12:58 +01:00
Michał Janiszewski 6bdbe248fd
Merge pull request #8641 from tomlankhorst/use-lto 
Detect availability of LTO, apply when available
 2019-02-04 00:06:37 +01:00
Tom Lankhorst ce6e08c633
Introduce SET_CHECK_CXX_FLAGS 2019-02-03 23:32:51 +01:00
Tom Lankhorst 3ab73018ec Quiet CMake find package 'benchmark' (#8628) 
`benchmark` is an optional package. CMake can be quiet about not finding it.
 2019-01-28 21:44:50 +01:00
Tom Lankhorst 06600440fe
Enable LTO/IPO on Clang and GCC 2019-01-27 12:58:19 +01:00
Michał Janiszewski 304840069d Add sprite sorting benchmark 2019-01-22 19:45:56 +01:00
Simmo Saan 3f8c3c32ea Fix #7766: Found ICU include directories being unused (#7767) 
When ICU is installed separately from the system and paths configured in
CMake then the detected include directories should also be used for
compilation instead of blindly using unconfigured system includes.
SYSTEM flag ignores suggest-override warnings in ICU headers.
 2018-07-08 22:16:27 +02:00
Aaron van Geffen fd74c6c93f Suppress branch info for releases on master. 2018-06-14 15:31:31 +02:00
Aaron van Geffen 56250b43ab Use `git describe` to express version in terms of closest tag. 2018-06-12 00:25:04 +02:00
Michał Janiszewski a4e803c03f
Update Windows linked libraries in CMakeLists.txt 2018-06-07 23:06:45 +02:00
Michał Janiszewski cee74a06e1
Fix #7595: Docker image fails to build (#7633) 2018-06-06 22:23:01 +02:00
Michał Janiszewski 6307d3532b
Make headers-check an object library 
This will skip linking step
 2018-06-04 07:49:29 +02:00
Michał Janiszewski 949321762b Verify compilability of headers on Travis v2 
Using approach described in
https://github.com/OpenRCT2/OpenRCT2/pull/7369#issuecomment-393973857
with updates to ease readability and maintenance.

Submitted as different PR, to keep history of the old approach.
Supersedes #7369.
 2018-06-03 22:56:34 +02:00
Michał Janiszewski 93370ec956 Switch libzip to non-system includes 
This should now work after many changes to upstream
 2018-06-03 22:31:00 +02:00
Aaron van Geffen bf1fd997d0 Do not require ICU on MinGW and MSVC targets. 2018-05-22 17:37:07 +02:00
Aaron van Geffen 392459f038 Remove dependency on iconv. 2018-05-22 17:37:07 +02:00
Aaron van Geffen ee8bf9bd4a Use ICU for converting strings to UTF-8 instead of our own tables. 
Co-authored-by: Fusxfaranto <fusxfaranto@gmail.com>
 2018-05-22 17:37:07 +02:00
Ted John f24b1bdfa6 Enable curl, openssl and freetype libraries for msvc 2018-04-13 19:21:03 +01:00
Ted John b8d8d24d21 Get cmake working with msvc for basic game 2018-04-12 23:07:18 +01:00
Aaron van Geffen 8ab1035ebe CMake: fix missing branch information. 2018-02-17 12:17:39 +01:00
Michał Janiszewski 6eeda1ec77 Perform more cleanup of CMakeLists.txt files 
This moves setting of compilation flags to common file to be used by all
subprojects and explicitly enables only C++ support, skipping whole C
support in CMake.
 2018-02-15 23:51:49 +01:00
Michał Janiszewski 8e3a271fb4 Remove support for C code from CMake 2018-02-15 23:51:49 +01:00