Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
7483 commits 14 branches 1 tag 255 MiB
Commit graph

398 commits

Author SHA1 Message Date
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
kervala
ec7699aca9 Fixed: Compilation of object_viewer_qt with Qt 5 
--HG--
branch : develop
 2016-01-06 12:33:05 +01:00
kervala
9a7d4d3684 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-03 19:36:10 +01:00
kervala
873f4995ce Fixed: Missing PATHS in MySQL CMake module 
--HG--
branch : develop
 2016-01-03 19:35:44 +01:00
kervala
c9262b01c2 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-03 19:18:32 +01:00
kervala
bf19a4c61c Fixed: MySQL client under OS X 
--HG--
branch : develop
 2016-01-03 19:17:44 +01:00
kervala
d999e4a3bd Merge with develop 
--HG--
branch : compatibility-develop
 2015-12-25 18:02:13 +01:00
kervala
1f2678eb10 Fixed: Warnings compiling with Qt 5 
--HG--
branch : develop
 2015-12-25 18:00:37 +01:00
kervala
86a903c96e Merge with develop 
--HG--
branch : compatibility-develop
 2015-12-25 15:37:07 +01:00
kervala
75d16f7054 Fixed: Define QT_NO_DEBUG in Release with Qt 5 also in PCH 
--HG--
branch : develop
 2015-12-25 15:31:34 +01:00
kervala
8965a4d7a5 Merge with develop 
--HG--
branch : compatibility-develop
 2015-12-21 18:20:39 +01:00
kervala
016390446d Changed: Forgot to change RYZOM_GAMES_PREFIX 
--HG--
branch : develop
 2015-12-21 18:20:04 +01:00
kervala
806a6d21ab Changed: Only copy installscript_osx.vdf for Steam client 
--HG--
branch : compatibility-develop
 2015-12-21 17:46:38 +01:00
kervala
fb98ffe809 Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg 
--HG--
branch : develop
 2015-12-21 17:33:32 +01:00
kervala
1b2e607d5d Changed: Add WITH_UNIX_STRUCTURE to use UNIX structure (bin, etc, share, etc...) 
--HG--
branch : develop
 2015-12-21 17:05:18 +01:00
kervala
7ca5e7acf6 Fixed: Compilation with Qt 5 static under Linux 
--HG--
branch : develop
 2015-12-21 14:20:36 +01:00
kervala
a3b6e87b0d Changed: Disable useless message 
--HG--
branch : develop
 2015-12-16 08:00:06 +01:00
kervala
e486cac363 Fixed: Wrong cases 
--HG--
branch : develop
 2015-12-15 18:46:15 +01:00
kervala
651870a2c9 Fixed: Allow to find Windows SDK libraries in lib/amd64 too 
--HG--
branch : develop
 2015-12-15 18:28:50 +01:00
kervala
1ab5357804 Changed: Updates CMake modules 
--HG--
branch : develop
 2015-12-15 13:41:27 +01:00
kervala
c1716ae3db Fixed: Include directories with Qt 5 CMake modules in PCH 
--HG--
branch : develop
 2015-12-15 13:41:07 +01:00
kervala
8761ee3bcd Fixed: RETURN() doesn't exit from macro but from current file (thanks Nimetu!) 
--HG--
branch : develop
 2015-12-07 13:08:27 +01:00
kervala
a245857986 Changed: Remove specific C++ dialects for warnings 
--HG--
branch : develop
 2015-12-05 18:51:15 +01:00
kervala
1fa2e22491 Changed: Port some tools to Qt 5 
--HG--
branch : develop
 2015-12-05 18:48:59 +01:00
kervala
1afec95dd9 Fixed: Only display VR page in game config if compiled with a VR SDK 
--HG--
branch : develop
 2015-12-01 15:58:45 +01:00
kervala
68cbba44ce Fixed: Assimp depends on ZLIB 
--HG--
branch : develop
 2015-11-30 14:19:38 +01:00
kervala
804a635993 Changed: Display revision 
--HG--
branch : develop
 2015-11-29 14:35:55 +01:00
kervala
7a2dd18095 Changed: Add and use more constants in config.h 
--HG--
branch : develop
 2015-11-29 14:19:02 +01:00
kervala
abb6b28661 Fixed: ROOT_DIR is the parent of CMAKE_SOURCE_DIR 
--HG--
branch : develop
 2015-11-29 14:11:17 +01:00
kervala
27b45b40e8 Fixed: Use STRING(TIMESTAMP ...) since CMake 2.8.11 to get build time 
--HG--
branch : develop
 2015-11-29 14:10:42 +01:00
kervala
2fa0544912 Changed: Don't generate revision.h anymore 
--HG--
branch : develop
 2015-11-29 14:09:21 +01:00
kervala
520eb941b1 Changed: Simplified CMake ELSE and ENDIF 
--HG--
branch : develop
 2015-11-29 14:06:05 +01:00
kervala
39bda44106 Changed: Removed useless checks in config.h 
--HG--
branch : develop
 2015-11-29 14:02:44 +01:00
kaetemi
6c2490090d Merge with feature-export-assimp 
--HG--
branch : develop
 2015-11-16 00:46:27 +01:00
kervala
f1a75132dd Changed: CMake end tags 
--HG--
branch : develop
 2015-11-03 14:04:06 +01:00
kervala
44bfc85c7a Fixed: Wrong external detection (we don't use libwww anymore, so new external don't have it) 
--HG--
branch : develop
 2015-11-03 14:03:46 +01:00
kervala
69100c20f0 Fixed: Wrong end tags 
--HG--
branch : develop
 2015-11-01 17:04:59 +01:00
kervala
ec39ef13bf Changed: Support for Lua 5.3 (can be improved) 
--HG--
branch : develop
 2015-11-01 17:04:41 +01:00
kervala
5fc3c52df9 Fixed: Don't add dependency on target revision if not defined 
--HG--
branch : develop
 2015-10-25 15:16:29 +01:00
kervala
52800cd03b Fixed: GCC 5 version check fails for PCH support 
--HG--
branch : develop
 2015-10-25 15:11:27 +01:00
kervala
2910b1a375 Fixed: Warnings with CMake 
--HG--
branch : develop
 2015-10-06 20:31:41 +02:00
kervala
eb5f46fbae Changed: Use less verbose version for ELSE(), ENDIF(), ENDFOREACH() and ENDMACRO() 
--HG--
branch : develop
 2015-10-06 20:30:43 +02:00
kaetemi
8179ee3836 Add assimp dependency 
--HG--
branch : feature-export-assimp
 2015-09-19 16:46:59 +02:00
kaetemi
96116c6eba Todo note 
--HG--
branch : develop
 2015-07-10 06:33:14 +02:00
kaetemi
9a10f1413b Fix DXSDK include order 
--HG--
branch : develop
 2015-07-10 06:16:19 +02:00
kaetemi
cac661dbca SDK 8.1 support 
--HG--
branch : develop
 2015-07-10 05:50:05 +02:00
Nimetu
be95880a95 Remove libwww, only keep html entitites list 
--HG--
branch : develop
 2015-04-17 15:10:00 +03:00
kaetemi
72475cf719 Fix FindLibOVR cmake script 
--HG--
branch : develop
 2015-02-24 17:17:45 +01:00
kaetemi
a8db3b2dda Visual Studio 2013 compilation support for Ryzom Client 
--HG--
branch : develop
 2015-02-20 18:10:06 +01:00
kaetemi
6db8abf95c Visual Studio 2013 compilation support for NLMISC 
--HG--
branch : develop
 2015-02-20 16:24:19 +01:00
kervala
e8b0765e7c Merge with hotfix 
--HG--
branch : develop
 2015-02-14 14:31:19 +01:00
kervala
e0c95a74af Changed: Updated CMale modules 
--HG--
branch : hotfix
 2015-02-14 13:47:37 +01:00
kervala
eb5fecf8ce Fixed: Only keep Release and Debug configurations in CMake 
--HG--
branch : hotfix
 2015-02-14 12:06:19 +01:00
dfighter1985
972d270bfc Merged in hotfix (pull request #105) 
Merge hotfix

--HG--
branch : develop
 2015-02-02 23:32:08 +01:00
dfighter1985
bdb633cf83 Use release squish if debug not found. Fixes s3tc compressor tool build. 
--HG--
branch : hotfix
 2015-02-02 23:25:11 +01:00
kervala
ec12e6a75e Changed: Allow to enable UAC for Windows client 
--HG--
branch : develop
 2014-12-26 13:44:03 +01:00
kervala
f745f82455 Changed: Give priority to Luabind library filenames with specific Lua version 
--HG--
branch : develop
 2014-12-26 13:43:20 +01:00