1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 20:49:56 +00:00
Commit graph

728 commits

Author SHA1 Message Date
Nikolay Kasyanov
bf0ec550da OS X: specify minimum CMake version & remove redundant argument from CI script 2016-07-07 01:09:59 +02:00
Roman Proskuryakov
28c63aea72 Uses FindTinyXML to find package 2016-06-12 21:40:02 +03:00
Roman Proskuryakov
edb41b5b08 Rewrites FindLIBUNSHIELD using LibFindMacros
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
2016-06-12 14:44:04 +03:00
Roman Proskuryakov
3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 2016-05-31 07:18:37 +03:00
makson96
56548b384d Include FindPkgMacros to use make_library_set
In CMakList.txt there is make_library_set and macro for it is defined in FindPkgMacros, so FindPkgMacros needs to be imported to avoid Error: Unknown CMake command "make_library_set".
2016-05-25 00:41:36 +02:00
scrawl
fcbcc004a3 Don't use unordered_map 2016-05-11 02:35:17 +02:00
Roman Proskuryakov
da59ef0f67 Rewrites FindFFmpeg using LibFindMacros handling components properly 2016-05-10 12:43:54 +03:00
Roman Proskuryakov
a6b67154bb Use builtin compiler version in CMake scripts 2016-05-09 23:35:33 +03:00
Marc Zinnschlag
62af1b67cf increased version number 2016-04-05 09:27:20 +02:00
scrawl
195c3b9967 Merge pull request #904 from sandstranger/disable_opengles_anddroid
disable opengl es for Android by default
2016-02-25 21:39:25 +01:00
sandstranger
a7b78b37f5 disable opengles for Android by default 2016-02-25 22:39:18 +03:00
scrawl
52f4c07648 Enable -Wundef 2016-02-25 20:37:00 +01:00
scrawl
647a5e091f Add osgQt to the repository
Ensures that it will be built against the correct Qt version.
2016-02-15 15:16:48 +01:00
scrawl
9eb96b9cb6 Parse the bullet version in FindBullet.cmake 2016-02-15 14:34:59 +01:00
scrawl
f94722b271 OSG 3.3.4 is the first release to include the DDS crash fix 2016-02-12 14:55:00 +01:00
scrawl
8b596dfcbe Remove support for OSG 3.2
Since commit e8662bea31, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
2016-02-12 14:46:45 +01:00
scrawl
41675be970 Merge branch 'openmw-38' 2016-02-02 23:01:21 +01:00
Alexander "Ace" Olofsson
338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 2016-01-19 22:11:46 +01:00
sandstranger
48f4fc34eb build fixes for Android 2016-01-05 15:37:17 +03:00
Marc Zinnschlag
6c676c861c increased version number 2016-01-04 18:03:47 +01:00
Alexander "Ace" Olofsson
93ee8f1991 Allow for earlier CMake on Qt4 2015-12-24 11:33:59 +01:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
1dbc1e67d8 Possible Qt5 link fix for AppVeyor 2015-12-24 02:41:35 +01:00
Marc Zinnschlag
9c7bbd667b Merge branch 'usersettings' 2015-12-15 14:58:04 +01:00
Marc Zinnschlag
d6bd2cb1f0 changed name of openmw-cs user settings file 2015-12-15 14:51:25 +01:00
Paul Cercueil
46f45773ca CMake: Add the list of possible values for some config options
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 15:55:23 +01:00
sandstranger
7db307e028 delete unused variables 2015-12-03 22:37:42 +03:00
sandstranger
7d374b36fd change cmake variables 2015-12-03 21:29:50 +03:00
sandstranger
d9b1b7c516 addd forgotten line 2015-12-03 19:56:38 +03:00
sandstranger
238a5824be add custom new variable fot Qt 2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c enable opengl es1 2015-12-02 22:40:04 +03:00
scrawl
77965501d4 CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg 2015-12-02 17:33:55 +01:00
scrawl
7d6fa1b65a CMakeLists.txt: Don't use DATADIR before it's defined 2015-12-02 16:14:04 +01:00
Dmitry Marakasov
84305a1297 Reuse DATADIR in data paths 2015-12-02 04:17:54 +03:00
scrawl
dca1674133 Merge remote-tracking branch 'upstream/openmw-37' into HEAD 2015-11-24 03:30:57 +01:00
Nikolay Kasyanov
2108e96c15 OS X: use TGA, PNG & JPEG plugins instead of ImageIO
Using ImageIO is troublesome when one needs to read an image from memory,
see for the details: https://forum.openmw.org/viewtopic.php?f=20&t=2949&start=220#p35531
2015-11-22 19:32:13 +01:00
Marc Zinnschlag
020b3add94 Merge branch 'openmw-37' 2015-11-17 09:54:49 +01:00
scrawl
0220e82259 Remove unused SOUND_INPUT_INCLUDES cmake variable. 2015-11-14 17:17:22 +01:00
Nikolay Kasyanov
63c47a78d6 OS X: fixup Qt plugin during packaging 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
d5aeb35449 OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
fff6b5fde1 OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
5c4899580f OS X: use less ambiguous variable names in packaging code 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
3ba546628d OS X: always copy Cocoa platform plugin into OpenMW bundle 2015-11-14 13:50:01 +01:00
Bret Curtis
3ea3d07d44 really purge libav 2015-11-12 16:39:29 +01:00
Marc Zinnschlag
cdf17f415e updated version number 2015-11-09 12:03:27 +01:00
Nikolay Kasyanov
dbcce482a6 OS X: enable high resolution mode for OpenMW & OpenCS
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
2015-08-15 22:37:09 +02:00
Marc Zinnschlag
7f398f8790 Merge remote-tracking branch 'corristo/osx-packaging-nextgen' 2015-08-11 11:49:20 +02:00
Nikolay Kasyanov
34d601360f OS X: setup OSG plugins packaging 2015-08-10 23:15:32 +02:00
Nikolay Kasyanov
2ded28f6aa OS X: reintroduce packaging code
It's much simpler now thanks to bundle utilities with @rpath support.
2015-08-10 23:15:32 +02:00
Alexander "Ace" Olofsson
46ce04a65b Don't package duplicate version for Windows
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
2015-08-05 17:10:35 +02:00