Commit graph

354 commits

Author SHA1 Message Date
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
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
d8048eb352 Fixed: PCH after pull merge
--HG--
branch : develop
2016-10-21 16:10:03 +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
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
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
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
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
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
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
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
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
833976be5b Merge with develop
--HG--
branch : compatibility-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
6686503e51 Merge with develop
--HG--
branch : compatibility-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
46f6df3310 Merge with develop
--HG--
branch : compatibility-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
efe7de773f Merge with develop
--HG--
branch : compatibility-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
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
kervala
77ae086af8 Merge with develop
--HG--
branch : compatibility-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
kervala
fb41219ce8 Fixed: Copy Steam runtime to bundle and sign it under OS X
--HG--
branch : compatibility-develop
2016-02-11 21:05:03 +01:00
kervala
2093482f72 Fixed: Load Steam library if Ryzom compiled with WITH_STEAM, request auth session ticket and send it to login server
--HG--
branch : compatibility-develop
2016-02-10 18:46:50 +01:00
kervala
3a0576a740 Merge with develop
--HG--
branch : compatibility-develop
2016-02-08 14:37:34 +01:00
kervala
cb77f1df66 Added: CMake file for bin2c
--HG--
branch : develop
2016-02-07 16:28:23 +01:00
kervala
325242c2e4 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 22:44:40 +01:00
kervala
59aaad27c1 Changed: Works for C compilers too
--HG--
branch : develop
2016-01-26 22:43:58 +01:00
kervala
c5d8c9965e Changed: Minor changes (EOL, spaces, etc...)
--HG--
branch : develop
2016-01-26 22:32:45 +01:00
kervala
bb0d2f6aa0 Merge with develop
--HG--
branch : compatibility-develop
2016-01-20 13:06:47 +01:00
kervala
6c27e927b5 Fixed: Compilation in 64 bits under Windows
--HG--
branch : develop
2016-01-20 13:05:55 +01:00
kervala
6ea1421fd3 Merge with develop
--HG--
branch : compatibility-develop
2016-01-17 13:24:01 +01:00
kervala
d5749430f7 Fixed: Typo in Lua 5.3 module
--HG--
branch : develop
2016-01-17 13:21:27 +01:00
kervala
cca0dd450e Merge with develop
--HG--
branch : compatibility-develop
2016-01-16 10:52:18 +01:00
kaetemi
9a477d976b VS2015 compilation fixes
--HG--
branch : develop
2016-01-15 11:34:23 +01:00
kervala
fadb57ed00 Merge with develop
--HG--
branch : compatibility-develop
2016-01-15 10:47:37 +01:00
kervala
fd80a0f22d Changed: Update WindowsSDK CMake module for VC++ 2015
--HG--
branch : develop
2016-01-15 10:46:34 +01:00
kervala
ddba3e583c Merge with develop
--HG--
branch : compatibility-develop
2016-01-06 13:22:47 +01:00