|
9a89e3f4a1
|
Merge remote-tracking branch 'upstream/develop' into ryzomcore
|
2019-08-29 11:15:14 +02:00 |
|
|
520b8d1bb9
|
Merge remote-tracking branch 'upstream/develop' into ryzomcore
|
2019-05-05 16:50:36 +02:00 |
|
kaetemi
|
eafe83cbe2
|
Add option for custom compile flags
|
2019-05-01 14:04:57 +08:00 |
|
kaetemi
|
44124e5853
|
Support MariaDB C connector library instead of MySQL
|
2019-05-01 09:27:50 +08:00 |
|
kaetemi
|
2eac83a339
|
Add Max 8 SDK path to CMake search
|
2019-04-29 03:26:32 +08:00 |
|
kaetemi
|
0174001273
|
Correct 3ds Max SDK paths on 64bit host
|
2019-04-28 03:05:31 +08:00 |
|
kaetemi
|
d5a06c1a62
|
Add recent 3ds Max SDK paths
|
2019-04-25 02:57:07 +08:00 |
|
deed
|
786550ed93
|
Merge remote-tracking branch 'hg/develop/hg/develop' into ryzomcore
|
2019-04-23 16:55:32 +02:00 |
|
kaetemi
|
440d0a5f31
|
Update build settings
|
2019-04-23 03:05:01 +08:00 |
|
kaetemi
|
c73f0d9449
|
Add max file library
|
2019-04-23 01:26:35 +08:00 |
|
kervala
|
89fc46c778
|
Fixed: Missing macro for Nmake
--HG--
branch : develop
|
2019-04-20 10:33:30 +02:00 |
|
deed
|
46af0c090e
|
Merge remote-tracking branch 'hg/develop/hg/develop' into ryzomcore
|
2019-04-16 21:28:45 +02:00 |
|
kervala
|
f997e73961
|
Fixed: Pass more system variables to PCH compilation
--HG--
branch : develop
|
2019-04-14 11:31:39 +02:00 |
|
Nimetu
|
e994c12983
|
Added: FFmpeg based audio decoder
--HG--
branch : develop
|
2018-10-23 11:19:07 +03:00 |
|
|
0d1f1067bc
|
Merge remote-tracking branch 'upstream/develop' into ryzomcore
|
2018-10-14 20:05:30 +02:00 |
|
kaetemi
|
7657d3e177
|
Fixed: Strip version strings only when successful
|
2019-05-11 08:39:12 +08:00 |
|
kaetemi
|
5baa32790f
|
Changed: Improve versioning info for resources
|
2019-05-11 05:56:18 +08:00 |
|
kaetemi
|
00bbdaba9e
|
Added: Revision number from git
|
2019-05-10 06:49:30 +08:00 |
|
|
dc9d966e49
|
Merge branch 'ryzomcore+develop' into 'develop'
Ryzomcore+develop
See merge request khaganat/mmorpg_khanat/khanat-opennel-code!39
|
2018-04-30 22:49:04 +02:00 |
|
Sit Melai
|
69c8be03d9
|
Prevent crash on Windows due to no revision from Git or Mercurial found.
|
2018-04-07 17:20:10 +02:00 |
|
Sit Melai
|
f37b991c14
|
CMakeModule to find Git (previously only Mercurial)
|
2018-04-07 17:19:01 +02:00 |
|
|
1c898ea0b2
|
Merge branch 'ryzomcore' into ryzomcore+develop
# Conflicts:
# .hgtags
# .travis.yml
# code/CMakeModules/FindMSVC.cmake
# code/ryzom/client/src/steam_client.cpp
|
2018-03-24 18:18:50 +01:00 |
|
kervala
|
06a4244df3
|
Changed: Include NeL in RyzomGameShare CMake module
--HG--
branch : develop
|
2018-08-18 11:14:14 +02:00 |
|
kervala
|
964e32cd93
|
Changed: Use Threads CMake module and CMAKE_DL_LIBS
--HG--
branch : develop
|
2018-08-18 11:13:10 +02:00 |
|
kervala
|
6da051e1a8
|
Changed: New macro FIX_PACKAGE_OPTIONS
--HG--
branch : develop
|
2018-08-18 11:12:47 +02:00 |
|
kervala
|
1380a94f5d
|
Changed: Use LIST(APPEND instead of SET
--HG--
branch : develop
|
2018-08-18 11:12:26 +02:00 |
|
kervala
|
5385e04bba
|
Fixed: Link Qt to OpenSSL
--HG--
branch : develop
|
2018-08-07 12:09:33 +02:00 |
|
kervala
|
d4fbb64120
|
Added: Steam CMake module
--HG--
branch : develop
|
2018-07-28 11:52:16 +02:00 |
|
kervala
|
7a85eef10b
|
Changed: Minor changes
--HG--
branch : develop
|
2018-07-28 11:46:34 +02:00 |
|
kervala
|
4df0fd37f3
|
Changed: Define and use LIB_SUFFIX
--HG--
branch : develop
|
2018-07-28 11:45:49 +02:00 |
|
kervala
|
0bd577310d
|
Added: New CMake modules to find NeL and Ryzom GameShare
--HG--
branch : develop
|
2018-07-28 11:44:33 +02:00 |
|
kervala
|
307eb77e63
|
Changed: Generate version_nl.h in include/nel/misc
--HG--
branch : develop
|
2018-07-28 11:31:32 +02:00 |
|
kervala
|
728c602bc3
|
Fixed: Compilation under Ubuntu 16.04
--HG--
branch : develop
|
2018-07-18 10:41:11 +02:00 |
|
kervala
|
f3753a08a8
|
Changed: Allow to use static C++ runtimes
--HG--
branch : develop
|
2018-07-10 20:42:37 +02:00 |
|
kervala
|
4444e93bf7
|
Changed: Use CPP11 everywhere if supported
--HG--
branch : develop
|
2018-07-10 17:02:42 +02:00 |
|
Jan Boon
|
13e2da698a
|
Fix build under Visual Studio 2008
--HG--
branch : develop
|
2018-07-03 16:09:15 +08:00 |
|
kervala
|
8c253955b7
|
Changed: Better support for Visual C++ 2017
--HG--
branch : develop
|
2018-01-03 14:09:46 +01:00 |
|
kervala
|
1526c7ea84
|
Changed: Define Clang features for OS X cross compilation
--HG--
branch : develop
|
2017-12-03 12:53:49 +01:00 |
|
compil
|
98942e57b3
|
Merge branch 'ryzomcore' into feature/merge_ryzomcore171003
|
2017-10-14 19:23:02 +02:00 |
|
kervala
|
c9aa7142bc
|
Fixed: New versions of AssImp depend on IrrXML
--HG--
branch : develop
|
2017-10-03 14:33:25 +02:00 |
|
kervala
|
450181f244
|
Fixed: Always link to Crypt32.lib for OpenSSL under Windows
--HG--
branch : develop
|
2017-10-03 14:32:13 +02:00 |
|
kervala
|
ac7474c7ba
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-10-01 15:37:51 +02:00 |
|
kervala
|
90359122d7
|
Changed: Other changes in CMake files
--HG--
branch : develop
|
2017-10-01 15:25:00 +02:00 |
|
kervala
|
92bc8661df
|
Fixed: Support for Visual C++ 2017 and latest Windows 10 Kits
--HG--
branch : develop
|
2017-10-01 15:19:24 +02:00 |
|
kervala
|
aa6d1a7bbb
|
Changed: Updated Android ans iOS toolchains
--HG--
branch : develop
|
2017-10-01 15:18:15 +02:00 |
|
kervala
|
630ae259ad
|
Changed: Add Steam support in develop branch too
--HG--
branch : develop
|
2017-10-01 15:10:51 +02:00 |
|
kervala
|
cb55615659
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-06-20 12:31:31 +02:00 |
|
kervala
|
50cfe0ff7c
|
Changed: No need to use -DWITH_SYMBOLS=ON
--HG--
branch : develop
|
2017-06-20 12:28:22 +02:00 |
|
kervala
|
d0a199d22d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-04-21 11:06:24 +02:00 |
|
kervala
|
21ca659c70
|
Changed: More information for osxcross
--HG--
branch : develop
|
2017-04-21 11:05:57 +02:00 |
|