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

52 Commits

Author SHA1 Message Date
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
Aaron van Geffen c8b5cbb3e4 Fix cmake build for openrct2-cli on macOS. 
This also removes the globbing for *.m files. As the platform files for macOS
now all use Objective C++ (.mm) instead of Objective C (.m), this is no longer needed.
 2018-02-12 23:15:41 +01:00
Michał Janiszewski 7fec13ac74 Apply workaround for old compilers 
https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
 2018-02-12 22:24:22 +01:00
Michał Janiszewski ad27806534 Implement AVX2 masking 2018-02-12 22:24:22 +01:00
Joshua Moerman 5800a0874d Mac: updates cmake files to reflect previous commit(s) 
The new file Platform.mm added in the previous commit was added
to the XCode project, but not to the cmake files.

I copied the pattern from src/openrct2-ui/CMakeFiles.txt
 2018-02-02 23:16:37 +01:00
Michał Janiszewski 54394d3a21 Enable SSE4.1 for file implementing it 2018-01-01 23:49:09 +01:00
Ted John 99d7aaa2d6 Remove RCT2 interop 2017-12-04 19:04:06 +00:00
Stefan Winkler 516c5737be Set branch/sha1 defines only for specific files 2017-12-01 21:05:44 +01:00
Michał Janiszewski 8ec5f3ae82 Move FORCE32 option to top-level CMakeLists.txt 2017-11-15 22:32:51 +01:00
Michał Janiszewski 8f3434d084 Add discord-rpc support to Linux 2017-11-15 22:32:51 +01:00
ceeac a2ca87bde0 Fix failing link on Ubuntu due to missing libiconv 2017-11-06 21:53:36 +01:00
Marijn van der Werf dfbce1ad4c Fix Cmake compilation on macOS 10.12.6 2017-09-12 21:19:56 +02:00
Michał Janiszewski 1df22c889d Update minimum required CMake version to 3.1 2017-08-09 23:30:18 +02:00
Michał Janiszewski d2ec1f0057 Fix CMakeLists.txt to allow static libopenrct2 
This allows using CMake-standard `BUILD_SHARED_LIBS` flag to dynamically
set how libopenrct2 should be built.

`cmake -DBUILD_SHARED_LIBS=OFF` will result in `openrct2` statically
linked with `libopenrct2`

Fixes #5918.
 2017-08-09 23:30:18 +02:00
Oliver Freyermuth d42b9fc6df X8DrawingEngine: Only disable warnings which the compiler supports. 
This fixes compilation with gcc 4.9.4.
 2017-07-28 09:56:49 +02:00
Ted John acf3b0cf83 Only include FindPkgConfig once 2017-06-25 14:28:25 +01:00
Ted John c4ad6571ea Remove speex dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 95514b9cbc Remove SDL2 dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 2c07a55696 Refactor TTF into new source and remove SDL2_ttf 2017-06-24 14:50:30 +01:00
Michał Janiszewski 4851a45a83 Detect warnings for all parts of compilation (#5618) 2017-06-15 00:08:41 +02:00
Ted John d31870249a macOS: Unignore deprecation warning 2017-06-07 21:23:22 +01:00
Marijn van der Werf 615580dc03 Don't check for fontconfig on macOS 2017-05-29 22:39:19 +02:00
Ted John 3ebf5be3ea Fix mingw cmake 2017-05-29 22:38:46 +02:00
Marijn van der Werf 3a194f30dc Fix macOS compilation of library 2017-05-29 22:38:45 +02:00
Ted John 06bba09b43 Fix various issues with the cmake projects 2017-05-29 22:38:42 +02:00
Ted John c7b1feea07 Add back most of the cmake options 2017-05-29 22:38:42 +02:00
Ted John 89780363ee Add openrct2-ui cmake project 2017-05-29 22:38:42 +02:00
Ted John f856510a15 Get openrct2-cli linking successfully 2017-05-29 22:38:42 +02:00