Commit graph

792 commits

Author SHA1 Message Date
kervala
5e67e0f93c Merge with develop 2016-12-05 09:53:58 +01:00
kervala
38d472220e Merge with develop
--HG--
branch : compatibility-develop
2016-12-05 09:53:58 +01:00
kervala
ad91edabff Changed: Disable -fno-strict-aliasing (and fix all strict aliasing warnings)
--HG--
branch : develop
2016-12-05 09:24:26 +01:00
kervala
c53133e7f2 Merge with develop 2016-12-04 19:19:15 +01:00
kervala
44f2bcef8e Merge with develop
--HG--
branch : compatibility-develop
2016-12-04 19:19:15 +01:00
kervala
09c99dd2c3 Fixed: Compatibility with CMake 2.8
--HG--
branch : develop
2016-12-04 19:16:34 +01:00
kervala
0bbabbf635 Merge with develop 2016-11-26 16:32:57 +01:00
kervala
920f226d98 Merge with develop
--HG--
branch : compatibility-develop
2016-11-26 16:32:57 +01:00
kervala
3e2c731444 Fixed: -Wl,-z doesn't exist under OS X
--HG--
branch : develop
2016-11-26 16:32:09 +01:00
kervala
4cdd6c845f Merge with develop 2016-11-26 16:17:04 +01:00
kervala
beb8ffc847 Merge with develop
--HG--
branch : compatibility-develop
2016-11-26 16:17:04 +01:00
kervala
4f5d3afd51 Fixed: -Wl,-Bsymbolic-functions doesn't exist under OS X
--HG--
branch : develop
2016-11-26 15:59:43 +01:00
kervala
5daac508c1 Merge with develop 2016-11-25 10:58:35 +01:00
kervala
ab93110312 Merge with develop
--HG--
branch : compatibility-develop
2016-11-25 10:58:35 +01:00
kervala
1aa738ba78 Fixed: PCH with old CMake versions (definitions already include -D)
--HG--
branch : develop
2016-11-25 10:57:59 +01:00
kervala
4bf0e1b0d9 Merge with develop 2016-11-25 10:44:44 +01:00
kervala
8adf092cb8 Merge with develop
--HG--
branch : compatibility-develop
2016-11-25 10:44:44 +01:00
kervala
6a76fc8317 Fixed: Compilation with old CMake versions
--HG--
branch : develop
2016-11-23 12:30:18 +01:00
kervala
c658afdece Changed: Formatting
--HG--
branch : develop
2016-11-23 12:29:59 +01:00
kervala
f59cef10bd Changed: Removed flags not supported everywhere
--HG--
branch : develop
2016-11-21 20:57:49 +01:00
kervala
323f6bd83a Merge with develop 2016-11-20 14:55:21 +01:00
kervala
3950b8c255 Merge with develop
--HG--
branch : compatibility-develop
2016-11-20 14:55:21 +01:00
kervala
9ddfd43b5e Fixed: Missing macro ADD_PLATFORM_LINKFLAGS
--HG--
branch : develop
2016-11-20 14:54:52 +01:00
kervala
4d96978674 Merge with develop 2016-11-20 14:51:11 +01:00
kervala
4eb21c1612 Merge with develop
--HG--
branch : compatibility-develop
2016-11-20 14:51:11 +01:00
kervala
0e25d31f30 Changed: Try to force -fPIC
--HG--
branch : develop
2016-11-20 13:20:54 +01:00
kervala
c265e2f261 Changed: Added Debian hardening flags
--HG--
branch : develop
2016-11-20 13:19:35 +01:00
kervala
186caf171a Changed: strict-aliasing option already defined
--HG--
branch : develop
2016-11-20 13:18:32 +01:00
kervala
c3327c3d1b Changed: Minor changes
--HG--
branch : develop
2016-11-20 13:03:46 +01:00
kervala
b36ded52df Changed: 3dsmax 2013 and up are always using Unicode
--HG--
branch : develop
2016-11-15 10:55:41 +01:00
Sit Melai
ccb943b852 Merge de la v3 de Ryzom Core 2016-11-07 17:11:05 +01:00
kervala
9f434db97b Merge with develop 2016-10-31 19:03:04 +01:00
kervala
7a894c1506 Merge with develop
--HG--
branch : compatibility-develop
2016-10-31 19:03:04 +01:00
kervala
637895e578 Fixed: Update libovr detection
--HG--
branch : develop
2016-10-31 19:00:19 +01:00
kervala
8d16f2bc49 Fixed: Update libovr detection 2016-10-31 19:00:19 +01:00
kervala
0cfd8cb35d Merge with develop 2016-10-27 16:48:45 +02:00
kervala
1e1f6ece8b Merge with develop
--HG--
branch : compatibility-develop
2016-10-27 16:48:45 +02:00
kervala
19e8ee1d05 Changed: Simplified all ENDIF and ELSE
--HG--
branch : develop
2016-10-27 10:54:09 +02:00
kervala
a53ec84c73 Changed: Simplified all ENDIF and ELSE 2016-10-27 10:54:09 +02:00
kervala
d078103453 Merge with develop 2016-10-21 16:50:04 +02:00
kervala
d5d4ba1e0c Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 16:50:04 +02:00
kervala
6ff893421d Changed: Specify Windows XP as minimum platform (we need that if using Windows 7 SDK with VC++ 2015)
--HG--
branch : develop
2016-10-21 16:47:46 +02:00
kervala
e6cf799eb4 Changed: Specify Windows XP as minimum platform (we need that if using Windows 7 SDK with VC++ 2015) 2016-10-21 16:47:46 +02:00
kervala
d8048eb352 Fixed: PCH after pull merge
--HG--
branch : develop
2016-10-21 16:10:03 +02:00
kervala
c6b62b8787 Fixed: PCH after pull merge 2016-10-21 16:10:03 +02:00
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
kervala
7363803b2c Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 14:27:31 +02:00
Cédric OCHS
209e8ba078 Merged in BWGaryP/ryzomcore (pull request #138)
Avoid empty "-D" on debug builds with Qt4.

--HG--
branch : develop
2016-10-21 06:19:15 +00:00
Cédric OCHS
1b37624679 Merged in BWGaryP/ryzomcore (pull request #138)
Avoid empty "-D" on debug builds with Qt4.
2016-10-21 06:19:15 +00:00
kervala
52678ea899 Merge with develop 2016-10-20 13:55:34 +02:00
kervala
6964d7a68e Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:55:34 +02:00
kervala
084bc2bba9 Changed: Allow to enable Sandbox under OS X
--HG--
branch : develop
2016-10-20 13:53:23 +02:00
kervala
6f1bb45f47 Changed: Allow to enable Sandbox under OS X 2016-10-20 13:53:23 +02:00
kervala
afc03e63ee Merge with develop 2016-10-19 17:25:45 +02:00
kervala
1e98eeaa0b Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 17:25:45 +02:00
kervala
5539873337 Fixed: Use 3 numbers version (without revision) for MACOSX_BUNDLE_SHORT_VERSION_STRING
--HG--
branch : develop
2016-10-19 17:07:31 +02:00
kervala
7dcfbe78f1 Fixed: Use 3 numbers version (without revision) for MACOSX_BUNDLE_SHORT_VERSION_STRING 2016-10-19 17:07:31 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
Erwan GEORGET
edf0b19c75 Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI 2016-08-09 22:12:11 +02:00
kervala
aada068245 Merge with develop
--HG--
branch : compatibility-develop
2016-07-25 18:58:02 +02:00
kervala
7738b33675 Fixed: Disable STLport by default when using a recent version of VC++
--HG--
branch : develop
2016-07-25 18:55:31 +02:00
kervala
68a7fe8c8b Fixed: Disable STLport by default when using a recent version of VC++ 2016-07-25 18:55:31 +02:00
kervala
1425aad8e3 Merge with develop
--HG--
branch : compatibility-develop
2016-06-11 17:06:08 +02:00
kervala
aa5f3b8499 Changed: Updated CMake toolchains modules
--HG--
branch : develop
2016-06-11 16:55:54 +02:00
kervala
3966c93a61 Changed: Updated CMake toolchains modules 2016-06-11 16:55:54 +02:00
kervala
65e48df782 Merge with develop
--HG--
branch : compatibility-develop
2016-06-07 13:32:06 +02:00
kervala
ac5e8b5202 Fixed: Automatically determine UCRT version
--HG--
branch : develop
2016-06-07 13:20:23 +02:00
kervala
cd31a742d7 Fixed: Automatically determine UCRT version 2016-06-07 13:20:23 +02:00
kervala
d03bbcdf73 Merge with develop
--HG--
branch : compatibility-develop
2016-05-14 18:55:54 +02:00
kervala
cf7ecf9857 Changed: Only compile installer if WITH_RYZOM_INSTALLER set
--HG--
branch : feature-ryzom-installer
2016-05-14 18:53:57 +02:00
kervala
0fac8984c2 Changed: Only compile installer if WITH_RYZOM_INSTALLER set 2016-05-14 18:53:57 +02:00
kervala
155902a229 Merge with develop
--HG--
branch : compatibility-develop
2016-05-08 14:00:40 +02:00
kervala
ab2ac66cb5 Fixed: Stack size errors while compiling with VC++ 2015
--HG--
branch : develop
2016-05-08 14:00:15 +02:00
kervala
32d5f7c497 Fixed: Stack size errors while compiling with VC++ 2015 2016-05-08 14:00:15 +02:00
kervala
601cb4347a Merge with develop
--HG--
branch : compatibility-develop
2016-05-04 10:09:49 +02:00
kervala
32e22ab208 Changed: Simplify CMake end tags
--HG--
branch : develop
2016-05-04 10:06:29 +02:00
kervala
c3cd4d9d0d Changed: Simplify CMake end tags 2016-05-04 10:06:29 +02:00
SIELA1915
52702f64f1 merged from compatibility-develop 2016-03-28 02:12:19 +02:00
kervala
833976be5b Merge with develop
--HG--
branch : compatibility-develop
2016-03-19 16:21:46 +01:00
kervala
93f5836fd5 Merge with develop 2016-03-19 16:21:46 +01:00
kervala
e191e1675b Fixed: Define _DARWIN_UNLIMITED_STREAMS to fix setrlimit under OS X
--HG--
branch : develop
2016-03-19 15:34:00 +01:00
kervala
5b892c1ed4 Fixed: Define _DARWIN_UNLIMITED_STREAMS to fix setrlimit under OS X 2016-03-19 15:34:00 +01:00
kervala
6686503e51 Merge with develop
--HG--
branch : compatibility-develop
2016-03-05 18:44:19 +01:00
kervala
6e8a7dadf2 Merge with develop 2016-03-05 18:44:19 +01:00
kervala
124bfac9f0 Improved Luabind CMake module, fixes #262 and fixes #263
--HG--
branch : develop
2016-03-05 18:43:25 +01:00
kervala
4f4c0235a4 Improved Luabind CMake module, fixes #262 and fixes #263 2016-03-05 18:43:25 +01:00
kervala
46f6df3310 Merge with develop
--HG--
branch : compatibility-develop
2016-03-05 11:51:08 +01:00
kervala
e280f89ea1 Merge with develop 2016-03-05 11:51:08 +01:00
kervala
76d83a5890 Improved Luabind CMake module, fixes #263
--HG--
branch : develop
2016-03-05 11:50:38 +01:00
kervala
51b3de86fd Improved Luabind CMake module, fixes #263 2016-03-05 11:50:38 +01:00
kervala
efe7de773f Merge with develop
--HG--
branch : compatibility-develop
2016-03-03 20:50:56 +01:00
kervala
35d32fc715 Merge with develop 2016-03-03 20:50:56 +01:00
kervala
5d3796d225 Lua 5.3 support for Fedora 22+, fixes #262
--HG--
branch : develop
2016-03-03 20:50:20 +01:00
kervala
9fb8340a97 Lua 5.3 support for Fedora 22+, fixes #262 2016-03-03 20:50:20 +01:00
Gary Preston
b193faa426 Ensure definitions from cmake files that make use of generator expressions
(such as UseQt4.cmake) are retained but do not cause a empty "-D" to be
output when the generator evaluates to the empty string.
Fixes debug build failure on Linux using Qt4/tools/WITH_PCH.

--HG--
branch : develop
2016-02-18 13:53:14 +00:00
Gary Preston
306d4a1e56 Ensure definitions from cmake files that make use of generator expressions
(such as UseQt4.cmake) are retained but do not cause a empty "-D" to be
output when the generator evaluates to the empty string.
Fixes debug build failure on Linux using Qt4/tools/WITH_PCH.
2016-02-18 13:53:14 +00:00
SIELA1915
f5459a1b9b merge from compatibility-develop 2016-02-12 18:28:23 +01:00
kervala
77ae086af8 Merge with develop
--HG--
branch : compatibility-develop
2016-02-11 21:06:28 +01:00
kervala
024ad78d09 Merge with develop 2016-02-11 21:06:28 +01:00
kervala
07709e9cfc Changed: Minor changes
--HG--
branch : develop
2016-02-11 21:06:00 +01:00